marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set jump target flag for bytecode added after MakeSetter removed one 

Also avoid removing the original bytecode if it is DUP, LOCALN or GLOBALN.
This way, setting the jump target flag can be avoided in some cases.
liquid_container
Günther Brammer 2016-01-17 01:49:11 +01:00
parent 532b47ed27
commit b7eff7f55f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/script/C4AulParse.cpp
View File

@ -1083,14 +1083,17 @@ C4AulBCC C4AulParse::MakeSetter(bool fLeaveValue)
default:
throw C4AulParseError(this, "assignment to a constant");
}
// Remove value BCC
RemoveLastBCC();
// Want the value?
if(fLeaveValue)
// If the new value is produced using the old one, the parameters to get the old one need to be duplicated.
// Otherwise, the setter can just use the parameters originally meant for the getter.
// All getters push one value, so the parameter count is one more than the values they pop from the stack.
int iParCount = 1 - GetStackValue(Value.bccType, Value.Par.X);
if (!fLeaveValue || iParCount)
{
RemoveLastBCC();
fJump = true; // In case the original BCC was a jump target
}
if (fLeaveValue && iParCount)
{
// Duplicate parameters on stack
// (all push one value on the stack as result, so we have -(N-1) parameters)
int iParCount = -GetStackValue(Value.bccType, Value.Par.X) + 1;
for(int i = 0; i < iParCount; i++)
AddBCC(AB_DUP, 1 - iParCount);
// Finally re-add original BCC