gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve bytecode optimization of and/or operators.

Browse Source
This commit is contained in:
Mike Pall 2011-05-05 15:49:11 +02:00
parent b760add618
commit 693b629787
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lj_parse.c
View File

@ -258,8 +258,9 @@ static BCPos jmp_next(FuncState *fs, BCPos pc)
static int jmp_novalue(FuncState *fs, BCPos list) static int jmp_novalue(FuncState *fs, BCPos list)
{ {
for (; list != NO_JMP; list = jmp_next(fs, list)) { for (; list != NO_JMP; list = jmp_next(fs, list)) {
BCOp op = bc_op(fs->bcbase[list >= 1 ? list-1 : list].ins); BCIns p = fs->bcbase[list >= 1 ? list-1 : list].ins;
if (!(op == BC_ISTC || op == BC_ISFC)) return 1; if (!(bc_op(p) == BC_ISTC || bc_op(p) == BC_ISFC || bc_a(p) == NO_REG))
return 1;
} }
return 0; return 0;
} }
@ -269,14 +270,21 @@ static int jmp_patchtestreg(FuncState *fs, BCPos pc, BCReg reg)
{ {
BCIns *ip = &fs->bcbase[pc >= 1 ? pc-1 : pc].ins; BCIns *ip = &fs->bcbase[pc >= 1 ? pc-1 : pc].ins;
BCOp op = bc_op(*ip); BCOp op = bc_op(*ip);
if (!(op == BC_ISTC || op == BC_ISFC)) if (op == BC_ISTC || op == BC_ISFC) {
return 0; /* Cannot patch other instructions. */
if (reg != NO_REG && reg != bc_d(*ip)) { if (reg != NO_REG && reg != bc_d(*ip)) {
setbc_a(ip, reg); setbc_a(ip, reg);
} else { /* Nothing to store or already in the right register. */ } else { /* Nothing to store or already in the right register. */
setbc_op(ip, op+(BC_IST-BC_ISTC)); setbc_op(ip, op+(BC_IST-BC_ISTC));
setbc_a(ip, 0); setbc_a(ip, 0);
} }
} else if (bc_a(*ip) == NO_REG) {
if (reg == NO_REG)
*ip = BCINS_AJ(BC_JMP, bc_a(fs->bcbase[pc].ins), 0);
else
setbc_a(ip, reg);
} else {
return 0; /* Cannot patch other instructions. */
}
return 1; return 1;
} }
@ -709,6 +717,8 @@ static void bcemit_branch_t(FuncState *fs, ExpDesc *e)
pc = NO_JMP; /* Never jump. */ pc = NO_JMP; /* Never jump. */
else if (e->k == VJMP) else if (e->k == VJMP)
invertcond(fs, e), pc = e->u.s.info; invertcond(fs, e), pc = e->u.s.info;
else if (e->k == VKFALSE || e->k == VKNIL)
expr_toreg_nobranch(fs, e, NO_REG), pc = bcemit_jmp(fs);
else else
pc = bcemit_branch(fs, e, 0); pc = bcemit_branch(fs, e, 0);
jmp_append(fs, &e->f, pc); jmp_append(fs, &e->f, pc);
@ -725,6 +735,8 @@ static void bcemit_branch_f(FuncState *fs, ExpDesc *e)
pc = NO_JMP; /* Never jump. */ pc = NO_JMP; /* Never jump. */
else if (e->k == VJMP) else if (e->k == VJMP)
pc = e->u.s.info; pc = e->u.s.info;
else if (e->k == VKSTR || e->k == VKNUM || e->k == VKTRUE)
expr_toreg_nobranch(fs, e, NO_REG), pc = bcemit_jmp(fs);
else else
pc = bcemit_branch(fs, e, 1); pc = bcemit_branch(fs, e, 1);
jmp_append(fs, &e->t, pc); jmp_append(fs, &e->t, pc);