cfg tree collection evaluation

Author: ryanfleury

src/eval/eval.mdesk

@@ -71,6 +71,7 @@ E_TypeKindTable:
   {IncompleteEnum            "enum"                0    }
   {Bitfield                  "bitfield"            0    }
   {Variadic                  "variadic"            0    }
+  {SpacePtr                  "space_ptr"           0    }
 }
 
 @table(name  op_kind  precedence  string  op_pre  op_sep  op_pos)

src/eval/eval_bundles.c

@@ -11,13 +11,11 @@ e_eval_from_expr(Arena *arena, E_Expr *expr)
   E_OpList         oplist   = e_oplist_from_irtree(arena, irtree.root);
   String8          bytecode = e_bytecode_from_oplist(arena, &oplist);
   E_Interpretation interp   = e_interpret(bytecode);
-  E_Space zero_space = {0};
-  E_Space space = (MemoryMatchStruct(&zero_space, &irtree.space) ? e_interpret_ctx->primary_space : irtree.space);
   E_Eval eval =
   {
     .value    = interp.value,
     .mode     = irtree.mode,
-    .space    = space,
+    .space    = interp.space,
     .expr     = expr,
     .type_key = irtree.type_key,
     .code     = interp.code,

src/eval/eval_interpret.c

@@ -74,7 +74,8 @@ e_interpret(String8 bytecode)
     }
     else switch(op)
     {
-      case E_IRExtKind_SetSpace:{ctrlbits = RDI_EVAL_CTRLBITS(32, 0, 0);}break;
+      case E_IRExtKind_SetSpace:     {ctrlbits = RDI_EVAL_CTRLBITS(32, 0, 0);}break;
+      case E_IRExtKind_DerefSpacePtr:{ctrlbits = RDI_EVAL_CTRLBITS(0, 1, 1);}break;
       default:
       {
         result.code = E_InterpretationCode_BadOp;
@@ -124,6 +125,27 @@ e_interpret(String8 bytecode)
         MemoryCopy(&selected_space, &imm, sizeof(selected_space));
       }break;
 
+      case E_IRExtKind_DerefSpacePtr:
+      {
+        U64 addr = svals[0].u64;
+        U64 size = sizeof(E_Space) + sizeof(U64);
+        typedef struct SpacePtrRead SpacePtrRead;
+        struct SpacePtrRead
+        {
+          E_Space space;
+          U64 off;
+        };
+        SpacePtrRead space_ptr_read = {0};
+        B32 good_read = e_space_read(selected_space, &space_ptr_read, r1u64(addr, addr+size));
+        if(!good_read)
+        {
+          result.code = E_InterpretationCode_BadMemRead;
+          goto done;
+        }
+        MemoryCopyStruct(&selected_space, &space_ptr_read.space);
+        nval.u64 = space_ptr_read.off;
+      }break;
+      
       case RDI_EvalOp_Stop:
       {
         goto done;
@@ -812,6 +834,7 @@ e_interpret(String8 bytecode)
   {
     result.value = stack[0];
   }
+  result.space = selected_space;
   scratch_end(scratch);
   return result;
 }

src/eval/eval_interpret.h

@@ -11,6 +11,7 @@ typedef struct E_Interpretation E_Interpretation;
 struct E_Interpretation
 {
   E_Value value;
+  E_Space space;
   E_InterpretationCode code;
 };