zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-18 01:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

- reenabled the part of OP_THROW that throws a VMAbortException. This part is still needed for a runtime variable access check.

Browse source
This commit is contained in:
Christoph Oelckers 2017-04-11 00:11:36 +02:00
parent 4c1e03ebff
commit 7a6e70e777
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scripting/backend/codegen.cpp
View file

@ -6534,7 +6534,7 @@ ExpEmit FxSelf::Emit(VMFunctionBuilder *build)
{ {
build->Emit(OP_EQA_R, 1, 0, 1); build->Emit(OP_EQA_R, 1, 0, 1);
build->Emit(OP_JMP, 1); build->Emit(OP_JMP, 1);
//build->Emit(OP_THROW, 2, X_BAD_SELF); build->Emit(OP_THROW, 2, X_BAD_SELF);
} }
// self is always the first pointer passed to the function // self is always the first pointer passed to the function
return ExpEmit(0, REGT_POINTER, false, true); return ExpEmit(0, REGT_POINTER, false, true);

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

@ -821,7 +821,9 @@ static int Exec(VMFrameStack *stack, const VMOP *pc, VMReturn *ret, int numret)
assert(a <= try_depth); assert(a <= try_depth);
try_depth -= a; try_depth -= a;
NEXTOP; NEXTOP;
#endif
OP(THROW): OP(THROW):
#if 0
if (a == 0) if (a == 0)
{ {
ASSERTA(B); ASSERTA(B);
@ -834,10 +836,12 @@ static int Exec(VMFrameStack *stack, const VMOP *pc, VMReturn *ret, int numret)
ThrowVMException((VMException *)konsta[B].o); ThrowVMException((VMException *)konsta[B].o);
} }
else else
#endif
{ {
ThrowAbortException(EVMAbortException(BC), nullptr); ThrowAbortException(EVMAbortException(BC), nullptr);
} }
NEXTOP; NEXTOP;
#if 0
OP(CATCH): OP(CATCH):
// This instruction is handled by our own catch handler and should // This instruction is handled by our own catch handler and should
// not be executed by the normal VM code. // not be executed by the normal VM code.

2
src/scripting/vm/vmops.h
View file

@ -116,7 +116,7 @@ xx(NEW, new, RPRPI8, NOP, 0, 0),
xx(NEW_K, new, RPKP, NOP, 0, 0), xx(NEW_K, new, RPKP, NOP, 0, 0),
//xx(TRY, try, I24, NOP, 0, 0), // When an exception is thrown, start searching for a handler at pc + ABC //xx(TRY, try, I24, NOP, 0, 0), // When an exception is thrown, start searching for a handler at pc + ABC
//xx(UNTRY, untry, I8, NOP, 0, 0), // Pop A entries off the exception stack //xx(UNTRY, untry, I8, NOP, 0, 0), // Pop A entries off the exception stack
//xx(THROW, throw, THROW, NOP, 0, 0), // A == 0: Throw exception object pB xx(THROW, throw, THROW, NOP, 0, 0), // A == 0: Throw exception object pB
// A == 1: Throw exception object pkB // A == 1: Throw exception object pkB
// A >= 2: Throw VM exception of type BC // A >= 2: Throw VM exception of type BC
//xx(CATCH, catch, CATCH, NOP, 0, 0), // A == 0: continue search on next try //xx(CATCH, catch, CATCH, NOP, 0, 0), // A == 0: continue search on next try