OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- add first draft of abort exceptions

Browse source
This commit is contained in:
Jonathan Russell 2018-08-18 18:03:18 +01:00
commit 6424190cbf
3 changed files with 72 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/scripting/vm/vmexec.h
View file

@ -80,8 +80,18 @@ static int Exec(VMFrameStack *stack, const VMOP *pc, VMReturn *ret, int numret)
sfunc->JitFunc = JitCompile(sfunc);
sfunc->JitCompiled = true;
}
if (sfunc->JitFunc)
return sfunc->JitFunc(stack, &reg, ret, numret);
if (sfunc->JitFunc) {
try {
return sfunc->JitFunc(stack, &reg, ret, numret);
}
catch (CVMAbortException &err)
{
err.MaybePrintMessage();
err.stacktrace.AppendFormat("Called from %s at %s, line %d\n", sfunc->PrintableName.GetChars(), sfunc->SourceFileName.GetChars(), sfunc->PCToLine(sfunc->pcOnJitAbort));
// PrintParameters(reg.param + f->NumParam - B, B);
throw;
}
}
}
void *ptr;