13 files changed, 61 insertions, 86 deletions
diff --git a/tool/ruby_vm/models/bare_instructions.rb b/tool/ruby_vm/models/bare_instruction.rb
index 491e3eaaa6..f87dd74179 100644
--- a/tool/ruby_vm/models/bare_instructions.rb
+++ b/tool/ruby_vm/models/bare_instruction.rb
@@ -14,7 +14,7 @@ require_relative 'c_expr'
 require_relative 'typemap'
 require_relative 'attribute'
 
-class RubyVM::BareInstructions
+class RubyVM::BareInstruction
   attr_reader :template, :name, :operands, :pops, :rets, :decls, :expr
 
   def initialize opts = {}
@@ -107,14 +107,6 @@ class RubyVM::BareInstructions
     /\b(false|0)\b/ !~ @attrs.fetch('handles_sp').expr.expr
   end
 
-  def always_leaf?
-    @attrs.fetch('leaf').expr.expr == 'true;'
-  end
-
-  def leaf_without_check_ints?
-    @attrs.fetch('leaf').expr.expr == 'leafness_of_check_ints;'
-  end
-
   def handle_canary stmt
     # Stack canary is basically a good thing that we want to add, however:
     #
@@ -232,13 +224,13 @@ class RubyVM::BareInstructions
     new h.merge(:template => h)
   }
 
-  def self.fetch name
+  def self.find(name)
     @instances.find do |insn|
       insn.name == name
     end or raise IndexError, "instruction not found: #{name}"
   end
 
-  def self.to_a
+  def self.all
     @instances
   end
 end
diff --git a/tool/ruby_vm/models/instructions.rb b/tool/ruby_vm/models/instructions.rb
index e3da2ba5ac..7be7064b14 100644
--- a/tool/ruby_vm/models/instructions.rb
+++ b/tool/ruby_vm/models/instructions.rb
@@ -9,14 +9,15 @@
 # conditions  mentioned in  the file  COPYING are  met.  Consult  the file  for
 # details.
 
-require_relative 'bare_instructions'
-require_relative 'operands_unifications'
-require_relative 'instructions_unifications'
+require_relative 'bare_instruction'
+require_relative 'operands_unification'
+require_relative 'instructions_unification'
+require_relative 'trace_instruction'
+require_relative 'zjit_instruction'
 
-RubyVM::Instructions = RubyVM::BareInstructions.to_a + \
-                       RubyVM::OperandsUnifications.to_a + \
-                       RubyVM::InstructionsUnifications.to_a
-
-require_relative 'trace_instructions'
-require_relative 'zjit_instructions'
+RubyVM::Instructions = RubyVM::BareInstruction.all +
+                       RubyVM::OperandsUnification.all +
+                       RubyVM::InstructionsUnification.all +
+                       RubyVM::TraceInstruction.all +
+                       RubyVM::ZJITInstruction.all
 RubyVM::Instructions.freeze
diff --git a/tool/ruby_vm/models/instructions_unifications.rb b/tool/ruby_vm/models/instructions_unification.rb
index 2932ec57b2..5c798e6d54 100644
--- a/tool/ruby_vm/models/instructions_unifications.rb
+++ b/tool/ruby_vm/models/instructions_unification.rb
@@ -11,9 +11,9 @@
 
 require_relative '../helpers/c_escape'
 require_relative '../loaders/opt_insn_unif_def'
-require_relative 'bare_instructions'
+require_relative 'bare_instruction'
 
-class RubyVM::InstructionsUnifications
+class RubyVM::InstructionsUnification
   include RubyVM::CEscape
 
   attr_reader :name
@@ -22,7 +22,7 @@ class RubyVM::InstructionsUnifications
     @location = opts[:location]
     @name     = namegen opts[:signature]
     @series   = opts[:signature].map do |i|
-      RubyVM::BareInstructions.fetch i # Misshit is fatal
+      RubyVM::BareInstruction.find(i) # Misshit is fatal
     end
   end
 
@@ -36,7 +36,7 @@ class RubyVM::InstructionsUnifications
     new h
   end
 
-  def self.to_a
+  def self.all
     @instances
   end
 end
diff --git a/tool/ruby_vm/models/operands_unifications.rb b/tool/ruby_vm/models/operands_unification.rb
index ff84abb3c3..ce118648ca 100644
--- a/tool/ruby_vm/models/operands_unifications.rb
+++ b/tool/ruby_vm/models/operands_unification.rb
@@ -11,16 +11,16 @@
 
 require_relative '../helpers/c_escape'
 require_relative '../loaders/opt_operand_def'
-require_relative 'bare_instructions'
+require_relative 'bare_instruction'
 
-class RubyVM::OperandsUnifications < RubyVM::BareInstructions
+class RubyVM::OperandsUnification < RubyVM::BareInstruction
   include RubyVM::CEscape
 
   attr_reader :preamble, :original, :spec
 
   def initialize opts = {}
     name             = opts[:signature][0]
-    @original        = RubyVM::BareInstructions.fetch name
+    @original        = RubyVM::BareInstruction.find(name)
     template         = @original.template
     parts            = compose opts[:location], opts[:signature], template[:signature]
     json             = template.dup
@@ -129,12 +129,12 @@ class RubyVM::OperandsUnifications < RubyVM::BareInstructions
     new h
   end
 
-  def self.to_a
+  def self.all
     @instances
   end
 
   def self.each_group
-    to_a.group_by(&:original).each_pair do |k, v|
+    all.group_by(&:original).each_pair do |k, v|
       yield k, v
     end
   end
diff --git a/tool/ruby_vm/models/trace_instructions.rb b/tool/ruby_vm/models/trace_instruction.rb
index 5ffff3f63d..6a3ad53c44 100644
--- a/tool/ruby_vm/models/trace_instructions.rb
+++ b/tool/ruby_vm/models/trace_instruction.rb
@@ -10,9 +10,9 @@
 # details.
 
 require_relative '../helpers/c_escape'
-require_relative 'bare_instructions'
+require_relative 'bare_instruction'
 
-class RubyVM::TraceInstructions
+class RubyVM::TraceInstruction
   include RubyVM::CEscape
 
   attr_reader :name
@@ -58,17 +58,13 @@ class RubyVM::TraceInstructions
     return false
   end
 
-  def zjit_profile?
-    return false
-  end
-
   private
 
-  @instances = RubyVM::Instructions.map {|i| new i }
+  @instances = (RubyVM::BareInstruction.all +
+                RubyVM::OperandsUnification.all +
+                RubyVM::InstructionsUnification.all).map {|i| new(i) }
 
-  def self.to_a
+  def self.all
     @instances
   end
-
-  RubyVM::Instructions.push(*to_a)
 end
diff --git a/tool/ruby_vm/models/zjit_instructions.rb b/tool/ruby_vm/models/zjit_instruction.rb
index 2bf190e3f7..04764e4c61 100644
--- a/tool/ruby_vm/models/zjit_instructions.rb
+++ b/tool/ruby_vm/models/zjit_instruction.rb
@@ -1,8 +1,8 @@
 require_relative '../helpers/c_escape'
-require_relative 'bare_instructions'
+require_relative 'bare_instruction'
 
 # Profile YARV instructions to optimize code generated by ZJIT
-class RubyVM::ZJITInstructions
+class RubyVM::ZJITInstruction
   include RubyVM::CEscape
 
   attr_reader :name
@@ -48,11 +48,9 @@ class RubyVM::ZJITInstructions
     return false
   end
 
-  @instances = RubyVM::Instructions.filter(&:zjit_profile?).map {|i| new(i) }
+  @instances = RubyVM::BareInstruction.all.filter(&:zjit_profile?).map {|i| new(i) }
 
-  def self.to_a
+  def self.all
     @instances
   end
-
-  RubyVM::Instructions.push(*to_a)
 end
diff --git a/tool/ruby_vm/views/_insn_leaf_info.erb b/tool/ruby_vm/views/_insn_leaf_info.erb
new file mode 100644
index 0000000000..f30366ffda
--- /dev/null
+++ b/tool/ruby_vm/views/_insn_leaf_info.erb
@@ -0,0 +1,18 @@
+MAYBE_UNUSED(static bool insn_leaf(int insn, const VALUE *opes));
+static bool
+insn_leaf(int insn, const VALUE *opes)
+{
+    switch (insn) {
+% RubyVM::Instructions.each do |insn|
+%   next if insn.is_a?(RubyVM::TraceInstruction) || insn.is_a?(RubyVM::ZJITInstruction)
+      case <%= insn.bin %>:
+        return attr_leaf_<%= insn.name %>(<%=
+          insn.operands.map.with_index do |ope, i|
+            "(#{ope[:type]})opes[#{i}]"
+          end.join(', ')
+        %>);
+% end
+      default:
+        return false;
+    }
+}
diff --git a/tool/ruby_vm/views/_insn_sp_pc_dependency.erb b/tool/ruby_vm/views/_insn_sp_pc_dependency.erb
deleted file mode 100644
index 7e7d5ade11..0000000000
--- a/tool/ruby_vm/views/_insn_sp_pc_dependency.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-%# -*- C -*-
-%# Copyright (c) 2019 Takashi Kokubun.  All rights reserved.
-%#
-%# This file is a part of  the programming language Ruby.  Permission is hereby
-%# granted, to either  redistribute and/or modify this file,  provided that the
-%# conditions mentioned  in the  file COPYING  are met.   Consult the  file for
-%# details.
-%#
-PUREFUNC(MAYBE_UNUSED(static bool insn_may_depend_on_sp_or_pc(int insn, const VALUE *opes)));
-
-static bool
-insn_may_depend_on_sp_or_pc(int insn, const VALUE *opes)
-{
-    switch (insn) {
-% RubyVM::Instructions.each do |insn|
-%   # handles_sp?:  If true, it requires to move sp in JIT
-%   # always_leaf?: If false, it may call an arbitrary method. pc should be moved
-%   #               before the call, and the method may refer to caller's pc (lineno).
-%   unless !insn.is_a?(RubyVM::TraceInstructions) && !insn.is_a?(RubyVM::ZJITInstructions) && !insn.handles_sp? && insn.always_leaf?
-      case <%= insn.bin %>:
-%   end
-% end
-        return true;
-      default:
-        return false;
-    }
-}
diff --git a/tool/ruby_vm/views/_leaf_helpers.erb b/tool/ruby_vm/views/_leaf_helpers.erb
index 6dae554a51..2756fa2dec 100644
--- a/tool/ruby_vm/views/_leaf_helpers.erb
+++ b/tool/ruby_vm/views/_leaf_helpers.erb
@@ -10,10 +10,6 @@
 
 #include "iseq.h"
 
-// This is used to tell JIT that this insn would be leaf if CHECK_INTS didn't exist.
-// It should be used only when RUBY_VM_CHECK_INTS is directly written in insns.def.
-static bool leafness_of_check_ints = false;
-
 static bool
 leafness_of_defined(rb_num_t op_type)
 {
@@ -25,7 +21,7 @@ leafness_of_defined(rb_num_t op_type)
       case DEFINED_YIELD:
       case DEFINED_REF:
       case DEFINED_ZSUPER:
-        return false;
+        return true;
       case DEFINED_CONST:
       case DEFINED_CONST_FROM:
         /* has rb_autoload_load(); */
diff --git a/tool/ruby_vm/views/_zjit_helpers.erb b/tool/ruby_vm/views/_zjit_helpers.erb
index 97b9feffbc..1185dbd9d8 100644
--- a/tool/ruby_vm/views/_zjit_helpers.erb
+++ b/tool/ruby_vm/views/_zjit_helpers.erb
@@ -5,7 +5,7 @@ static int
 vm_bare_insn_to_zjit_insn(int insn)
 {
     switch (insn) {
-% RubyVM::ZJITInstructions.to_a.each do |insn|
+% RubyVM::ZJITInstruction.all.each do |insn|
       case BIN(<%= insn.jump_destination %>):
         return <%= insn.bin %>;
 % end
@@ -19,7 +19,7 @@ static int
 vm_zjit_insn_to_bare_insn(int insn)
 {
     switch (insn) {
-% RubyVM::ZJITInstructions.to_a.each do |insn|
+% RubyVM::ZJITInstruction.all.each do |insn|
       case <%= insn.bin %>:
         return BIN(<%= insn.jump_destination %>);
 % end
diff --git a/tool/ruby_vm/views/insns_info.inc.erb b/tool/ruby_vm/views/insns_info.inc.erb
index 0a6f71fee3..48dd0e8832 100644
--- a/tool/ruby_vm/views/insns_info.inc.erb
+++ b/tool/ruby_vm/views/insns_info.inc.erb
@@ -21,5 +21,6 @@
 <%= render 'sp_inc_helpers' %>
 <%= render 'zjit_helpers' %>
 <%= render 'attributes' %>
+<%= render 'insn_leaf_info' %>
 <%= render 'comptime_insn_stack_increase' %>
 #endif
diff --git a/tool/ruby_vm/views/optinsn.inc.erb b/tool/ruby_vm/views/optinsn.inc.erb
index de7bb210ea..9d9cf0a43a 100644
--- a/tool/ruby_vm/views/optinsn.inc.erb
+++ b/tool/ruby_vm/views/optinsn.inc.erb
@@ -23,7 +23,7 @@ insn_operands_unification(INSN *iobj)
         /* do nothing */;
         break;
 
-% RubyVM::OperandsUnifications.each_group do |orig, unifs|
+% RubyVM::OperandsUnification.each_group do |orig, unifs|
     case <%= orig.bin %>:
 %   unifs.each do |insn|
 
@@ -56,7 +56,7 @@ rb_insn_unified_local_var_level(VALUE insn)
     switch (insn) {
       default:
         return -1; /* do nothing */;
-% RubyVM::OperandsUnifications.each_group do |orig, unifs|
+% RubyVM::OperandsUnification.each_group do |orig, unifs|
 %   unifs.each do|insn|
       case <%= insn.bin %>:
 %     insn.spec.map{|(var,val)|val}.reject{|i| i == '*' }.each do |val|
diff --git a/tool/ruby_vm/views/vm.inc.erb b/tool/ruby_vm/views/vm.inc.erb
index b92d6d31bc..38bf5f05ae 100644
--- a/tool/ruby_vm/views/vm.inc.erb
+++ b/tool/ruby_vm/views/vm.inc.erb
@@ -13,22 +13,22 @@
 } -%>
 
 #include "vm_insnhelper.h"
-% RubyVM::BareInstructions.to_a.each do |insn|
+% RubyVM::BareInstruction.all.each do |insn|
 <%= render 'insn_entry', locals: { insn: insn } -%>
 % end
 %
-% RubyVM::OperandsUnifications.to_a.each do |insn|
+% RubyVM::OperandsUnification.all.each do |insn|
 <%= render 'insn_entry', locals: { insn: insn } -%>
 % end
 %
-% RubyVM::InstructionsUnifications.to_a.each do |insn|
+% RubyVM::InstructionsUnification.all.each do |insn|
 <%= render 'insn_entry', locals: { insn: insn } -%>
 % end
 %
-% RubyVM::ZJITInstructions.to_a.each do |insn|
+% RubyVM::ZJITInstruction.all.each do |insn|
 <%= render 'zjit_instruction', locals: { insn: insn } -%>
 % end
 %
-% RubyVM::TraceInstructions.to_a.each do |insn|
+% RubyVM::TraceInstruction.all.each do |insn|
 <%= render 'trace_instruction', locals: { insn: insn } -%>
 % end