aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2017-09-15 11:19:06 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2017-09-15 11:19:06 -0300
commit022e4427cfc5edde499c782ba716f8cf95b63f91 (patch)
treee8a90ca267ea415cc597264e1b36557291830ec3
parent80d9b09f351c7a9be557116e9c79ae11e9b3f032 (diff)
downloadlua-022e4427cfc5edde499c782ba716f8cf95b63f91.tar.gz
lua-022e4427cfc5edde499c782ba716f8cf95b63f91.tar.bz2
lua-022e4427cfc5edde499c782ba716f8cf95b63f91.zip
detail (keep OP_LOADK and OP_LOADKX together)
-rw-r--r--lopcodes.c6
-rw-r--r--lopcodes.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/lopcodes.c b/lopcodes.c
index a64c29ce..7e1ace25 100644
--- a/lopcodes.c
+++ b/lopcodes.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lopcodes.c,v 1.60 2017/08/14 18:33:14 roberto Exp roberto $ 2** $Id: lopcodes.c,v 1.61 2017/09/13 19:50:08 roberto Exp roberto $
3** Opcodes for Lua virtual machine 3** Opcodes for Lua virtual machine
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -19,8 +19,8 @@
19 19
20LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = { 20LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = {
21 "MOVE", 21 "MOVE",
22 "LOADK",
23 "LOADI", 22 "LOADI",
23 "LOADK",
24 "LOADKX", 24 "LOADKX",
25 "LOADBOOL", 25 "LOADBOOL",
26 "LOADNIL", 26 "LOADNIL",
@@ -81,8 +81,8 @@ LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = {
81LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = { 81LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
82/* T A B C mode opcode */ 82/* T A B C mode opcode */
83 opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_MOVE */ 83 opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_MOVE */
84 ,opmode(0, 1, OpArgK, OpArgN, iABx) /* OP_LOADK */
85 ,opmode(0, 1, OpArgU, OpArgN, iAsBx) /* OP_LOADI */ 84 ,opmode(0, 1, OpArgU, OpArgN, iAsBx) /* OP_LOADI */
85 ,opmode(0, 1, OpArgK, OpArgN, iABx) /* OP_LOADK */
86 ,opmode(0, 1, OpArgN, OpArgN, iABx) /* OP_LOADKX */ 86 ,opmode(0, 1, OpArgN, OpArgN, iABx) /* OP_LOADKX */
87 ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_LOADBOOL */ 87 ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_LOADBOOL */
88 ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_LOADNIL */ 88 ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_LOADNIL */
diff --git a/lopcodes.h b/lopcodes.h
index 4dfe66ce..7f17de1c 100644
--- a/lopcodes.h
+++ b/lopcodes.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lopcodes.h,v 1.156 2017/08/14 18:33:14 roberto Exp roberto $ 2** $Id: lopcodes.h,v 1.157 2017/09/13 19:50:08 roberto Exp roberto $
3** Opcodes for Lua virtual machine 3** Opcodes for Lua virtual machine
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -175,8 +175,8 @@ typedef enum {
175name args description 175name args description
176------------------------------------------------------------------------*/ 176------------------------------------------------------------------------*/
177OP_MOVE,/* A B R(A) := R(B) */ 177OP_MOVE,/* A B R(A) := R(B) */
178OP_LOADK,/* A Bx R(A) := Kst(Bx) */
179OP_LOADI,/* A sBx R(A) := sBx */ 178OP_LOADI,/* A sBx R(A) := sBx */
179OP_LOADK,/* A Bx R(A) := Kst(Bx) */
180OP_LOADKX,/* A R(A) := Kst(extra arg) */ 180OP_LOADKX,/* A R(A) := Kst(extra arg) */
181OP_LOADBOOL,/* A B C R(A) := (Bool)B; if (C) pc++ */ 181OP_LOADBOOL,/* A B C R(A) := (Bool)B; if (C) pc++ */
182OP_LOADNIL,/* A B R(A), R(A+1), ..., R(A+B) := nil */ 182OP_LOADNIL,/* A B R(A), R(A+1), ..., R(A+B) := nil */