Implement concatstrings

This commit is contained in:
Takashi Kokubun 2023-03-03 22:21:56 -08:00
parent f85393514c
commit 6b2c3ff813
Notes: git 2023-03-06 07:29:39 +00:00
2 changed files with 28 additions and 3 deletions

View file

@ -24,7 +24,7 @@ module RubyVM::MJIT
asm.incr_counter(:mjit_insns_count) asm.incr_counter(:mjit_insns_count)
asm.comment("Insn: #{insn.name}") asm.comment("Insn: #{insn.name}")
# 67/101 # 68/101
case insn.name case insn.name
when :nop then nop(jit, ctx, asm) when :nop then nop(jit, ctx, asm)
when :getlocal then getlocal(jit, ctx, asm) when :getlocal then getlocal(jit, ctx, asm)
@ -48,7 +48,7 @@ module RubyVM::MJIT
when :putobject then putobject(jit, ctx, asm) when :putobject then putobject(jit, ctx, asm)
# putspecialobject # putspecialobject
when :putstring then putstring(jit, ctx, asm) when :putstring then putstring(jit, ctx, asm)
# concatstrings when :concatstrings then concatstrings(jit, ctx, asm)
when :anytostring then anytostring(jit, ctx, asm) when :anytostring then anytostring(jit, ctx, asm)
# toregexp # toregexp
# intern # intern
@ -555,7 +555,28 @@ module RubyVM::MJIT
KeepCompiling KeepCompiling
end end
# concatstrings # @param jit [RubyVM::MJIT::JITState]
# @param ctx [RubyVM::MJIT::Context]
# @param asm [RubyVM::MJIT::Assembler]
def concatstrings(jit, ctx, asm)
n = jit.operand(0)
# Save the PC and SP because we are allocating
jit_prepare_routine_call(jit, ctx, asm)
asm.lea(:rax, ctx.sp_opnd(-C.VALUE.size * n))
# call rb_str_concat_literals(size_t n, const VALUE *strings);
asm.mov(C_ARGS[0], n)
asm.mov(C_ARGS[1], :rax)
asm.call(C.rb_str_concat_literals)
ctx.stack_pop(n)
stack_ret = ctx.stack_push
asm.mov(stack_ret, C_RET)
KeepCompiling
end
# @param jit [RubyVM::MJIT::JITState] # @param jit [RubyVM::MJIT::JITState]
# @param ctx [RubyVM::MJIT::Context] # @param ctx [RubyVM::MJIT::Context]

View file

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