OP_LOADFALSE broken in two instructions

roberto-ieru · roberto-ieru · commit 9b7987a9d147 · 2020-02-11T11:12:33.000-03:00
diff --git a/lcode.c b/lcode.c
@@ -872,9 +872,9 @@ static void discharge2anyreg (FuncState *fs, expdesc *e) {
 }
 
 
-static int code_loadbool (FuncState *fs, int A, OpCode op, int jump) {
+static int code_loadbool (FuncState *fs, int A, OpCode op) {
   luaK_getlabel(fs);  /* those instructions may be jump targets */
-  return luaK_codeABC(fs, op, A, jump, 0);
+  return luaK_codeABC(fs, op, A, 0, 0);
 }
 
 
@@ -908,8 +908,8 @@ static void exp2reg (FuncState *fs, expdesc *e, int reg) {
     int p_t = NO_JUMP;  /* position of an eventual LOAD true */
     if (need_value(fs, e->t) || need_value(fs, e->f)) {
       int fj = (e->k == VJMP) ? NO_JUMP : luaK_jump(fs);
-      p_f = code_loadbool(fs, reg, OP_LOADFALSE, 1);  /* skip next inst. */
-      p_t = code_loadbool(fs, reg, OP_LOADTRUE, 0);
+      p_f = code_loadbool(fs, reg, OP_LFALSESKIP);  /* skip next inst. */
+      p_t = code_loadbool(fs, reg, OP_LOADTRUE);
       /* jump around these booleans if 'e' is not a test */
       luaK_patchtohere(fs, fj);
     }
diff --git a/ljumptab.h b/ljumptab.h
@@ -31,6 +31,7 @@ static void *disptab[NUM_OPCODES] = {
 &&L_OP_LOADK,
 &&L_OP_LOADKX,
 &&L_OP_LOADFALSE,
+&&L_OP_LFALSESKIP,
 &&L_OP_LOADTRUE,
 &&L_OP_LOADNIL,
 &&L_OP_GETUPVAL,
diff --git a/lopcodes.c b/lopcodes.c
@@ -25,6 +25,7 @@ LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
  ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_LOADK */
  ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_LOADKX */
  ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LOADFALSE */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LFALSESKIP */
  ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LOADTRUE */
  ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LOADNIL */
  ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETUPVAL */
diff --git a/lopcodes.h b/lopcodes.h
@@ -202,7 +202,8 @@ OP_LOADI,/*	A sBx	R[A] := sBx					*/
 OP_LOADF,/*	A sBx	R[A] := (lua_Number)sBx				*/
 OP_LOADK,/*	A Bx	R[A] := K[Bx]					*/
 OP_LOADKX,/*	A 	R[A] := K[extra arg]				*/
-OP_LOADFALSE,/*	A B	R[A] := false; if (B) pc++			*/
+OP_LOADFALSE,/*	A  	R[A] := false					*/
+OP_LFALSESKIP,/*A 	R[A] := false; pc++				*/
 OP_LOADTRUE,/*	A	R[A] := true					*/
 OP_LOADNIL,/*	A B	R[A], R[A+1], ..., R[A+B] := nil		*/
 OP_GETUPVAL,/*	A B	R[A] := UpValue[B]				*/
diff --git a/lopnames.h b/lopnames.h
@@ -16,6 +16,7 @@ static const char *const opnames[] = {
   "LOADK",
   "LOADKX",
   "LOADFALSE",
+  "LFALSESKIP",
   "LOADTRUE",
   "LOADNIL",
   "GETUPVAL",
diff --git a/lvm.c b/lvm.c
@@ -1183,7 +1183,11 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
       }
       vmcase(OP_LOADFALSE) {
         setbfvalue(s2v(ra));
-        if (GETARG_B(i)) pc++;  /* if B, skip next instruction */
+        vmbreak;
+      }
+      vmcase(OP_LFALSESKIP) {
+        setbfvalue(s2v(ra));
+        pc++;  /* skip next instruction */
         vmbreak;
       }
       vmcase(OP_LOADTRUE) {

Original file line number	Diff line number	Diff line change
`@@ -872,9 +872,9 @@ static void discharge2anyreg (FuncState fs, expdesc e) {`
`872`	`872`	`}`
`873`	`873`
`874`	`874`
`875`		`-static int code_loadbool (FuncState *fs, int A, OpCode op, int jump) {`
	`875`	`+static int code_loadbool (FuncState *fs, int A, OpCode op) {`
`876`	`876`	`luaK_getlabel(fs); /* those instructions may be jump targets */`
`877`		`- return luaK_codeABC(fs, op, A, jump, 0);`
	`877`	`+ return luaK_codeABC(fs, op, A, 0, 0);`
`878`	`878`	`}`
`879`	`879`
`880`	`880`
`@@ -908,8 +908,8 @@ static void exp2reg (FuncState fs, expdesc e, int reg) {`
`908`	`908`	`int p_t = NO_JUMP; /* position of an eventual LOAD true */`
`909`	`909`	`if (need_value(fs, e->t) \|\| need_value(fs, e->f)) {`
`910`	`910`	`int fj = (e->k == VJMP) ? NO_JUMP : luaK_jump(fs);`
`911`		`- p_f = code_loadbool(fs, reg, OP_LOADFALSE, 1); /* skip next inst. */`
`912`		`- p_t = code_loadbool(fs, reg, OP_LOADTRUE, 0);`
	`911`	`+ p_f = code_loadbool(fs, reg, OP_LFALSESKIP); /* skip next inst. */`
	`912`	`+ p_t = code_loadbool(fs, reg, OP_LOADTRUE);`
`913`	`913`	`/* jump around these booleans if 'e' is not a test */`
`914`	`914`	`luaK_patchtohere(fs, fj);`
`915`	`915`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1183,7 +1183,11 @@ void luaV_execute (lua_State L, CallInfo ci) {`
`1183`	`1183`	`}`
`1184`	`1184`	`vmcase(OP_LOADFALSE) {`
`1185`	`1185`	`setbfvalue(s2v(ra));`
`1186`		`- if (GETARG_B(i)) pc++; /* if B, skip next instruction */`
	`1186`	`+ vmbreak;`
	`1187`	`+ }`
	`1188`	`+ vmcase(OP_LFALSESKIP) {`
	`1189`	`+ setbfvalue(s2v(ra));`
	`1190`	`+ pc++; /* skip next instruction */`
`1187`	`1191`	`vmbreak;`
`1188`	`1192`	`}`
`1189`	`1193`	`vmcase(OP_LOADTRUE) {`