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

`skip' instructions must be followed by a jump

This commit is contained in:
Roberto Ierusalimschy 2002-05-09 11:14:34 -03:00
parent 01f1ac36b1
commit 78b40bf57d
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lcode.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lcode.c,v 1.98 2002/05/06 15:51:41 roberto Exp roberto $ ** $Id: lcode.c,v 1.99 2002/05/07 17:36:56 roberto Exp roberto $
** Code generator for Lua ** Code generator for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -338,22 +338,19 @@ static void discharge2anyreg (FuncState *fs, expdesc *e) {
static void luaK_exp2reg (FuncState *fs, expdesc *e, int reg) { static void luaK_exp2reg (FuncState *fs, expdesc *e, int reg) {
discharge2reg(fs, e, reg); discharge2reg(fs, e, reg);
if (e->k == VJMP || hasjumps(e)) { if (e->k == VJMP)
luaK_concat(fs, &e->t, e->info); /* put this jump in `t' list */
if (hasjumps(e)) {
int final; /* position after whole expression */ int final; /* position after whole expression */
int p_f = NO_JUMP; /* position of an eventual PUSH false */ int p_f = NO_JUMP; /* position of an eventual LOAD false */
int p_t = NO_JUMP; /* position of an eventual PUSH true */ int p_t = NO_JUMP; /* position of an eventual LOAD true */
if (e->k == VJMP || need_value(fs, e->t, 1) if (need_value(fs, e->t, 1) || need_value(fs, e->f, 0)) {
|| need_value(fs, e->f, 0)) {
if (e->k != VJMP) { if (e->k != VJMP) {
luaK_getlabel(fs); /* these instruction may be jump target */ luaK_getlabel(fs); /* this instruction may be a jump target */
luaK_codeAsBx(fs, OP_JMP, 0, 2); /* to jump over both pushes */ luaK_codeAsBx(fs, OP_JMP, 0, 2); /* to jump over both pushes */
} }
else { /* last expression is a conditional (test + jump) */ p_f = code_label(fs, reg, 0, 1);
fs->pc--; /* remove its jump */ p_t = code_label(fs, reg, 1, 0);
lua_assert(testOpMode(GET_OPCODE(fs->f->code[fs->pc - 1]), OpModeT));
}
p_t = code_label(fs, reg, 1, 1);
p_f = code_label(fs, reg, 0, 0);
} }
final = luaK_getlabel(fs); final = luaK_getlabel(fs);
luaK_patchlistaux(fs, e->f, p_f, NO_REG, final, reg, p_f); luaK_patchlistaux(fs, e->f, p_f, NO_REG, final, reg, p_f);

9
ldebug.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: ldebug.c,v 1.111 2002/05/02 13:06:20 roberto Exp roberto $ ** $Id: ldebug.c,v 1.112 2002/05/07 17:36:56 roberto Exp roberto $
** Debug Interface ** Debug Interface
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -270,8 +270,7 @@ static Instruction luaG_symbexec (const Proto *pt, int lastpc, int reg) {
int pc; int pc;
int last; /* stores position of last instruction that changed `reg' */ int last; /* stores position of last instruction that changed `reg' */
last = pt->sizecode-1; /* points to final return (a `neutral' instruction) */ last = pt->sizecode-1; /* points to final return (a `neutral' instruction) */
if (reg == NO_REG) /* full check? */ check(precheck(pt));
check(precheck(pt));
for (pc = 0; pc < lastpc; pc++) { for (pc = 0; pc < lastpc; pc++) {
const Instruction i = pt->code[pc]; const Instruction i = pt->code[pc];
OpCode op = GET_OPCODE(i); OpCode op = GET_OPCODE(i);
@ -303,8 +302,10 @@ static Instruction luaG_symbexec (const Proto *pt, int lastpc, int reg) {
if (testOpMode(op, OpModesetA)) { if (testOpMode(op, OpModesetA)) {
if (a == reg) last = pc; /* change register `a' */ if (a == reg) last = pc; /* change register `a' */
} }
if (testOpMode(op, OpModeT)) if (testOpMode(op, OpModeT)) {
check(pc+2 < pt->sizecode); /* check skip */ check(pc+2 < pt->sizecode); /* check skip */
check(GET_OPCODE(pt->code[pc+1]) == OP_JMP);
}
switch (op) { switch (op) {
case OP_LOADBOOL: { case OP_LOADBOOL: {
check(c == 0 || pc+2 < pt->sizecode); /* check its jump */ check(c == 0 || pc+2 < pt->sizecode); /* check its jump */

12
lvm.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 1.228 2002/05/02 13:06:20 roberto Exp roberto $ ** $Id: lvm.c,v 1.229 2002/05/06 15:51:41 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -449,16 +449,21 @@ StkId luaV_execute (lua_State *L) {
} }
case OP_EQ: { /* skip next instruction if test fails */ case OP_EQ: { /* skip next instruction if test fails */
if (luaO_equalObj(ra, RKC(i)) != GETARG_B(i)) pc++; if (luaO_equalObj(ra, RKC(i)) != GETARG_B(i)) pc++;
else dojump(pc, GETARG_sBx(*pc) + 1);
break; break;
} }
case OP_CMP: { case OP_CMP: {
if (!(luaV_cmp(L, ra, RKC(i), GETARG_B(i)))) pc++; if (!(luaV_cmp(L, ra, RKC(i), GETARG_B(i)))) pc++;
else dojump(pc, GETARG_sBx(*pc) + 1);
break; break;
} }
case OP_TEST: { case OP_TEST: {
StkId rc = RKC(i); StkId rc = RKC(i);
if (l_isfalse(rc) == GETARG_B(i)) pc++; if (l_isfalse(rc) == GETARG_B(i)) pc++;
else setobj(ra, rc); else {
setobj(ra, rc);
dojump(pc, GETARG_sBx(*pc) + 1);
}
break; break;
} }
case OP_CALL: { case OP_CALL: {
@ -519,7 +524,6 @@ StkId luaV_execute (lua_State *L) {
} }
case OP_FORLOOP: { case OP_FORLOOP: {
lua_Number step, index, limit; lua_Number step, index, limit;
int j = GETARG_sBx(i);
const TObject *plimit = ra+1; const TObject *plimit = ra+1;
const TObject *pstep = ra+2; const TObject *pstep = ra+2;
if (ttype(ra) != LUA_TNUMBER) if (ttype(ra) != LUA_TNUMBER)
@ -532,7 +536,7 @@ StkId luaV_execute (lua_State *L) {
index = nvalue(ra) + step; /* increment index */ index = nvalue(ra) + step; /* increment index */
limit = nvalue(plimit); limit = nvalue(plimit);
if (step > 0 ? index <= limit : index >= limit) { if (step > 0 ? index <= limit : index >= limit) {
dojump(pc, j); /* jump back */ dojump(pc, GETARG_sBx(i)); /* jump back */
chgnvalue(ra, index); /* update index */ chgnvalue(ra, index); /* update index */
} }
break; break;