1 files changed, 58 insertions, 2 deletions

diff --git a/src/vm.c b/src/vm.c
index 4e15bee..205c15a 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -137,7 +137,6 @@ vm_run(VM *vm) {
             case OP_LDGVAR: {
                 u8 dst = instruction.dst;
                 u8 src = instruction.a;
-                println("dst: %d src: %d", dst, src);
                 Variable var = vm->chunk->vars[src];
                 s64 *stack = (s64 *)&vm->stack[var.offset];
                 vm->regs[dst].i = *stack;
@@ -156,6 +155,62 @@ vm_run(VM *vm) {
                 s64 *stack = (s64 *)&vm->stack[var.offset];
                 *stack = vm->chunk->constants[src].i;
             } break;
+            case OP_JMPI: {
+                sz offset = vm->chunk->constants[instruction.dst].i;
+                vm->ip += offset - 1;
+            } break;
+            case OP_JMPFI: {
+                bool cond = vm->chunk->constants[instruction.dst].i;
+                sz offset = vm->chunk->constants[instruction.a].i;
+                if (!cond) {
+                    vm->ip += offset - 1;
+                }
+            } break;
+            case OP_JMPTI: {
+                bool cond = vm->chunk->constants[instruction.dst].i;
+                sz offset = vm->chunk->constants[instruction.a].i;
+                if (cond) {
+                    vm->ip += offset - 1;
+                }
+            } break;
+            case OP_JMP: {
+                sz offset = vm->chunk->constants[instruction.dst].i;
+                vm->ip += offset - 1;
+            } break;
+            case OP_JMPF: {
+                bool cond = vm->regs[instruction.dst].i;
+                sz offset = vm->chunk->constants[instruction.a].i;
+                if (!cond) {
+                    vm->ip += offset - 1;
+                }
+            } break;
+            case OP_JMPT: {
+                bool cond = vm->regs[instruction.dst].i;
+                sz offset = vm->chunk->constants[instruction.a].i;
+                if (cond) {
+                    vm->ip += offset - 1;
+                }
+            } break;
+            case OP_MOV64: {
+                u8 dst = instruction.dst;
+                u8 src = instruction.a;
+                vm->regs[dst] = vm->regs[src];
+            } break;
+            case OP_MOV32: {
+                u8 dst = instruction.dst;
+                u8 src = instruction.a;
+                vm->regs[dst].i = vm->regs[src].i & 0xFFFFFFFF;
+            } break;
+            case OP_MOV16: {
+                u8 dst = instruction.dst;
+                u8 src = instruction.a;
+                vm->regs[dst].i = vm->regs[src].i & 0xFFFF;
+            } break;
+            case OP_MOV8: {
+                u8 dst = instruction.dst;
+                u8 src = instruction.a;
+                vm->regs[dst].i = vm->regs[src].i & 0xFF;
+            } break;
             case OP_HALT: {
                 println("VM HALT (int)   -> %d", vm->regs[instruction.dst]);
                 println("VM HALT (float) -> %f", vm->regs[instruction.dst]);
@@ -163,7 +218,8 @@ vm_run(VM *vm) {
                 return;
             }
             default: {
-                eprintln("unimplemented OP code: %d", instruction.op);
+                // eprintln("unimplemented OP code: %d", instruction.op);
+                eprintln("unimplemented OP code: %s", op_str[instruction.op]);
                 return;
             }
         }