archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-26 22:45:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use the actual sp_offset

Browse source
This commit is contained in:
Takashi Kokubun 2023-01-04 00:12:16 -08:00
parent ee80b2be20
commit 1f69ba1d84
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/ruby_vm/mjit/assembler.rb
View file

@ -215,6 +215,15 @@ module RubyVM::MJIT
mod_rm: ModRM[mod: Mod01, reg: dst_reg, rm: src_reg], mod_rm: ModRM[mod: Mod01, reg: dst_reg, rm: src_reg],
disp: src_disp, disp: src_disp,
) )
# MOV r32, imm32 (Mod 11: reg)
in Integer => src_imm if r32?(dst_reg) && imm32?(src_imm)
# B8+ rd id
# OI: Operand 1: opcode + rd (w), Operand 2: imm8/16/32/64
insn(
opcode: 0xb8,
rd: dst_reg,
imm: imm32(src_imm),
)
# MOV r/m64, imm32 (Mod 11: reg) # MOV r/m64, imm32 (Mod 11: reg)
in Integer => src_imm if r64?(dst_reg) && imm32?(src_imm) in Integer => src_imm if r64?(dst_reg) && imm32?(src_imm)
# REX.W + C7 /0 id # REX.W + C7 /0 id

4
lib/ruby_vm/mjit/exit_compiler.rb
View file

@ -45,9 +45,10 @@ module RubyVM::MJIT
end end
# @param jit [RubyVM::MJIT::JITState] # @param jit [RubyVM::MJIT::JITState]
# @param ctx [RubyVM::MJIT::Context]
# @param asm [RubyVM::MJIT::Assembler] # @param asm [RubyVM::MJIT::Assembler]
# @param stub [RubyVM::MJIT::BlockStub] # @param stub [RubyVM::MJIT::BlockStub]
def compile_jump_stub(jit, asm, stub) def compile_jump_stub(jit, ctx, asm, stub)
case stub case stub
when BlockStub when BlockStub
asm.comment("block stub hit: #{stub.iseq.body.location.label}@#{C.rb_iseq_path(stub.iseq)}:#{stub.iseq.body.location.first_lineno}") asm.comment("block stub hit: #{stub.iseq.body.location.label}@#{C.rb_iseq_path(stub.iseq)}:#{stub.iseq.body.location.first_lineno}")
@ -57,6 +58,7 @@ module RubyVM::MJIT
# Call rb_mjit_stub_hit # Call rb_mjit_stub_hit
asm.mov(:rdi, to_value(stub)) asm.mov(:rdi, to_value(stub))
asm.mov(:esi, ctx.sp_offset)
asm.call(C.rb_mjit_stub_hit) asm.call(C.rb_mjit_stub_hit)
# Jump to the address returned by rb_mjit_stub_hit # Jump to the address returned by rb_mjit_stub_hit

2
lib/ruby_vm/mjit/insn_compiler.rb
View file

@ -375,7 +375,7 @@ module RubyVM::MJIT
) )
stub_hit = Assembler.new.then do |ocb_asm| stub_hit = Assembler.new.then do |ocb_asm|
@exit_compiler.compile_jump_stub(jit, ocb_asm, block_stub) @exit_compiler.compile_jump_stub(jit, ctx, ocb_asm, block_stub)
@ocb.write(ocb_asm) @ocb.write(ocb_asm)
end end

9
mjit.c
View file

@ -345,7 +345,7 @@ rb_mjit_compile(const rb_iseq_t *iseq)
} }
void * void *
rb_mjit_stub_hit(VALUE branch_stub) rb_mjit_stub_hit(VALUE branch_stub, int sp_offset)
{ {
VALUE result; VALUE result;
@ -356,15 +356,12 @@ rb_mjit_stub_hit(VALUE branch_stub)
mjit_stats_p = false; // Avoid impacting JIT stats by itself mjit_stats_p = false; // Avoid impacting JIT stats by itself
rb_control_frame_t *cfp = GET_EC()->cfp; rb_control_frame_t *cfp = GET_EC()->cfp;
// Given JIT's SP offset, temporarily update SP to preserve stack values. cfp->sp += sp_offset; // preserve stack values, also using the actual sp_offset to make jit.peek_at_stack work
// It's reset afterwards for consistency with the code without this stub.
unsigned int stack_max = cfp->iseq->body->stack_max;
cfp->sp += stack_max;
VALUE cfp_ptr = rb_funcall(rb_cMJITCfpPtr, rb_intern("new"), 1, SIZET2NUM((size_t)cfp)); VALUE cfp_ptr = rb_funcall(rb_cMJITCfpPtr, rb_intern("new"), 1, SIZET2NUM((size_t)cfp));
result = rb_funcall(rb_MJITCompiler, rb_intern("stub_hit"), 2, branch_stub, cfp_ptr); result = rb_funcall(rb_MJITCompiler, rb_intern("stub_hit"), 2, branch_stub, cfp_ptr);
cfp->sp -= stack_max; cfp->sp -= sp_offset; // reset for consistency with the code without the stub
mjit_stats_p = mjit_opts.stats; mjit_stats_p = mjit_opts.stats;
mjit_call_p = original_call_p; mjit_call_p = original_call_p;