Allow NativeRef to spesh assign_i and decont_i

this uses the op the previous commit introduced.
MoarVM · Nov 30, 2015 · de68134 · de68134
1 parent c7706c4
commit de68134
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/src/6model/reprs/NativeRef.c b/src/6model/reprs/NativeRef.c
@@ -142,6 +142,44 @@ const MVMREPROps * MVMNativeRef_initialize(MVMThreadContext *tc) {
     return &this_repr;
 }
 
+static void spesh(MVMThreadContext *tc, MVMSTable *st, MVMSpeshGraph *g, MVMSpeshBB *bb, MVMSpeshIns *ins) {
+    MVMNativeRefREPRData * repr_data = (MVMNativeRefREPRData *)st->REPR_data;
+    MVMuint16              opcode    = ins->info->opcode;
+
+    if (!repr_data)
+        return;
+
+    if (repr_data->ref_kind != MVM_NATIVEREF_REG_OR_LEX)
+        return; /* TODO implement spesh for attribute and positional references */
+
+    switch (opcode) {
+        case MVM_OP_assign_i: {
+            MVMSpeshOperand target   = ins->operands[0];
+            MVMSpeshOperand value    = ins->operands[1];
+            if (repr_data->primitive_type != MVM_STORAGE_SPEC_BP_INT)
+                return; /* Shouldn't happen. so maybe throw an error? */
+            ins->info = MVM_op_get_op(MVM_OP_sp_deref_bind_i64);
+            ins->operands            = MVM_spesh_alloc(tc, g, 3 * sizeof(MVMSpeshOperand));
+            ins->operands[0]         = target;
+            ins->operands[1]         = value;
+            ins->operands[2].lit_i64 = offsetof(MVMNativeRef, body.u.reg_or_lex.var);
+            break;
+        }
+        case MVM_OP_decont_i: {
+            MVMSpeshOperand target   = ins->operands[0];
+            MVMSpeshOperand source   = ins->operands[1];
+            if (repr_data->primitive_type != MVM_STORAGE_SPEC_BP_INT)
+                return; /* Shouldn't happen. so maybe throw an error? */
+            ins->info = MVM_op_get_op(MVM_OP_sp_deref_get_i64);
+            ins->operands            = MVM_spesh_alloc(tc, g, 3 * sizeof(MVMSpeshOperand));
+            ins->operands[0]         = target;
+            ins->operands[1]         = source;
+            ins->operands[2].lit_i64 = offsetof(MVMNativeRef, body.u.reg_or_lex.var);
+            break;
+        }
+    }
+}
+
 static const MVMREPROps this_repr = {
     type_object_for,
     MVM_gc_allocate_object,
@@ -165,7 +203,7 @@ static const MVMREPROps this_repr = {
     NULL, /* gc_mark_repr_data */
     gc_free_repr_data,
     compose,
-    NULL, /* spesh */
+    spesh, /* spesh */
     "NativeRef", /* name */
     MVM_REPR_ID_NativeRef,
     1, /* refs_frames */

diff --git a/src/spesh/optimize.c b/src/spesh/optimize.c
@@ -1509,6 +1509,8 @@ static void optimize_bb(MVMThreadContext *tc, MVMSpeshGraph *g, MVMSpeshBB *bb)
         case MVM_OP_bindattrs_n:
         case MVM_OP_bindattrs_s:
         case MVM_OP_bindattrs_o:
+        case MVM_OP_assign_i:
+        case MVM_OP_assign_n:
             optimize_repr_op(tc, g, bb, ins, 0);
             break;
         case MVM_OP_atpos_i:
@@ -1538,6 +1540,8 @@ static void optimize_bb(MVMThreadContext *tc, MVMSpeshGraph *g, MVMSpeshBB *bb)
         case MVM_OP_getattrs_n:
         case MVM_OP_getattrs_s:
         case MVM_OP_getattrs_o:
+        case MVM_OP_decont_i:
+        case MVM_OP_decont_n:
         case MVM_OP_create:
             optimize_repr_op(tc, g, bb, ins, 1);
             break;