:bug: Fix func spork in spork

diff --git a/include/opcode.h b/include/opcode.h
index 4e02f286dbd4360ebf1dcd40e12a66b650d47a58..2b7db10bab8a4fac15e506d11b96007660040179 100644 (file)
--- a/include/opcode.h
+++ b/include/opcode.h
@@ -132,7 +132,6 @@ enum {
   eSporkIni,
   eForkIni,
   eSporkFunc,
-  eSporkThis,
   eSporkExp,
   eForkEnd,
   eSporkEnd,
@@ -305,7 +304,6 @@ enum {
 #define  SporkIni            (f_instr)eSporkIni
 #define  ForkIni             (f_instr)eForkIni
 #define  SporkFunc           (f_instr)eSporkFunc
-#define  SporkThis           (f_instr)eSporkThis
 #define  SporkExp            (f_instr)eSporkExp
 #define  ForkEnd             (f_instr)eForkEnd
 #define  SporkEnd            (f_instr)eSporkEnd

diff --git a/opcode.txt b/opcode.txt
index 2e77134d46af3711e7b6bbea73daae761b47af18..825cac4e7f119e0c31bbf832c2047cc1a708b5c5 100644 (file)
--- a/opcode.txt
+++ b/opcode.txt
@@ -129,7 +129,6 @@ FuncMemberEnd
 SporkIni
 ForkIni
 SporkFunc
-SporkThis
 SporkExp
 ForkEnd
 SporkEnd

diff --git a/src/emit/emit.c b/src/emit/emit.c
index aa3a42179a386177cac1e84459330706b1835407..fcdca2d53772f7594655c37f06671848149afa67 100644 (file)
--- a/src/emit/emit.c
+++ b/src/emit/emit.c
@@ -752,9 +752,11 @@ static inline m_bool push_func_code(const Emitter emit, const Func f) {
     instr->m_val2 = strlen(c);
     return GW_OK;
   }
+if(vector_size(&emit->code->instr)) {
   const Instr instr = (Instr)vector_back(&emit->code->instr);
   instr->opcode = eRegPushImm;
   instr->m_val = (m_uint)f->code;
+}
   return GW_OK;
 }
 
@@ -812,7 +814,7 @@ ANN m_bool emit_exp_call1(const Emitter emit, const Func f) { GWDEBUG_EXE
   } else if((f->value_ref->owner_class && is_special(f->value_ref->owner_class) > 0) ||
   !f->value_ref->owner_class || GET_FLAG(f, template))
     push_func_code(emit, f);
-  else {
+  else if(vector_size(&emit->code->instr)){
     const Instr back = (Instr)vector_back(&emit->code->instr);
     if((f_instr)(m_uint)back->opcode == DotFunc || (f_instr)(m_uint)back->opcode == DotStaticFunc)
       back->m_val = f->vt_index;
@@ -838,17 +840,10 @@ ANN m_bool emit_exp_call1(const Emitter emit, const Func f) { GWDEBUG_EXE
 
 ANN2(1,2) static void emit_exp_spork_finish(const Emitter emit, const VM_Code code,
     const m_uint depth) {
-  const m_uint member = GET_FLAG(code, member) ? SZ_INT : 0;
   const Instr pop = emit_add_instr(emit, RegPop);
-  pop->m_val = depth + member;// + emit->code->stack_depth;
-  if(depth) {
-    const Instr spork = emit_add_instr(emit, SporkFunc);
-    spork->m_val = depth;
-  }
-  if(member) {
-    const Instr m = emit_add_instr(emit, SporkThis);
-    m->m_val = depth;
-  }
+  pop->m_val = depth;
+  const Instr spork = emit_add_instr(emit, SporkFunc);
+  spork->m_val = depth + SZ_INT;
 }
 
 static inline void stack_alloc(const Emitter emit) {
@@ -889,7 +884,7 @@ static void push_spork_code(const Emitter emit, const m_str prefix, const int po
 ANN static m_bool spork_func(const Emitter emit, const Exp_Call* exp) { GWDEBUG_EXE
   if(GET_FLAG(exp->m_func, member))
     SET_FLAG(emit->code, member);
-  return emit_exp_call(emit, exp);
+  return emit_exp_call1(emit, exp->m_func);
 }
 
 ANN m_bool emit_exp_spork(const Emitter emit, const Exp_Unary* unary) {
@@ -914,10 +909,10 @@ ANN m_bool emit_exp_spork(const Emitter emit, const Exp_Unary* unary) {
     spork->m_val = emit->code->stack_depth;
   } else {
     const Func f = unary->exp->d.exp_call.m_func;
-    const m_uint size = f->def->stack_depth - (GET_FLAG(f, member) ? SZ_INT : 0);
+    const m_uint size = f->def->stack_depth - (GET_FLAG(f, member) && !GET_FLAG(code, member) ? SZ_INT : 0);
     emit_exp_spork_finish(emit, code, size);
     const Instr end = emit_add_instr(emit, is_spork ? SporkEnd : ForkEnd);
-    end->m_val2 = unary->exp->d.exp_call.m_func->def->base->ret_type->size;
+    end->m_val2 = f->def->base->ret_type->size;
   }
   return GW_OK;
 }

diff --git a/src/vm/vm.c b/src/vm/vm.c
index d84efeaaec119687940225f9edc0d331dc4bfb4e..ad5a580174cf31ad5de67caa1fa08894ae589321 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -282,7 +282,7 @@ static const void* dispatch[] = {
     &&timeadv,
     &&setcode, &&funcptr, &&funcmember,
     &&funcusr, &&regpop, &&regpush, &&regtomem, &&overflow, &&next, &&funcusrend, &&funcmemberend,
-    &&sporkini, &&sporkini, &&sporkfunc, &&sporkthis, &&sporkexp, &&forkend, &&sporkend,
+    &&sporkini, &&sporkini, &&sporkfunc, &&sporkexp, &&forkend, &&sporkend,
     &&brancheqint, &&branchneint, &&brancheqfloat, &&branchnefloat,
     &&arrayappend, &&autoloop, &&autoloopptr, &&autoloopcount, &&arraytop, &&arrayaccess, &&arrayget, &&arrayaddr, &&arrayvalid,
     &&newobj, &&addref, &&assign, &&remref,
@@ -639,10 +639,6 @@ sporkfunc:
     *(m_uint*)(a.child->reg + i) = *(m_uint*)(reg + i - SZ_INT);
   a.child->reg += instr->m_val;
   DISPATCH()
-sporkthis:
-  *(M_Object*)a.child->reg = *(M_Object*)(reg -SZ_INT + instr->m_val);
-  a.child->reg += SZ_INT;
-  DISPATCH()
 sporkexp:
 //  LOOP_OPTIM
   for(m_uint i = 0; i < instr->m_val; i+= SZ_INT)