From 6b2c3ff813a78559ab2e88495db593a54b47e995 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Fri, 3 Mar 2023 22:21:56 -0800 Subject: [PATCH] Implement concatstrings --- lib/ruby_vm/mjit/insn_compiler.rb | 27 ++++++++++++++++++++++++--- mjit_c.rb | 4 ++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/lib/ruby_vm/mjit/insn_compiler.rb b/lib/ruby_vm/mjit/insn_compiler.rb index 68f36c902a0940..1c49c162f3a192 100644 --- a/lib/ruby_vm/mjit/insn_compiler.rb +++ b/lib/ruby_vm/mjit/insn_compiler.rb @@ -24,7 +24,7 @@ def compile(jit, ctx, asm, insn) asm.incr_counter(:mjit_insns_count) asm.comment("Insn: #{insn.name}") - # 67/101 + # 68/101 case insn.name when :nop then nop(jit, ctx, asm) when :getlocal then getlocal(jit, ctx, asm) @@ -48,7 +48,7 @@ def compile(jit, ctx, asm, insn) when :putobject then putobject(jit, ctx, asm) # putspecialobject when :putstring then putstring(jit, ctx, asm) - # concatstrings + when :concatstrings then concatstrings(jit, ctx, asm) when :anytostring then anytostring(jit, ctx, asm) # toregexp # intern @@ -555,7 +555,28 @@ def putstring(jit, ctx, asm) KeepCompiling 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 ctx [RubyVM::MJIT::Context] diff --git a/mjit_c.rb b/mjit_c.rb index f87afdee9edb17..d134a81ecf8c60 100644 --- a/mjit_c.rb +++ b/mjit_c.rb @@ -355,6 +355,10 @@ def rb_obj_as_string_result Primitive.cexpr! 'SIZET2NUM((size_t)rb_obj_as_string_result)' end + def rb_str_concat_literals + Primitive.cexpr! 'SIZET2NUM((size_t)rb_str_concat_literals)' + end + #======================================================================================== # # Old stuff