:art: Rename RegPushImm0 => RegPushImm

diff --git a/src/emit/emit.c b/src/emit/emit.c
index 09a7d48965ce9009115be5ddf5a32f978c036052..173d22b5b827452f3b0db24f66682b203a0ce0ba 100644 (file)
--- a/src/emit/emit.c
+++ b/src/emit/emit.c
@@ -193,9 +193,9 @@ ANN ArrayInfo* emit_array_extend_inner(const Emitter emit, const Type t, const E
 
 ANN void emit_ext_ctor(const Emitter emit, const VM_Code code) { GWDEBUG_EXE
   emit_add_instr(emit, RegDup);
-  const Instr push_f = emit_add_instr(emit, RegPushImm0);
+  const Instr push_f = emit_add_instr(emit, RegPushImm);
   push_f->m_val = (m_uint)code;
-  const Instr offset = emit_add_instr(emit, RegPushImm0);
+  const Instr offset = emit_add_instr(emit, RegPushImm);
   offset->m_val = emit_code_offset(emit);
   emit_add_instr(emit, FuncMember);
 }
@@ -260,7 +260,7 @@ ANN static m_bool emit_symbol_owned(const Emitter emit, const Exp_Primary* prim)
 ANN static m_bool emit_symbol_builtin(const Emitter emit, const Exp_Primary* prim) { GWDEBUG_EXE
   const Value v = prim->value;
   if(GET_FLAG(v, func)) {
-    const Instr instr = emit_add_instr(emit, RegPushImm0);
+    const Instr instr = emit_add_instr(emit, RegPushImm);
     instr->m_val = (m_uint)v->d.func_ref;
     return GW_OK;
   }
@@ -272,7 +272,7 @@ ANN static m_bool emit_symbol_builtin(const Emitter emit, const Exp_Primary* pri
     const m_uint size = v->type->size;
     const Instr instr = emit_kind(emit, size, prim->self->emit_var, regpushimm);
     if(size == SZ_INT) {
-      instr->execute = RegPushImm0;
+      instr->execute = RegPushImm;
       instr->m_val = (m_uint)v->d.ptr;
     } else if(v->d.ptr)
         memcpy(instr->ptr, v->d.ptr, v->type->size);
@@ -382,7 +382,7 @@ ANN static m_bool prim_id(const Emitter emit, const Exp_Primary* prim) {
 }
 
 ANN static m_bool prim_num(const Emitter emit, const Exp_Primary * primary) {
-  const Instr instr = emit_add_instr(emit, RegPushImm0);
+  const Instr instr = emit_add_instr(emit, RegPushImm);
   instr->m_val = primary->d.num;
   return GW_OK;
 }
@@ -396,7 +396,7 @@ ANN static m_bool prim_float(const Emitter emit, const Exp_Primary* primary) {
 ANN static m_bool prim_char(const Emitter emit, const Exp_Primary* prim) {
   const m_int c = str2char(prim->d.chr, prim->self->pos);
   CHECK_BB(c);
-  const Instr instr = emit_add_instr(emit, RegPushImm0);
+  const Instr instr = emit_add_instr(emit, RegPushImm);
   instr->m_val = (m_uint)c;
   return GW_OK;
 }
@@ -455,7 +455,7 @@ ANN static m_bool emit_exp_primary(const Emitter emit, const Exp_Primary* prim)
 }
 
 ANN static m_bool emit_dot_static_data(const Emitter emit, const Value v, const uint  emit_var) { GWDEBUG_EXE
-  const Instr push = emit_add_instr(emit, RegPushImm0);
+  const Instr push = emit_add_instr(emit, RegPushImm);
   push->m_val = (m_uint)v->owner_class;
   const m_uint size = v->type->size;
   const Instr instr = emit_kind(emit, size, emit_var, dotstatic);
@@ -651,7 +651,7 @@ ANN static m_bool emit_exp_dur(const Emitter emit, const Exp_Dur* dur) { GWDEBUG
 static inline m_bool push_func_code(const Emitter emit, const Func f) {
   const Instr back = (Instr)vector_back(&emit->code->instr);
   if(back->execute == RegPushBase) {
-    back->execute = RegPushImm0;
+    back->execute = RegPushImm;
     back->m_val = (m_uint)f->code;
     return GW_OK;
   }
@@ -686,7 +686,7 @@ ANN m_bool emit_exp_call1(const Emitter emit, const Func func) { GWDEBUG_EXE
     CHECK_BB(emit_exp_call1_code(emit, func))
   else
     push_func_code(emit, func);
-  const Instr offset = emit_add_instr(emit, RegPushImm0);
+  const Instr offset = emit_add_instr(emit, RegPushImm);
   offset->m_val = emit_code_offset(emit);
   const Instr instr = emit_call(emit, func);
   const m_uint size = instr->m_val = func->def->ret_type->size;
@@ -741,7 +741,7 @@ ANN static m_bool spork_func(const Emitter emit, const Exp_Call* exp) { GWDEBUG_
     SET_FLAG(emit->code, member);
   const Instr op = emit_add_instr(emit, MemPushImm);
   op->m_val = emit->code->stack_depth;
-  emit_add_instr(emit, RegPushImm0); // should push func
+  emit_add_instr(emit, RegPushImm); // should push func
   CHECK_BB(emit_exp_call1(emit, exp->m_func))
   const VM_Code code = finalyze(emit);
   const m_uint size = exp->m_func->def->stack_depth - (GET_FLAG(exp->m_func,
@@ -750,7 +750,7 @@ ANN static m_bool spork_func(const Emitter emit, const Exp_Call* exp) { GWDEBUG_
 }
 
 ANN static m_bool spork_code(const Emitter emit, const Stmt stmt) { GWDEBUG_EXE
-  emit_add_instr(emit, RegPushImm0);
+  emit_add_instr(emit, RegPushImm);
   push_spork_code(emit, SPORK_CODE_PREFIX, stmt->pos);
   if(SAFE_FLAG(emit->env->func, member))
     stack_alloc_this(emit);
@@ -1268,7 +1268,7 @@ ANN static m_bool is_special(const Type t) {
 ANN static m_bool emit_dot_static_import_data(const Emitter emit, const Value v, const uint emit_addr) { GWDEBUG_EXE
   if(v->d.ptr && GET_FLAG(v, builtin)) { // from C
     if(GET_FLAG(v, enum)) {
-      const Instr func_i = emit_add_instr(emit, RegPushImm0);
+      const Instr func_i = emit_add_instr(emit, RegPushImm);
       func_i->m_val = (m_uint)v->d.ptr;
     } else {
       const m_uint size = v->type->size;
@@ -1277,7 +1277,7 @@ ANN static m_bool emit_dot_static_import_data(const Emitter emit, const Value v,
         (m_uint)&v->d.ptr : (m_uint)v->d.ptr);
     }
   } else { // from code
-    const Instr push_i = emit_add_instr(emit, RegPushImm0);
+    const Instr push_i = emit_add_instr(emit, RegPushImm);
     push_i->m_val = (m_uint)v->owner_class;
     const m_uint size = v->type->size;
     const Instr instr = emit_kind(emit, size, emit_addr, dotstatic);
@@ -1301,7 +1301,7 @@ ANN static m_bool emit_complex_member(const Emitter emit, const Exp_Dot* member)
 }
 
 ANN static inline void emit_vec_func(const Emitter emit, const Value v) {
-  const Instr instr = emit_add_instr(emit, RegPushImm0);
+  const Instr instr = emit_add_instr(emit, RegPushImm);
   instr->m_val = (m_uint)((Func)vector_at(&v->owner_class->nspc->vtable, v->d.func_ref->vt_index))->code;
 }
 
@@ -1367,7 +1367,7 @@ ANN static m_bool emit_exp_dot_special(const Emitter emit, const Exp_Dot* member
 }
 
 ANN static m_bool emit_dot_static_func(const Emitter emit, const Func func) { GWDEBUG_EXE
-  const Instr func_i = emit_add_instr(emit, RegPushImm0);
+  const Instr func_i = emit_add_instr(emit, RegPushImm);
   func_i->m_val = (m_uint)func;
   return GW_OK;
 }
@@ -1463,7 +1463,7 @@ ANN static void emit_func_def_ensure(const Emitter emit, const Func_Def func_def
   const m_uint size = func_def->ret_type->size;
   if(size) {
     if(size == SZ_INT)
-       emit_add_instr(emit, RegPushImm0);
+       emit_add_instr(emit, RegPushImm);
     else
       emit_kind(emit, size, 0, regpushimm);
   }

diff --git a/src/lib/instr.c b/src/lib/instr.c
index dcc5eb80cc1889d3f6d613828d3fba5d4a0e0536..e5f5ee2a53369f48dc9f19f494058b71d47a37ca 100644 (file)
--- a/src/lib/instr.c
+++ b/src/lib/instr.c
@@ -59,7 +59,7 @@ INSTR(RegPop) { GWDEBUG_EXE
   POP_REG(shred, instr->m_val);
 }
 
-INSTR(RegPushImm0) { GWDEBUG_EXE
+INSTR(RegPushImm) { GWDEBUG_EXE
   *(m_uint*)shred->reg = instr->m_val;
   shred->reg += SZ_INT;
 }

diff --git a/src/parse/operator.c b/src/parse/operator.c
index 31e86bd83c53abf90487bb083d777fb00d538142..2c2b7df32ea14e874d8a7511fc6d27cd21965fe6 100644 (file)
--- a/src/parse/operator.c
+++ b/src/parse/operator.c
@@ -172,7 +172,7 @@ ANN m_bool operator_set_func(const struct Op_Import* opi) {
 
 ANN static m_bool handle_instr(const Emitter emit, const M_Operator* mo) {
   if(mo->func) {
-    const Instr instr = emit_add_instr(emit, RegPushImm0);
+    const Instr instr = emit_add_instr(emit, RegPushImm);
     instr->m_val = (m_uint)mo->func;
     return emit_exp_call1(emit, mo->func);
   }