This commit is contained in:
Takashi Kokubun 2023-02-21 00:19:37 -08:00
Родитель 32e6f15beb
Коммит 8d29b0635b
5 изменённых файлов: 37 добавлений и 12 удалений

Просмотреть файл

@ -1,9 +1,5 @@
module RubyVM::MJIT
class ExitCompiler
def initialize
@gc_refs = [] # TODO: GC offsets?
end
# Used for invalidating a block on entry.
# @param pc [Integer]
# @param asm [RubyVM::MJIT::Assembler]
@ -133,7 +129,7 @@ module RubyVM::MJIT
end
def to_value(obj)
@gc_refs << obj
GC_REFS << obj
C.to_value(obj)
end

Просмотреть файл

@ -5,7 +5,6 @@ module RubyVM::MJIT
def initialize(cb, ocb, exit_compiler)
@ocb = ocb
@exit_compiler = exit_compiler
@gc_refs = [] # TODO: GC offsets?
@full_cfunc_return = Assembler.new.then do |asm|
@exit_compiler.compile_full_cfunc_return(asm)
@ -23,7 +22,7 @@ module RubyVM::MJIT
asm.incr_counter(:mjit_insns_count)
asm.comment("Insn: #{insn.name}")
# 55/101
# 56/101
case insn.name
when :nop then nop(jit, ctx, asm)
when :getlocal then getlocal(jit, ctx, asm)
@ -46,7 +45,7 @@ module RubyVM::MJIT
when :putself then putself(jit, ctx, asm)
when :putobject then putobject(jit, ctx, asm)
# putspecialobject
# putstring
when :putstring then putstring(jit, ctx, asm)
# concatstrings
# anytostring
# toregexp
@ -299,7 +298,26 @@ module RubyVM::MJIT
end
# putspecialobject
# putstring
# @param jit [RubyVM::MJIT::JITState]
# @param ctx [RubyVM::MJIT::Context]
# @param asm [RubyVM::MJIT::Assembler]
def putstring(jit, ctx, asm)
put_val = jit.operand(0, ruby: true)
# Save the PC and SP because the callee will allocate
jit_prepare_routine_call(jit, ctx, asm)
asm.mov(C_ARGS[0], EC)
asm.mov(C_ARGS[1], to_value(put_val))
asm.call(C.rb_ec_str_resurrect)
stack_top = ctx.stack_push
asm.mov(stack_top, C_RET)
KeepCompiling
end
# concatstrings
# anytostring
# toregexp
@ -2508,7 +2526,7 @@ module RubyVM::MJIT
end
def to_value(obj)
@gc_refs << obj
GC_REFS << obj
C.to_value(obj)
end
end

Просмотреть файл

@ -82,6 +82,9 @@ module RubyVM::MJIT
end
def on_update_references
# Give up. In order to support GC.compact, you'd have to update ISEQ
# addresses in BranchStub, etc. Ideally, we'd need to update moved
# pointers in JITed code here, but we just invalidate all for now.
invalidate_all
end

Просмотреть файл

@ -13,9 +13,13 @@ module RubyVM::MJIT
Compiler.decode_insn(C.VALUE.new(pc).*)
end
def operand(index, signed: false)
def operand(index, signed: false, ruby: false)
addr = pc + (index + 1) * Fiddle::SIZEOF_VOIDP
Fiddle::Pointer.new(addr)[0, Fiddle::SIZEOF_VOIDP].unpack(signed ? 'q' : 'Q')[0]
value = Fiddle::Pointer.new(addr)[0, Fiddle::SIZEOF_VOIDP].unpack(signed ? 'q' : 'Q')[0]
if ruby
value = C.to_ruby(value)
end
value
end
def at_current_insn?

Просмотреть файл

@ -199,6 +199,10 @@ module RubyVM::MJIT # :nodoc: all
}
end
def rb_ec_str_resurrect
Primitive.cexpr! 'SIZET2NUM((size_t)rb_ec_str_resurrect)'
end
#========================================================================================
#
# Old stuff