aerscript/Aer
0
5
Fork 0
Code Issues 6 Pull Requests Releases 2 Wiki Activity

Do not overload entry point
All checks were successful
The build was successful.
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2018-08-12 12:27:15 +02:00
parent c39e627aef
commit 8cbfca2bc9
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/vm.c
View File

@ -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 */