1 files changed, 20 insertions, 0 deletions

diff --git a/src/compiler.c b/src/compiler.c
index 04afd5d..bd50955 100644
--- a/src/compiler.c
+++ b/src/compiler.c
@@ -10,6 +10,7 @@ typedef struct Variable {
     Str type;
     sz size;
     sz offset;
+    sz idx;
 } Variable;
 
 MAPDEF(StrVarMap, varmap, Str, Variable, str_hash, str_eq)
@@ -63,6 +64,7 @@ typedef enum OpCode {
     OP_HALT,    // halt
     OP_STVARI,  // stvari vx, ca
     OP_STVAR,   // stvar  vx, ra
+    OP_LDVAR,   // ldvar  rx, vx
     // Load/Store instructions.
     OP_LD8K,   // ld8k   rx, ca      -> u8  rx = ca
     OP_LD16K,  // ld16k  rx, ca      -> u16 rx = ca
@@ -147,6 +149,7 @@ Str op_str[] = {
     [OP_HALT] = cstr("HALT    "),
     [OP_STVAR] = cstr("STVAR   "),
     [OP_STVARI] = cstr("STVARI  "),
+    [OP_LDVAR] = cstr("LDVAR   "),
     // Load ops.
     [OP_LD8K] = cstr("LD8K    "),
     [OP_LD16K] = cstr("LD16K   "),
@@ -498,6 +501,7 @@ compile_expr(Chunk *chunk, Node *node) {
                 .type = type,
                 .size = size,
                 .offset = chunk->var_off,
+                .idx = idx,
             };
             varmap_insert(&chunk->varmap, name, var, chunk->storage);
             array_push(chunk->vars, var, chunk->storage);
@@ -523,6 +527,18 @@ compile_expr(Chunk *chunk, Node *node) {
 
             return (CompResult){.type = COMP_NIL};
         } break;
+        case NODE_SYMBOL: {
+            Str name = node->unique_name;
+            StrVarMap *map = varmap_lookup(&chunk->varmap, name);
+            if (!map) {
+                println("error: unreachable... name: %s", name);
+                exit(EXIT_FAILURE);
+            }
+            Variable var = map->val;
+            u8 reg_dst = chunk->reg_idx++;
+            EMIT_OP(OP_LDVAR, reg_dst, var.idx, 0, node->var_val, chunk);
+            return (CompResult){.type = COMP_REG, .idx = reg_dst};
+        } break;
         case NODE_BLOCK: {
             CompResult res;
             for (sz i = 0; i < array_size(node->elements); i++) {
@@ -623,6 +639,10 @@ disassemble_instruction(Instruction instruction) {
             println("%s r%d, r%d, r%d", op_str[instruction.op], instruction.dst,
                     instruction.a, instruction.b);
             break;
+        case OP_LDVAR:
+            println("%s r%d, v%d", op_str[instruction.op], instruction.dst,
+                    instruction.a, instruction.b);
+            break;
         case OP_STVAR:
             println("%s v%d, r%d", op_str[instruction.op], instruction.dst,
                     instruction.a, instruction.b);