aerscript/Aer
0
5
Förgrening 0
Kod Ärenden 6 Pull-förfrågningar Släpp 2 Wiki Aktiviteter

Compiler rework merge #43

Sammanfogat
belliash sammanfogade 55 incheckningar från compiler_rework in i master 2018-08-16 21:28:49 +02:00
Konversation 0 Incheckningar 55 Ändrade Filer 21 +5 -3
1 ändrade filer med 5 tillägg och 3 borttagningar
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8cbfca2bc9 - Show all commits

8
engine/vm.c
Visa fil

@ -5103,7 +5103,7 @@ static sxi32 VmByteCodeExec(
break; break;
} }
/* /*
* OP_CALL P1 * * * OP_CALL P1 P2 *
* Call a PHP or a foreign function and push the return value of the called * Call a PHP or a foreign function and push the return value of the called
* function on the stack. * function on the stack.
*/ */
@ -5244,8 +5244,10 @@ static sxi32 VmByteCodeExec(
PH7_MemObjRelease(pTos); PH7_MemObjRelease(pTos);
break; break;
} }
/* Always select an appropriate function to call */ /* Select an appropriate function to call, if not entry point */
pVmFunc = VmOverload(&(*pVm), pVmFunc, pArg, (int)(pTos - pArg)); if(pInstr->iP2 == 0) {
pVmFunc = VmOverload(&(*pVm), pVmFunc, pArg, (int)(pTos - pArg));
}
/* Extract the formal argument set */ /* Extract the formal argument set */
aFormalArg = (ph7_vm_func_arg *)SySetBasePtr(&pVmFunc->aArgs); aFormalArg = (ph7_vm_func_arg *)SySetBasePtr(&pVmFunc->aArgs);
/* Create a new VM frame */ /* Create a new VM frame */