diff options
| author | Takashi Kokubun <[email protected]> | 2023-02-09 22:06:51 -0800 |
|---|---|---|
| committer | Takashi Kokubun <[email protected]> | 2023-03-05 22:41:35 -0800 |
| commit | e8c13e55fb84ae55299f4d97cd3f9042e07dc4cf (patch) | |
| tree | e7efd8d104d51491004b16c247c331d7aff3b7a4 /lib/ruby_vm/mjit | |
| parent | b2447b644d10f05f4dac578fd1fd7ab8bb9a609e (diff) | |
Delay CFP motion a little
Diffstat (limited to 'lib/ruby_vm/mjit')
| -rw-r--r-- | lib/ruby_vm/mjit/insn_compiler.rb | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/lib/ruby_vm/mjit/insn_compiler.rb b/lib/ruby_vm/mjit/insn_compiler.rb index 9c2f0112fc..fbf8d564b3 100644 --- a/lib/ruby_vm/mjit/insn_compiler.rb +++ b/lib/ruby_vm/mjit/insn_compiler.rb @@ -1210,21 +1210,19 @@ module RubyVM::MJIT sp_offset = ctx.sp_offset + local_size + 3 asm.add(SP, C.VALUE.size * sp_offset) - asm.comment('move CFP register to callee CFP') - asm.sub(CFP, C.rb_control_frame_t.size); - asm.comment('set up new frame') + cfp_offset = -C.rb_control_frame_t.size # callee CFP # Not setting PC since JIT code will do that as needed - asm.mov([CFP, C.rb_control_frame_t.offsetof(:sp)], SP) + asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:sp)], SP) asm.mov(:rax, iseq.to_i) - asm.mov([CFP, C.rb_control_frame_t.offsetof(:iseq)], :rax) + asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:iseq)], :rax) self_index = -(1 + argc + ((flags & C.VM_CALL_ARGS_BLOCKARG == 0) ? 0 : 1) + local_size + 3) asm.mov(:rax, [SP, C.VALUE.size * self_index]) - asm.mov([CFP, C.rb_control_frame_t.offsetof(:self)], :rax) + asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:self)], :rax) asm.lea(:rax, [SP, C.VALUE.size * -1]) - asm.mov([CFP, C.rb_control_frame_t.offsetof(:ep)], :rax) - asm.mov([CFP, C.rb_control_frame_t.offsetof(:block_code)], 0) - asm.mov([CFP, C.rb_control_frame_t.offsetof(:__bp__)], SP) # TODO: get rid of this!! + asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:ep)], :rax) + asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:block_code)], 0) + asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:__bp__)], SP) # TODO: get rid of this!! # cfp->jit_return is used only for ISEQs if iseq @@ -1247,14 +1245,15 @@ module RubyVM::MJIT case branch_stub.shape in Default branch_asm.mov(:rax, branch_stub.target0.address) - branch_asm.mov([CFP, C.rb_control_frame_t.offsetof(:jit_return)], :rax) + branch_asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:jit_return)], :rax) end end end branch_stub.compile.call(asm) end - asm.comment('set callee CFP to ec->cfp') + asm.comment('switch to callee CFP') + asm.sub(CFP, C.rb_control_frame_t.size) asm.mov([EC, C.rb_execution_context_t.offsetof(:cfp)], CFP) end |