diff options
| -rw-r--r-- | lib/ruby_vm/mjit/block.rb | 1 | ||||
| -rw-r--r-- | lib/ruby_vm/mjit/compiler.rb | 2 | ||||
| -rw-r--r-- | lib/ruby_vm/mjit/exit_compiler.rb | 15 | ||||
| -rw-r--r-- | lib/ruby_vm/mjit/invariants.rb | 8 |
4 files changed, 16 insertions, 10 deletions
diff --git a/lib/ruby_vm/mjit/block.rb b/lib/ruby_vm/mjit/block.rb index 58c21c9c2a..238896d9ce 100644 --- a/lib/ruby_vm/mjit/block.rb +++ b/lib/ruby_vm/mjit/block.rb @@ -1,5 +1,6 @@ class RubyVM::MJIT::Block < Struct.new( :pc, # @param [Integer] Starting PC + :ctx, # @param [RubyVM::MJIT::Context] **Starting** Context (TODO: freeze?) :start_addr, # @param [Integer] Starting address of this block's JIT code :entry_exit, # @param [Integer] Address of entry exit (optional) ) diff --git a/lib/ruby_vm/mjit/compiler.rb b/lib/ruby_vm/mjit/compiler.rb index 9c58786be2..4b2c5c662d 100644 --- a/lib/ruby_vm/mjit/compiler.rb +++ b/lib/ruby_vm/mjit/compiler.rb @@ -149,7 +149,7 @@ module RubyVM::MJIT # @param asm [RubyVM::MJIT::Assembler] def compile_block(asm, jit:, pc: jit.iseq.body.iseq_encoded.to_i, ctx: Context.new) # Mark the block start address and prepare an exit code storage - jit.block = Block.new(pc:) + jit.block = Block.new(pc:, ctx: ctx.dup) asm.block(jit.block) # Compile each insn diff --git a/lib/ruby_vm/mjit/exit_compiler.rb b/lib/ruby_vm/mjit/exit_compiler.rb index 0019eda7bd..3b536ecc54 100644 --- a/lib/ruby_vm/mjit/exit_compiler.rb +++ b/lib/ruby_vm/mjit/exit_compiler.rb @@ -8,11 +8,12 @@ module RubyVM::MJIT # Used for invalidating a block on entry. # @param pc [Integer] # @param asm [RubyVM::MJIT::Assembler] - def compile_entry_exit(pc, asm, cause:) + def compile_entry_exit(pc, ctx, asm, cause:) # Increment per-insn exit counter incr_insn_exit(pc, asm) - # TODO: Saving pc and sp may be needed later + # Fix pc/sp offsets for the interpreter + save_pc_and_sp(pc, ctx, asm, reset_sp_offset: false) # Restore callee-saved registers asm.comment("#{cause}: entry exit") @@ -45,7 +46,7 @@ module RubyVM::MJIT incr_insn_exit(jit.pc, asm) # Fix pc/sp offsets for the interpreter - save_pc_and_sp(jit, ctx.dup, asm) # dup to avoid sp_offset update + save_pc_and_sp(jit.pc, ctx.dup, asm) # dup to avoid sp_offset update # Restore callee-saved registers asm.comment("exit to interpreter on #{pc_to_insn(jit.pc).name}") @@ -93,17 +94,19 @@ module RubyVM::MJIT # @param jit [RubyVM::MJIT::JITState] # @param ctx [RubyVM::MJIT::Context] # @param asm [RubyVM::MJIT::Assembler] - def save_pc_and_sp(jit, ctx, asm) + def save_pc_and_sp(pc, ctx, asm, reset_sp_offset: true) # Update pc (TODO: manage PC offset?) asm.comment("save PC#{' and SP' if ctx.sp_offset != 0} to CFP") - asm.mov(:rax, jit.pc) # rax = jit.pc + asm.mov(:rax, pc) # rax = jit.pc asm.mov([CFP, C.rb_control_frame_t.offsetof(:pc)], :rax) # cfp->pc = rax # Update sp if ctx.sp_offset != 0 asm.add(SP, C.VALUE.size * ctx.sp_offset) # sp += stack_size asm.mov([CFP, C.rb_control_frame_t.offsetof(:sp)], SP) # cfp->sp = sp - ctx.sp_offset = 0 + if reset_sp_offset + ctx.sp_offset = 0 + end end end diff --git a/lib/ruby_vm/mjit/invariants.rb b/lib/ruby_vm/mjit/invariants.rb index 49cd2dee4d..314fe90b8b 100644 --- a/lib/ruby_vm/mjit/invariants.rb +++ b/lib/ruby_vm/mjit/invariants.rb @@ -41,6 +41,7 @@ module RubyVM::MJIT @cme_blocks.fetch(cme.to_i, []).each do |block| @cb.with_write_addr(block.start_addr) do asm = Assembler.new + asm.comment('on_cme_invalidate') asm.jmp(block.entry_exit) @cb.write(asm) end @@ -53,9 +54,10 @@ module RubyVM::MJIT # @param block [RubyVM::MJIT::Block] def ensure_block_entry_exit(block, cause:) if block.entry_exit.nil? - asm = Assembler.new - @exit_compiler.compile_entry_exit(block.pc, asm, cause:) - block.entry_exit = @ocb.write(asm) + block.entry_exit = Assembler.new.then do |asm| + @exit_compiler.compile_entry_exit(block.pc, block.ctx, asm, cause:) + @ocb.write(asm) + end end end end |