:art: Use RegSetImm for switches

diff --git a/examples/dyn_switch.gw b/examples/dyn_switch.gw
index 805136714473951d562c570f98bda2df47108b19..0209d2d2600378fd7772a6627f2aa9b32141012f 100644 (file)
--- a/examples/dyn_switch.gw
+++ b/examples/dyn_switch.gw
@@ -1,5 +1,4 @@
-3 => 
-const int i;
+3 => const int i;
 2 => const int y;
 switch(i) {
   case 1: <<<1>>>;break;

diff --git a/src/emit/emit.c b/src/emit/emit.c
index d0bb4d58f59ed71d39a5d8b9977c3cc0960270fd..876dd314099b2f09fcb852a59658dc0b6942d52d 100644 (file)
--- a/src/emit/emit.c
+++ b/src/emit/emit.c
@@ -1130,7 +1130,7 @@ ANN static m_bool emit_switch_instr(const Emitter emit, Instr *instr) {
       CHECK_BB(emit_exp(emit, e, 0))
     *instr = emit_add_instr(emit, SwitchIni);
   } else {
-    const Instr instr = emit_add_instr(emit, RegPushImm);
+    const Instr instr = emit_add_instr(emit, RegSetImm);
     instr->m_val = (m_uint)switch_map(emit->env);
   }
   return GW_OK;
@@ -1146,9 +1146,9 @@ ANN static void emit_switch_map(const Instr instr, const Map map) {
 ANN static m_bool emit_stmt_switch(const Emitter emit, const Stmt_Switch stmt) { GWDEBUG_EXE
   switch_get(emit->env, stmt);
   Instr push = NULL;
+  CHECK_BB(emit_exp(emit, stmt->val, 0))
   CHECK_BB(emit_switch_instr(emit, &push))
   vector_add(&emit->code->stack_break, (vtype)NULL);
-  CHECK_BB(emit_exp(emit, stmt->val, 0))
   const Instr instr = emit_add_instr(emit, BranchSwitch);
   instr->m_val2 = (m_uint)switch_map(emit->env);
   CHECK_BB(emit_stmt(emit, stmt->stmt, 1))

diff --git a/src/lib/instr.c b/src/lib/instr.c
index da88ca359d199ec9dcb5b2f7163fe77e6ec10049..b56d81ab4218bfd598e57c398a7575ef3bc3de4e 100644 (file)
--- a/src/lib/instr.c
+++ b/src/lib/instr.c
@@ -36,16 +36,16 @@ INSTR(SwitchIni) {
   const Vector v = (Vector)instr->m_val;
   const m_uint size = vector_size(v);
   const Map m = (Map)instr->m_val2;
-  POP_REG(shred, SZ_INT * (size-1));
+  POP_REG(shred, SZ_INT * (size));
   for(m_uint i = 0; i < size; ++i)
-    map_set(m, *(vtype*)REG((i-1) * SZ_INT), vector_at(v, i));
-  *(Map*)REG(-SZ_INT) = m;
+    map_set(m, *(vtype*)REG((i) * SZ_INT), vector_at(v, i));
+  *(Map*)REG(0) = m;
 }
 
 INSTR(BranchSwitch) { GWDEBUG_EXE
-  POP_REG(shred, SZ_INT*2);
-  const Map map = *(Map*)REG(0);
-  shred->pc = map_get(map, *(m_uint*)REG(SZ_INT)) ?: instr->m_val;
+  POP_REG(shred, SZ_INT);
+  const Map map = *(Map*)REG(SZ_INT);
+  shred->pc = map_get(map, *(m_uint*)REG(0)) ?: instr->m_val;
 }
 
 INSTR(AutoLoopStart) { GWDEBUG_EXE

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 5aa5f42546ec32109489e90576fe056a14965fc8..e69eb31e98f5f060a822a5bbaffa587132669aef 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -532,11 +532,11 @@ firmul: FI_R(*)
 firdiv: FI_R(/)
 
 itof:
-  reg -=SZ_INT - SZ_FLOAT;
+  reg -= SZ_INT - SZ_FLOAT;
   *(m_float*)(reg-SZ_FLOAT) = (m_float)*(m_int*)(reg-SZ_FLOAT);
   DISPATCH()
 ftoi:
-  reg -= SZ_FLOAT -SZ_INT;
+  reg -= SZ_FLOAT - SZ_INT;
   *(m_int*)(reg-SZ_INT) = (m_int)*(m_float*)(reg-SZ_INT);
   DISPATCH()
 
@@ -756,11 +756,9 @@ staticother:
   DISPATCH()
 dotfunc:
   assert(a.obj);
-//  *(VM_Code*)(reg) = ((Func)vector_at(&a.obj->type_ref->nspc->vtable, instr->m_val))->code;
   *(VM_Code*)(reg) = ((Func)vector_at(a.obj->vtable, instr->m_val))->code;
   reg += SZ_INT;
   DISPATCH()
-//dottemplate:
 staticcode:
   (*(VM_Code*)reg = ((Func)instr->m_val)->code);
   reg += SZ_INT;