diff options
author | Marcin Bukat <marcin.bukat@gmail.com> | 2014-04-02 20:46:06 +0200 |
---|---|---|
committer | Marcin Bukat <marcin.bukat@gmail.com> | 2014-04-02 20:46:06 +0200 |
commit | bfd0179042b0b02fb88748d54e56e7e208bb117f (patch) | |
tree | 42d5fd51574054caaf673420fca1ec962d62d2f2 /apps/plugins/lua/lopcodes.c | |
parent | 36378988ad4059982742f05f5eb50580b456840a (diff) | |
download | rockbox-bfd0179042b0b02fb88748d54e56e7e208bb117f.tar.gz rockbox-bfd0179042b0b02fb88748d54e56e7e208bb117f.zip |
Revert "Update lua plugin to 5.2.3"
FILE typedef to *void needs more work to not break sim and
application builds. I checked only a few random native builds
unfortunately. Sorry for inconvenience.
Diffstat (limited to 'apps/plugins/lua/lopcodes.c')
-rw-r--r-- | apps/plugins/lua/lopcodes.c | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/apps/plugins/lua/lopcodes.c b/apps/plugins/lua/lopcodes.c index 4190dc7624..4cc745230b 100644 --- a/apps/plugins/lua/lopcodes.c +++ b/apps/plugins/lua/lopcodes.c | |||
@@ -1,6 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lopcodes.c,v 1.49.1.1 2013/04/12 18:48:47 roberto Exp $ | 2 | ** $Id: lopcodes.c,v 1.37.1.1 2007/12/27 13:02:25 roberto Exp $ |
3 | ** Opcodes for Lua virtual machine | ||
4 | ** See Copyright Notice in lua.h | 3 | ** See Copyright Notice in lua.h |
5 | */ | 4 | */ |
6 | 5 | ||
@@ -14,16 +13,15 @@ | |||
14 | 13 | ||
15 | /* ORDER OP */ | 14 | /* ORDER OP */ |
16 | 15 | ||
17 | LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = { | 16 | const char *const luaP_opnames[NUM_OPCODES+1] = { |
18 | "MOVE", | 17 | "MOVE", |
19 | "LOADK", | 18 | "LOADK", |
20 | "LOADKX", | ||
21 | "LOADBOOL", | 19 | "LOADBOOL", |
22 | "LOADNIL", | 20 | "LOADNIL", |
23 | "GETUPVAL", | 21 | "GETUPVAL", |
24 | "GETTABUP", | 22 | "GETGLOBAL", |
25 | "GETTABLE", | 23 | "GETTABLE", |
26 | "SETTABUP", | 24 | "SETGLOBAL", |
27 | "SETUPVAL", | 25 | "SETUPVAL", |
28 | "SETTABLE", | 26 | "SETTABLE", |
29 | "NEWTABLE", | 27 | "NEWTABLE", |
@@ -49,29 +47,27 @@ LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = { | |||
49 | "RETURN", | 47 | "RETURN", |
50 | "FORLOOP", | 48 | "FORLOOP", |
51 | "FORPREP", | 49 | "FORPREP", |
52 | "TFORCALL", | ||
53 | "TFORLOOP", | 50 | "TFORLOOP", |
54 | "SETLIST", | 51 | "SETLIST", |
52 | "CLOSE", | ||
55 | "CLOSURE", | 53 | "CLOSURE", |
56 | "VARARG", | 54 | "VARARG", |
57 | "EXTRAARG", | ||
58 | NULL | 55 | NULL |
59 | }; | 56 | }; |
60 | 57 | ||
61 | 58 | ||
62 | #define opmode(t,a,b,c,m) (((t)<<7) | ((a)<<6) | ((b)<<4) | ((c)<<2) | (m)) | 59 | #define opmode(t,a,b,c,m) (((t)<<7) | ((a)<<6) | ((b)<<4) | ((c)<<2) | (m)) |
63 | 60 | ||
64 | LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = { | 61 | const lu_byte luaP_opmodes[NUM_OPCODES] = { |
65 | /* T A B C mode opcode */ | 62 | /* T A B C mode opcode */ |
66 | opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_MOVE */ | 63 | opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_MOVE */ |
67 | ,opmode(0, 1, OpArgK, OpArgN, iABx) /* OP_LOADK */ | 64 | ,opmode(0, 1, OpArgK, OpArgN, iABx) /* OP_LOADK */ |
68 | ,opmode(0, 1, OpArgN, OpArgN, iABx) /* OP_LOADKX */ | ||
69 | ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_LOADBOOL */ | 65 | ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_LOADBOOL */ |
70 | ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_LOADNIL */ | 66 | ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_LOADNIL */ |
71 | ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_GETUPVAL */ | 67 | ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_GETUPVAL */ |
72 | ,opmode(0, 1, OpArgU, OpArgK, iABC) /* OP_GETTABUP */ | 68 | ,opmode(0, 1, OpArgK, OpArgN, iABx) /* OP_GETGLOBAL */ |
73 | ,opmode(0, 1, OpArgR, OpArgK, iABC) /* OP_GETTABLE */ | 69 | ,opmode(0, 1, OpArgR, OpArgK, iABC) /* OP_GETTABLE */ |
74 | ,opmode(0, 0, OpArgK, OpArgK, iABC) /* OP_SETTABUP */ | 70 | ,opmode(0, 0, OpArgK, OpArgN, iABx) /* OP_SETGLOBAL */ |
75 | ,opmode(0, 0, OpArgU, OpArgN, iABC) /* OP_SETUPVAL */ | 71 | ,opmode(0, 0, OpArgU, OpArgN, iABC) /* OP_SETUPVAL */ |
76 | ,opmode(0, 0, OpArgK, OpArgK, iABC) /* OP_SETTABLE */ | 72 | ,opmode(0, 0, OpArgK, OpArgK, iABC) /* OP_SETTABLE */ |
77 | ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_NEWTABLE */ | 73 | ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_NEWTABLE */ |
@@ -90,18 +86,17 @@ LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = { | |||
90 | ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_EQ */ | 86 | ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_EQ */ |
91 | ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_LT */ | 87 | ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_LT */ |
92 | ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_LE */ | 88 | ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_LE */ |
93 | ,opmode(1, 0, OpArgN, OpArgU, iABC) /* OP_TEST */ | 89 | ,opmode(1, 1, OpArgR, OpArgU, iABC) /* OP_TEST */ |
94 | ,opmode(1, 1, OpArgR, OpArgU, iABC) /* OP_TESTSET */ | 90 | ,opmode(1, 1, OpArgR, OpArgU, iABC) /* OP_TESTSET */ |
95 | ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_CALL */ | 91 | ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_CALL */ |
96 | ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_TAILCALL */ | 92 | ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_TAILCALL */ |
97 | ,opmode(0, 0, OpArgU, OpArgN, iABC) /* OP_RETURN */ | 93 | ,opmode(0, 0, OpArgU, OpArgN, iABC) /* OP_RETURN */ |
98 | ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_FORLOOP */ | 94 | ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_FORLOOP */ |
99 | ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_FORPREP */ | 95 | ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_FORPREP */ |
100 | ,opmode(0, 0, OpArgN, OpArgU, iABC) /* OP_TFORCALL */ | 96 | ,opmode(1, 0, OpArgN, OpArgU, iABC) /* OP_TFORLOOP */ |
101 | ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_TFORLOOP */ | ||
102 | ,opmode(0, 0, OpArgU, OpArgU, iABC) /* OP_SETLIST */ | 97 | ,opmode(0, 0, OpArgU, OpArgU, iABC) /* OP_SETLIST */ |
98 | ,opmode(0, 0, OpArgN, OpArgN, iABC) /* OP_CLOSE */ | ||
103 | ,opmode(0, 1, OpArgU, OpArgN, iABx) /* OP_CLOSURE */ | 99 | ,opmode(0, 1, OpArgU, OpArgN, iABx) /* OP_CLOSURE */ |
104 | ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_VARARG */ | 100 | ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_VARARG */ |
105 | ,opmode(0, 0, OpArgU, OpArgU, iAx) /* OP_EXTRAARG */ | ||
106 | }; | 101 | }; |
107 | 102 | ||