forked from Mirrors/openclonk
Use the bytecode parameter for operators as result modifier flag
Previously, the parameter stored the operator number, but that was only used for the purpose of optimizing unnecessary inc/dec away.heavy-resources
Günther Brammer
parent
8b927d142c
commit
64e258f814
|
|
@ -358,7 +358,6 @@ struct C4ScriptOpDef
|
|||
unsigned short Priority;
|
||||
const char* Identifier;
|
||||
C4AulBCCType Code;
|
||||
C4AulBCCType ResultModifier; // code to apply to result after it was calculated
|
||||
bool Postfix;
|
||||
bool Changer; // changes first operand to result, rewrite to "a = a (op) b"
|
||||
bool NoSecondStatement; // no second statement expected (++/-- postfix)
|
||||
|
|
@ -369,57 +368,57 @@ struct C4ScriptOpDef
|
|||
|
||||
static C4ScriptOpDef C4ScriptOpMap[] =
|
||||
{
|
||||
// priority postfix
|
||||
// | identifier | changer
|
||||
// | | Bytecode Result | | no second id
|
||||
// | | | Modifier | | | RetType ParType1 ParType2
|
||||
// priority postfix
|
||||
// | identifier | changer
|
||||
// | | Bytecode | | no second id
|
||||
// | | | | | | RetType ParType1 ParType2
|
||||
// prefix
|
||||
{ 15, "++", AB_Inc, AB_ERR, 0, 1, 0, C4V_Int, C4V_Int, C4V_Any},
|
||||
{ 15, "--", AB_Dec, AB_ERR, 0, 1, 0, C4V_Int, C4V_Int, C4V_Any},
|
||||
{ 15, "~", AB_BitNot, AB_ERR, 0, 0, 0, C4V_Int, C4V_Int, C4V_Any},
|
||||
{ 15, "!", AB_Not, AB_ERR, 0, 0, 0, C4V_Bool, C4V_Bool, C4V_Any},
|
||||
{ 15, "+", AB_ERR, AB_ERR, 0, 0, 0, C4V_Int, C4V_Int, C4V_Any},
|
||||
{ 15, "-", AB_Neg, AB_ERR, 0, 0, 0, C4V_Int, C4V_Int, C4V_Any},
|
||||
{ 15, "++", AB_Inc, 0, 1, 0, C4V_Int, C4V_Int, C4V_Any},
|
||||
{ 15, "--", AB_Dec, 0, 1, 0, C4V_Int, C4V_Int, C4V_Any},
|
||||
{ 15, "~", AB_BitNot, 0, 0, 0, C4V_Int, C4V_Int, C4V_Any},
|
||||
{ 15, "!", AB_Not, 0, 0, 0, C4V_Bool, C4V_Bool, C4V_Any},
|
||||
{ 15, "+", AB_ERR, 0, 0, 0, C4V_Int, C4V_Int, C4V_Any},
|
||||
{ 15, "-", AB_Neg, 0, 0, 0, C4V_Int, C4V_Int, C4V_Any},
|
||||
|
||||
// postfix (whithout second statement)
|
||||
{ 16, "++", AB_Inc, AB_Dec, 1, 1, 1, C4V_Int, C4V_Int, C4V_Any},
|
||||
{ 16, "--", AB_Dec, AB_Inc, 1, 1, 1, C4V_Int, C4V_Int, C4V_Any},
|
||||
{ 16, "++", AB_Inc, 1, 1, 1, C4V_Int, C4V_Int, C4V_Any},
|
||||
{ 16, "--", AB_Dec, 1, 1, 1, C4V_Int, C4V_Int, C4V_Any},
|
||||
|
||||
// postfix
|
||||
{ 14, "**", AB_Pow, AB_ERR, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 13, "/", AB_Div, AB_ERR, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 13, "*", AB_Mul, AB_ERR, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 13, "%", AB_Mod, AB_ERR, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 12, "-", AB_Sub, AB_ERR, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 12, "+", AB_Sum, AB_ERR, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 11, "<<", AB_LeftShift, AB_ERR, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 11, ">>", AB_RightShift, AB_ERR, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 10, "<", AB_LessThan, AB_ERR, 1, 0, 0, C4V_Bool, C4V_Int, C4V_Int},
|
||||
{ 10, "<=", AB_LessThanEqual, AB_ERR, 1, 0, 0, C4V_Bool, C4V_Int, C4V_Int},
|
||||
{ 10, ">", AB_GreaterThan, AB_ERR, 1, 0, 0, C4V_Bool, C4V_Int, C4V_Int},
|
||||
{ 10, ">=", AB_GreaterThanEqual,AB_ERR, 1, 0, 0, C4V_Bool, C4V_Int, C4V_Int},
|
||||
{ 9, "===", AB_Identical, AB_ERR, 1, 0, 0, C4V_Bool, C4V_Any, C4V_Any},
|
||||
{ 9, "!==", AB_NotIdentical, AB_ERR, 1, 0, 0, C4V_Bool, C4V_Any, C4V_Any},
|
||||
{ 9, "==", AB_Equal, AB_ERR, 1, 0, 0, C4V_Bool, C4V_Any, C4V_Any},
|
||||
{ 9, "!=", AB_NotEqual, AB_ERR, 1, 0, 0, C4V_Bool, C4V_Any, C4V_Any},
|
||||
{ 8, "&", AB_BitAnd, AB_ERR, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 6, "^", AB_BitXOr, AB_ERR, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 6, "|", AB_BitOr, AB_ERR, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 5, "&&", AB_JUMPAND, AB_ERR, 1, 0, 0, C4V_Bool, C4V_Bool, C4V_Bool},
|
||||
{ 4, "||", AB_JUMPOR, AB_ERR, 1, 0, 0, C4V_Bool, C4V_Bool, C4V_Bool},
|
||||
{ 3, "??", AB_JUMPNNIL, AB_ERR, 1, 0, 0, C4V_Bool, C4V_Any, C4V_Any},
|
||||
{ 14, "**", AB_Pow, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 13, "/", AB_Div, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 13, "*", AB_Mul, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 13, "%", AB_Mod, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 12, "-", AB_Sub, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 12, "+", AB_Sum, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 11, "<<", AB_LeftShift, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 11, ">>", AB_RightShift, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 10, "<", AB_LessThan, 1, 0, 0, C4V_Bool, C4V_Int, C4V_Int},
|
||||
{ 10, "<=", AB_LessThanEqual, 1, 0, 0, C4V_Bool, C4V_Int, C4V_Int},
|
||||
{ 10, ">", AB_GreaterThan, 1, 0, 0, C4V_Bool, C4V_Int, C4V_Int},
|
||||
{ 10, ">=", AB_GreaterThanEqual, 1, 0, 0, C4V_Bool, C4V_Int, C4V_Int},
|
||||
{ 9, "===", AB_Identical, 1, 0, 0, C4V_Bool, C4V_Any, C4V_Any},
|
||||
{ 9, "!==", AB_NotIdentical, 1, 0, 0, C4V_Bool, C4V_Any, C4V_Any},
|
||||
{ 9, "==", AB_Equal, 1, 0, 0, C4V_Bool, C4V_Any, C4V_Any},
|
||||
{ 9, "!=", AB_NotEqual, 1, 0, 0, C4V_Bool, C4V_Any, C4V_Any},
|
||||
{ 8, "&", AB_BitAnd, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 6, "^", AB_BitXOr, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 6, "|", AB_BitOr, 1, 0, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 5, "&&", AB_JUMPAND, 1, 0, 0, C4V_Bool, C4V_Bool, C4V_Bool},
|
||||
{ 4, "||", AB_JUMPOR, 1, 0, 0, C4V_Bool, C4V_Bool, C4V_Bool},
|
||||
{ 3, "??", AB_JUMPNNIL, 1, 0, 0, C4V_Bool, C4V_Any, C4V_Any},
|
||||
|
||||
// changers
|
||||
{ 2, "*=", AB_Mul, AB_ERR, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "/=", AB_Div, AB_ERR, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "%=", AB_Mod, AB_ERR, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "+=", AB_Sum, AB_ERR, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "-=", AB_Sub, AB_ERR, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "&=", AB_BitAnd, AB_ERR, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "|=", AB_BitOr, AB_ERR, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "^=", AB_BitXOr, AB_ERR, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "*=", AB_Mul, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "/=", AB_Div, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "%=", AB_Mod, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "+=", AB_Sum, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "-=", AB_Sub, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "&=", AB_BitAnd, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "|=", AB_BitOr, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
{ 2, "^=", AB_BitXOr, 1, 1, 0, C4V_Int, C4V_Int, C4V_Int},
|
||||
|
||||
{ 0, NULL, AB_ERR, AB_ERR, 0, 0, 0, C4V_Nil, C4V_Nil, C4V_Nil}
|
||||
{ 0, NULL, AB_ERR, 0, 0, 0, C4V_Nil, C4V_Nil, C4V_Nil}
|
||||
};
|
||||
|
||||
int C4AulParse::GetOperator(const char* pScript)
|
||||
|
|
@ -926,7 +925,7 @@ int C4AulParse::AddBCC(C4AulBCCType eType, intptr_t X)
|
|||
// Prune unneeded Incs / Decs
|
||||
if(eType == AB_STACK && X < 0 && (pCPos1->bccType == AB_Inc || pCPos1->bccType == AB_Dec))
|
||||
{
|
||||
if(C4ScriptOpMap[pCPos1->Par.i].ResultModifier != pCPos1->bccType)
|
||||
if(!pCPos1->Par.X)
|
||||
{
|
||||
pCPos1->bccType = eType;
|
||||
pCPos1->Par.i = X;
|
||||
|
|
@ -2488,13 +2487,15 @@ void C4AulParse::Parse_Expression2(int iParentPrio)
|
|||
Warn(FormatString("operator \"%s\" right side gets %s instead of %s", op->Identifier, GetC4VName(from), GetC4VName(to)).getData(), NULL);
|
||||
}
|
||||
// write byte code
|
||||
AddBCC(op->Code, op - &C4ScriptOpMap[0]);
|
||||
// write setter and mofidier
|
||||
AddBCC(op->Code, 0);
|
||||
// write setter and modifier
|
||||
if (op->Changer)
|
||||
{
|
||||
AddBCC(Setter.bccType, Setter.Par.X);
|
||||
if(op->ResultModifier != AB_ERR)
|
||||
AddBCC(op->ResultModifier, op - &C4ScriptOpMap[0]);
|
||||
// postfix ++ works by increasing, storing, then decreasing
|
||||
// in case the result is thrown away, AddBCC will remove the decrease operation
|
||||
if((op->Code == AB_Inc || op->Code == AB_Dec) && op->Postfix)
|
||||
AddBCC(op->Code == AB_Inc ? AB_Dec : AB_Inc, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue