rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplification in the call to 'constfolding'

This commit is contained in:
Roberto Ierusalimschy 2019-09-11 10:20:10 -03:00
parent 91dad09f65
commit 40d8832ee0
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lcode.c
View File

@ -1630,6 +1630,8 @@ static void codeconcat (FuncState *fs, expdesc *e1, expdesc *e2, int line) {
void luaK_posfix (FuncState *fs, BinOpr opr, void luaK_posfix (FuncState *fs, BinOpr opr,
expdesc *e1, expdesc *e2, int line) { expdesc *e1, expdesc *e2, int line) {
luaK_dischargevars(fs, e2); luaK_dischargevars(fs, e2);
if (foldbinop(opr) && constfolding(fs, opr + LUA_OPADD, e1, e2))
return; /* done by folding */
switch (opr) { switch (opr) {
case OPR_AND: { case OPR_AND: {
lua_assert(e1->t == NO_JUMP); /* list closed by 'luaK_infix' */ lua_assert(e1->t == NO_JUMP); /* list closed by 'luaK_infix' */
@ -1649,35 +1651,29 @@ void luaK_posfix (FuncState *fs, BinOpr opr,
break; break;
} }
case OPR_ADD: case OPR_MUL: { case OPR_ADD: case OPR_MUL: {
if (!constfolding(fs, opr + LUA_OPADD, e1, e2)) codecommutative(fs, opr, e1, e2, line);
codecommutative(fs, opr, e1, e2, line);
break; break;
} }
case OPR_SUB: case OPR_DIV: case OPR_SUB: case OPR_DIV:
case OPR_IDIV: case OPR_MOD: case OPR_POW: { case OPR_IDIV: case OPR_MOD: case OPR_POW: {
if (!constfolding(fs, opr + LUA_OPADD, e1, e2)) codearith(fs, opr, e1, e2, 0, line);
codearith(fs, opr, e1, e2, 0, line);
break; break;
} }
case OPR_BAND: case OPR_BOR: case OPR_BXOR: { case OPR_BAND: case OPR_BOR: case OPR_BXOR: {
if (!constfolding(fs, opr + LUA_OPADD, e1, e2)) codebitwise(fs, opr, e1, e2, line);
codebitwise(fs, opr, e1, e2, line);
break; break;
} }
case OPR_SHL: { case OPR_SHL: {
if (!constfolding(fs, LUA_OPSHL, e1, e2)) { if (isSCint(e1)) {
if (isSCint(e1)) { swapexps(e1, e2);
swapexps(e1, e2); codebini(fs, OP_SHLI, e1, e2, 1, line, TM_SHL);
codebini(fs, OP_SHLI, e1, e2, 1, line, TM_SHL);
}
else
codeshift(fs, OP_SHL, e1, e2, line);
} }
else
codeshift(fs, OP_SHL, e1, e2, line);
break; break;
} }
case OPR_SHR: { case OPR_SHR: {
if (!constfolding(fs, LUA_OPSHR, e1, e2)) codeshift(fs, OP_SHR, e1, e2, line);
codeshift(fs, OP_SHR, e1, e2, line);
break; break;
} }
case OPR_EQ: case OPR_NE: { case OPR_EQ: case OPR_NE: {

12
lcode.h
View File

@ -24,19 +24,27 @@
** grep "ORDER OPR" if you change these enums (ORDER OP) ** grep "ORDER OPR" if you change these enums (ORDER OP)
*/ */
typedef enum BinOpr { typedef enum BinOpr {
/* arithmetic operators */
OPR_ADD, OPR_SUB, OPR_MUL, OPR_MOD, OPR_POW, OPR_ADD, OPR_SUB, OPR_MUL, OPR_MOD, OPR_POW,
OPR_DIV, OPR_DIV, OPR_IDIV,
OPR_IDIV, /* bitwise operators */
OPR_BAND, OPR_BOR, OPR_BXOR, OPR_BAND, OPR_BOR, OPR_BXOR,
OPR_SHL, OPR_SHR, OPR_SHL, OPR_SHR,
/* string operator */
OPR_CONCAT, OPR_CONCAT,
/* comparison operators */
OPR_EQ, OPR_LT, OPR_LE, OPR_EQ, OPR_LT, OPR_LE,
OPR_NE, OPR_GT, OPR_GE, OPR_NE, OPR_GT, OPR_GE,
/* logical operators */
OPR_AND, OPR_OR, OPR_AND, OPR_OR,
OPR_NOBINOPR OPR_NOBINOPR
} BinOpr; } BinOpr;
/* true if operation is foldable (that is, it is arithmetic or bitwise) */
#define foldbinop(op) ((op) <= OPR_SHR)
#define luaK_codeABC(fs,o,a,b,c) luaK_codeABCk(fs,o,a,b,c,0) #define luaK_codeABC(fs,o,a,b,c) luaK_codeABCk(fs,o,a,b,c,0)