zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed two apparently bogus asserts with returning gloating point constants.

This commit is contained in:
Christoph Oelckers 2016-11-30 19:22:56 +01:00
parent 3f98ba9069
commit 1895feb185
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1827,12 +1827,12 @@ static void SetReturn(const VMRegisters &reg, VMFrame *frame, VMReturn *ret, VM_
case REGT_FLOAT: case REGT_FLOAT:
if (regtype & REGT_KONST) if (regtype & REGT_KONST)
{ {
assert(regnum + ((regtype & REGT_KONST) ? 2u : 0u) < func->NumKonstF); assert(regnum < func->NumKonstF);
src = &func->KonstF[regnum]; src = &func->KonstF[regnum];
} }
else else
{ {
assert(regnum + ((regtype & REGT_KONST) ? 2u : 0u) < frame->NumRegF); assert(regnum < frame->NumRegF);
src = &reg.f[regnum]; src = &reg.f[regnum];
} }
if (regtype & REGT_MULTIREG3) if (regtype & REGT_MULTIREG3)

2
src/scripting/vm/vmframe.cpp
View File

@ -422,7 +422,7 @@ VMFrame *VMFrameStack::PopFrame()
int VMFrameStack::Call(VMFunction *func, VMValue *params, int numparams, VMReturn *results, int numresults, VMException **trap) int VMFrameStack::Call(VMFunction *func, VMValue *params, int numparams, VMReturn *results, int numresults, VMException **trap)
{ {
assert(this == VMGlobalStack); // why would anyone even want to create a local stack? assert(this == &GlobalVMStack); // why would anyone even want to create a local stack?
bool allocated = false; bool allocated = false;
try try
{ {