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

Fix VM ByteCode debugging.
All checks were successful
The build was successful.
Details

Browse Source 
Only executed bytecode should be registered for debugging. In this way we do not register all emitted bytecode and save some memory. What is more, this change registers the bytecode in correct executing order including jumps.
Previously all bytecode generated by compiler has been saved what made the bytecode to be saved in compile, not execute order.
This commit is contained in:
Rafal Kupiec 2018-08-30 09:46:40 +02:00
parent 98d3de2105
commit b6161b0e4b
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engine/vm.c
View File

@ -326,10 +326,6 @@ PH7_PRIVATE sxi32 PH7_VmEmitInstr(
/* Instruction index in the bytecode array */
*pIndex = SySetUsed(pVm->pByteContainer);
}
if(pVm->bDebug) {
/* Record instruction in debug container */
SySetPut(&pVm->aInstrSet, (void *)&sInstr);
}
/* Finally,record the instruction */
rc = SySetPut(pVm->pByteContainer, (const void *)&sInstr);
if(rc != SXRET_OK) {
@ -2060,6 +2056,10 @@ static sxi32 VmByteCodeExec(
for(;;) {
/* Fetch the instruction to execute */
pInstr = &aInstr[pc];
if(pVm->bDebug) {
/* Record executed instruction in debug container */
SySetPut(&pVm->aInstrSet, (void *)pInstr);
}
rc = SXRET_OK;
/*
* What follows here is a massive switch statement where each case implements a
@ -7160,11 +7160,6 @@ PH7_PRIVATE sxi32 PH7_VmCallClassMethod(
aInstr[1].p3 = 0;
aInstr[1].iLine = 1;
aInstr[1].pFile = (SyString *)&sFileName;
if(pVm->bDebug) {
/* Record instruction in debug container */
SySetPut(&pVm->aInstrSet, (void *)&aInstr[0]);
SySetPut(&pVm->aInstrSet, (void *)&aInstr[1]);
}
/* Execute the method body (if available) */
VmByteCodeExec(&(*pVm), aInstr, aStack, iCursor, pResult, 0, TRUE);
/* Clean up the mess left behind */
@ -7285,11 +7280,6 @@ PH7_PRIVATE sxi32 PH7_VmCallUserFunction(
aInstr[1].p3 = 0;
aInstr[1].iLine = 1;
aInstr[1].pFile = (SyString *)&sFileName;
if(pVm->bDebug) {
/* Record instruction in debug container */
SySetPut(&pVm->aInstrSet, (const void *)&aInstr[0]);
SySetPut(&pVm->aInstrSet, (const void *)&aInstr[1]);
}
/* Execute the function body (if available) */
VmByteCodeExec(&(*pVm), aInstr, aStack, nArg, pResult, 0, TRUE);
/* Clean up the mess left behind */