_mjit_compile_insn_body.erb: refactor

renamed from tool/ruby_vm/views/_mjit_compile_insn_line.erb.
Basically this file should handle everything about macro on JIT.

_mjit_compile_insn.erb: follow the refactoring

common.mk: follow the rename

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 43 insertions, 23 deletions

diff --git a/tool/ruby_vm/views/_mjit_compile_insn.erb b/tool/ruby_vm/views/_mjit_compile_insn.erb
index 0ce45c6f0f..42ee0469a9 100644
--- a/tool/ruby_vm/views/_mjit_compile_insn.erb
+++ b/tool/ruby_vm/views/_mjit_compile_insn.erb
@@ -61,9 +61,7 @@
 % end
 %
 % # JIT: Print insn body in insns.def
-% insn.expr.expr.each_line do |line|
-<%= render 'mjit_compile_insn_line', locals: { line: line, insn: insn } -%>
-% end
+<%= render 'mjit_compile_insn_body', locals: { insn: insn } -%>
 %
 % # JIT: Set return values
 % unless dispatched
diff --git a/tool/ruby_vm/views/_mjit_compile_insn_line.erb b/tool/ruby_vm/views/_mjit_compile_insn_body.erb
index cf46fe0a43..2d2dabe32e 100644
--- a/tool/ruby_vm/views/_mjit_compile_insn_line.erb
+++ b/tool/ruby_vm/views/_mjit_compile_insn_body.erb
@@ -12,18 +12,40 @@
 %   rstring2cstr(indented.rstrip).sub(/"\z/, '\\n"')
 % end
 %
-% # Special macro expansion for ones that can't be resolved by macro redefinition.
-% if line =~ /\A\s+DISPATCH_ORIGINAL_INSN\((?<insn_name>[^)]+)\);\s+\z/
-        fprintf(f, "            return Qundef; /* cancel JIT */\n");
-% elsif line =~ /\A\s+JUMP\((?<dest>[^)]+)\);\s+\z/
-%   # Before we `goto` next insn, we need to set return values, especially for getinlinecache
-%   insn.rets.reverse_each.with_index do |ret, i|
-%       # TOPN(n) = ...
-        fprintf(f, "            stack[%d] = <%= ret.fetch(:name) %>;\n", b->stack_size + (int)<%= insn.call_attribute('sp_inc') %> - <%= i + 1 %>);
+% #
+% # Expand simple macro, which doesn't require dynamic C code.
+% #
+% expand_simple_macros = lambda do |arg_expr|
+%   arg_expr.dup.tap do |expr|
+%     # For `opt_xxx`'s fallbacks.
+%     expr.gsub!(/\bDISPATCH_ORIGINAL_INSN\([^)]+\);/, 'return Qundef; /* cancel JIT */')
+%
+%     # For `leave`. We can't proceed next ISeq in the same JIT function.
+%     expr.gsub!(/^(?<indent>\s*)RESTORE_REGS\(\);\n/) do
+%       indent = Regexp.last_match[:indent]
+%       <<~RESTORE_REGS
+%         #if OPT_CALL_THREADED_CODE
+%         #{indent}rb_ec_thread_ptr(ec)->retval = val;
+%         #{indent}return 0;
+%         #else
+%         #{indent}return val;
+%         #endif
+%       RESTORE_REGS
+%     end
 %   end
+% end
+%
+% #
+% # Print a body of insn, but with macro expansion.
+% #
+% expand_simple_macros.call(insn.expr.expr).each_line do |line|
+%   #
+%   # Expand dynamic macro here (only JUMP for now)
+%   #
+%   if line =~ /\A\s+JUMP\((?<dest>[^)]+)\);\s+\z/
+%     dest = Regexp.last_match[:dest]
 %
-%   dest = Regexp.last_match[:dest]
-%   if insn.name == 'opt_case_dispatch' # special case... TODO: use another macro to avoid checking name
+%     if insn.name == 'opt_case_dispatch' # special case... TODO: use another macro to avoid checking name
         {
             struct case_dispatch_var arg;
             arg.f = f;
@@ -36,17 +58,17 @@
             fprintf(f, "        goto label_%lu;\n", arg.base_pos + else_offset);
             fprintf(f, "    }\n");
         }
-%   else
+%     else
+%       # Before we `goto` next insn, we need to set return values, especially for getinlinecache
+%       insn.rets.reverse_each.with_index do |ret, i|
+%         # TOPN(n) = ...
+        fprintf(f, "            stack[%d] = <%= ret.fetch(:name) %>;\n", b->stack_size + (int)<%= insn.call_attribute('sp_inc') %> - <%= i + 1 %>);
+%       end
+%
         next_pos = pos + insn_len(insn) + (unsigned int)<%= dest %>;
         fprintf(f, "            goto label_%d;\n", next_pos);
-%   end
-% elsif line =~ /\A\s+RESTORE_REGS\(\);\s+\z/ # for `leave` only
-#if OPT_CALL_THREADED_CODE
-        fprintf(f, "            rb_ec_thread_ptr(ec)->retval = val;\n");
-        fprintf(f, "            return 0;\n");
-#else
-        fprintf(f, "            return val;\n");
-#endif
-% else
+%     end
+%   else
         fprintf(f, <%= to_cstr.call(line) %>);
+%   end
 % end