jit strfromcodes

MoarVM · Jun 9, 2019 · 6053919 · 6053919 · lizmat · Jun 9, 2019
1 parent b55658b
commit 6053919
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/jit/core_templates.expr b/src/jit/core_templates.expr
@@ -2247,6 +2247,12 @@
       (carg (tc) ptr)
       (carg $1   ptr)) int_sz))
 
+(template: strfromcodes
+  (call (^func &MVM_unicode_codepoints_to_nfg_string)
+    (arglist
+      (carg (tc) ptr)
+      (carg $1 ptr)) ptr_sz))
+
 (template: eqatim_s
   (call (^func &MVM_string_equal_at_ignore_mark)
     (arglist

diff --git a/src/jit/graph.c b/src/jit/graph.c
@@ -392,6 +392,7 @@ static void * op_to_func(MVMThreadContext *tc, MVMint16 opcode) {
     case MVM_OP_decodeconf: return MVM_string_decode_from_buf_config;
     case MVM_OP_decoderepconf: return MVM_string_decode_from_buf_config;
     case MVM_OP_strfromname: return MVM_unicode_string_from_name;
+    case MVM_OP_strfromcodes: return MVM_unicode_codepoints_to_nfg_string;
     case MVM_OP_callercode: return MVM_frame_caller_code;
     case MVM_OP_stat: return MVM_file_stat;
     case MVM_OP_lstat: return MVM_file_stat;
@@ -3839,6 +3840,14 @@ static MVMint32 consume_ins(MVMThreadContext *tc, MVMJitGraph *jg,
         jg_append_call_c(tc, jg, op_to_func(tc, op), 2, args, MVM_JIT_RV_PTR, dst);
         break;
     }
+    case MVM_OP_strfromcodes: {
+        MVMint16 dst = ins->operands[0].reg.orig;
+        MVMint16 src = ins->operands[1].reg.orig;
+        MVMJitCallArg args[] = { { MVM_JIT_INTERP_VAR, { MVM_JIT_INTERP_TC } },
+                                 { MVM_JIT_REG_VAL, { src } } };
+        jg_append_call_c(tc, jg, op_to_func(tc, op), 2, args, MVM_JIT_RV_PTR, dst);
+        break;
+    }
     case MVM_OP_callercode: {
         MVMint16 dst = ins->operands[0].reg.orig;
         MVMJitCallArg args[] = { { MVM_JIT_INTERP_VAR, { MVM_JIT_INTERP_TC } } };