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

Switch VM state to PH7_VM_INCL when including new file.
All checks were successful
The build was successful.
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2018-09-05 13:28:20 +02:00
parent d58249cb3f
commit 543176a2f4
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/vm.c
View File

@ -1122,7 +1122,7 @@ PH7_PRIVATE sxi32 PH7_VmMakeReady(
* Reset a Virtual Machine to it's initial state. * Reset a Virtual Machine to it's initial state.
*/ */
PH7_PRIVATE sxi32 PH7_VmReset(ph7_vm *pVm) { PH7_PRIVATE sxi32 PH7_VmReset(ph7_vm *pVm) {
if(pVm->nMagic != PH7_VM_RUN && pVm->nMagic != PH7_VM_EXEC) { if(pVm->nMagic != PH7_VM_RUN && pVm->nMagic != PH7_VM_EXEC && pVm->nMagic != PH7_VM_INCL) {
return SXERR_CORRUPT; return SXERR_CORRUPT;
} }
/* TICKET 1433-003: As of this version, the VM is automatically reset */ /* TICKET 1433-003: As of this version, the VM is automatically reset */
@ -5412,7 +5412,7 @@ PH7_PRIVATE sxi32 PH7_VmByteCodeExec(ph7_vm *pVm) {
ph7_value pResult; ph7_value pResult;
/* Make sure we are ready to execute this program */ /* Make sure we are ready to execute this program */
if(pVm->nMagic != PH7_VM_RUN) { if(pVm->nMagic != PH7_VM_RUN) {
return pVm->nMagic == PH7_VM_EXEC ? SXERR_LOCKED /* Locked VM */ : SXERR_CORRUPT; /* Stale VM */ return (pVm->nMagic == PH7_VM_EXEC || pVm->nMagic == PH7_VM_INCL) ? SXERR_LOCKED /* Locked VM */ : SXERR_CORRUPT; /* Stale VM */
} }
/* Set the execution magic number */ /* Set the execution magic number */
pVm->nMagic = PH7_VM_EXEC; pVm->nMagic = PH7_VM_EXEC;
@ -10169,7 +10169,9 @@ static sxi32 VmExecIncludedFile(
SyString sScript; SyString sScript;
/* Compile and execute the script */ /* Compile and execute the script */
SyStringInitFromBuf(&sScript, SyBlobData(&sContents), SyBlobLength(&sContents)); SyStringInitFromBuf(&sScript, SyBlobData(&sContents), SyBlobLength(&sContents));
pVm->nMagic = PH7_VM_INCL;
VmEvalChunk(pCtx->pVm, &(*pCtx), &sScript, PH7_AERSCRIPT_CODE); VmEvalChunk(pCtx->pVm, &(*pCtx), &sScript, PH7_AERSCRIPT_CODE);
pVm->nMagic = PH7_VM_EXEC;
} }
} }
/* Close the handle */ /* Close the handle */