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

Save PC and SP on entry exit

Browse source
This commit is contained in:
Takashi Kokubun 2023-02-08 10:24:13 -08:00
parent 6be4e065eb
commit 2cd6406d67
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/ruby_vm/mjit/block.rb
View file

@ -1,5 +1,6 @@
class RubyVM::MJIT::Block < Struct.new( class RubyVM::MJIT::Block < Struct.new(
:pc, # @param [Integer] Starting PC :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 :start_addr, # @param [Integer] Starting address of this block's JIT code
:entry_exit, # @param [Integer] Address of entry exit (optional) :entry_exit, # @param [Integer] Address of entry exit (optional)
) )

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

@ -149,7 +149,7 @@ module RubyVM::MJIT
# @param asm [RubyVM::MJIT::Assembler] # @param asm [RubyVM::MJIT::Assembler]
def compile_block(asm, jit:, pc: jit.iseq.body.iseq_encoded.to_i, ctx: Context.new) 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 # 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) asm.block(jit.block)
# Compile each insn # Compile each insn

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

@ -8,11 +8,12 @@ module RubyVM::MJIT
# Used for invalidating a block on entry. # Used for invalidating a block on entry.
# @param pc [Integer] # @param pc [Integer]
# @param asm [RubyVM::MJIT::Assembler] # @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 # Increment per-insn exit counter
incr_insn_exit(pc, asm) 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 # Restore callee-saved registers
asm.comment("#{cause}: entry exit") asm.comment("#{cause}: entry exit")
@ -45,7 +46,7 @@ module RubyVM::MJIT
incr_insn_exit(jit.pc, asm) incr_insn_exit(jit.pc, asm)
# Fix pc/sp offsets for the interpreter # 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 # Restore callee-saved registers
asm.comment("exit to interpreter on #{pc_to_insn(jit.pc).name}") 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 jit [RubyVM::MJIT::JITState]
# @param ctx [RubyVM::MJIT::Context] # @param ctx [RubyVM::MJIT::Context]
# @param asm [RubyVM::MJIT::Assembler] # @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?) # Update pc (TODO: manage PC offset?)
asm.comment("save PC#{' and SP' if ctx.sp_offset != 0} to CFP") 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 asm.mov([CFP, C.rb_control_frame_t.offsetof(:pc)], :rax) # cfp->pc = rax
# Update sp # Update sp
if ctx.sp_offset != 0 if ctx.sp_offset != 0
asm.add(SP, C.VALUE.size * ctx.sp_offset) # sp += stack_size 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 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
end end

8
lib/ruby_vm/mjit/invariants.rb
View file

@ -41,6 +41,7 @@ module RubyVM::MJIT
@cme_blocks.fetch(cme.to_i, []).each do |block| @cme_blocks.fetch(cme.to_i, []).each do |block|
@cb.with_write_addr(block.start_addr) do @cb.with_write_addr(block.start_addr) do
asm = Assembler.new asm = Assembler.new
asm.comment('on_cme_invalidate')
asm.jmp(block.entry_exit) asm.jmp(block.entry_exit)
@cb.write(asm) @cb.write(asm)
end end
@ -53,9 +54,10 @@ module RubyVM::MJIT
# @param block [RubyVM::MJIT::Block] # @param block [RubyVM::MJIT::Block]
def ensure_block_entry_exit(block, cause:) def ensure_block_entry_exit(block, cause:)
if block.entry_exit.nil? if block.entry_exit.nil?
asm = Assembler.new block.entry_exit = Assembler.new.then do |asm|
@exit_compiler.compile_entry_exit(block.pc, asm, cause:) @exit_compiler.compile_entry_exit(block.pc, block.ctx, asm, cause:)
block.entry_exit = @ocb.write(asm) @ocb.write(asm)
end
end end
end end
end end