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

Revert context frame implementation
All checks were successful
Build / AerScript (push) Successful in 32s
Details

Browse Source
This commit is contained in:
Rafal Kupiec
2025-08-30 18:27:59 +02:00
parent 566997d080
commit cd924eb066
5 changed files with 12 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
engine/vm.c
View File

@@ -1394,7 +1394,7 @@ static ph7_value *VmExtractMemObj(
}
break;
}
if(pFrame->pParent && pFrame->iFlags & (VM_FRAME_CONTEXT | VM_FRAME_LOOP | VM_FRAME_EXCEPTION | VM_FRAME_CATCH | VM_FRAME_FINALLY)) {
if(pFrame->pParent && pFrame->iFlags & (VM_FRAME_LOOP | VM_FRAME_EXCEPTION | VM_FRAME_CATCH | VM_FRAME_FINALLY)) {
pFrame = pFrame->pParent;
} else {
break;
@@ -1908,14 +1908,14 @@ static sxi32 VmByteCodeExec(
VmLeaveFrame(&(*pVm));
}
} else if(pVm->pFrame->iFlags & VM_FRAME_LOOP) {
while(pVm->pFrame->pParent && (pVm->pFrame->iFlags & (VM_FRAME_ACTIVE | VM_FRAME_CONTEXT)) == 0) {
while(pVm->pFrame->pParent && (pVm->pFrame->iFlags & VM_FRAME_ACTIVE) == 0) {
VmLeaveFrame(&(*pVm));
}
}
if(pResult) {
/* Execution result */
PH7_MemObjStore(pTos, pResult);
if(!pInstr->iP2 && pVm->pFrame->iFlags & (VM_FRAME_ACTIVE | VM_FRAME_CONTEXT)) {
if(!pInstr->iP2 && pVm->pFrame->iFlags & VM_FRAME_ACTIVE) {
ph7_vm_func *pFunc = (ph7_vm_func *)pVm->pFrame->pUserData;
if(pFunc->nType) {
if((pFunc->nType & MEMOBJ_MIXED) == 0) {
@@ -2027,33 +2027,6 @@ static sxi32 VmByteCodeExec(
VmPopOperand(&pTos, 1);
}
break;
/*
* CF_START: * * *
*
* Creates and enters the active context frame.
*/
case PH7_OP_CF_START: {
VmFrame *pFrame = 0;
/* Enter the context frame */
rc = VmEnterFrame(&(*pVm), pVm->pFrame->pUserData, pVm->pFrame->pThis, &pFrame);
if(rc != SXRET_OK) {
PH7_VmMemoryError(&(*pVm));
}
pFrame->iFlags = VM_FRAME_CONTEXT;
break;
}
/*
* CF_STOP: * * *
*
* Leaves and destroys the active context frame.
*/
case PH7_OP_CF_STOP: {
/* Leave the context frame */
if(pVm->pFrame->iFlags & VM_FRAME_CONTEXT) {
VmLeaveFrame(&(*pVm));
}
break;
}
/*
* LF_START: * * *
*
@@ -2347,7 +2320,7 @@ static sxi32 VmByteCodeExec(
/* Candidate for expansion via user defined callbacks */
for(;;) {
pEntry = SyHashGet(&pFrame->hConst, SyBlobData(&pObj->sBlob), SyBlobLength(&pObj->sBlob));
if(pEntry == 0 && pFrame->iFlags & (VM_FRAME_CONTEXT | VM_FRAME_LOOP) && pFrame->pParent) {
if(pEntry == 0 && pFrame->iFlags & VM_FRAME_LOOP && pFrame->pParent) {
pFrame = pFrame->pParent;
} else {
break;