zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 04:51:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: conditionals didn't properly compile to vm code

Browse source
This commit is contained in:
Leonard2 2016-07-04 19:54:26 +02:00 committed by Christoph Oelckers
parent bbdc64a955
commit bdeb233849
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/thingdef/thingdef_expression.cpp
View file

@ -1838,6 +1838,7 @@ FxExpression *FxConditional::Resolve(FCompileContext& ctx)
ExpEmit FxConditional::Emit(VMFunctionBuilder *build) ExpEmit FxConditional::Emit(VMFunctionBuilder *build)
{ {
size_t truejump, falsejump;
ExpEmit out; ExpEmit out;
// The true and false expressions ought to be assigned to the // The true and false expressions ought to be assigned to the
@ -1848,7 +1849,7 @@ ExpEmit FxConditional::Emit(VMFunctionBuilder *build)
// Test condition. // Test condition.
build->Emit(OP_EQ_K, 1, cond.RegNum, build->GetConstantInt(0)); build->Emit(OP_EQ_K, 1, cond.RegNum, build->GetConstantInt(0));
size_t patchspot = build->Emit(OP_JMP, 0); falsejump = build->Emit(OP_JMP, 0);
// Evaluate true expression. // Evaluate true expression.
if (truex->isConstant() && truex->ValueType->GetRegType() == REGT_INT) if (truex->isConstant() && truex->ValueType->GetRegType() == REGT_INT)
@ -1872,9 +1873,11 @@ ExpEmit FxConditional::Emit(VMFunctionBuilder *build)
out = trueop; out = trueop;
} }
} }
// Make sure to skip the false path.
truejump = build->Emit(OP_JMP, 0);
// Evaluate false expression. // Evaluate false expression.
build->BackpatchToHere(patchspot); build->BackpatchToHere(falsejump);
if (falsex->isConstant() && falsex->ValueType->GetRegType() == REGT_INT) if (falsex->isConstant() && falsex->ValueType->GetRegType() == REGT_INT)
{ {
build->EmitLoadInt(out.RegNum, static_cast<FxConstant *>(falsex)->GetValue().GetInt()); build->EmitLoadInt(out.RegNum, static_cast<FxConstant *>(falsex)->GetValue().GetInt());
@ -1904,6 +1907,7 @@ ExpEmit FxConditional::Emit(VMFunctionBuilder *build)
} }
} }
} }
build->BackpatchToHere(truejump);
return out; return out;
} }