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/lcode.h | |
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/lcode.h')
-rw-r--r-- | apps/plugins/lua/lcode.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/apps/plugins/lua/lcode.h b/apps/plugins/lua/lcode.h index 6a1424cf5a..751b2b5695 100644 --- a/apps/plugins/lua/lcode.h +++ b/apps/plugins/lua/lcode.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lcode.h,v 1.58.1.1 2013/04/12 18:48:47 roberto Exp $ | 2 | ** $Id$ |
3 | ** Code generator for Lua | 3 | ** Code generator for Lua |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -21,13 +21,13 @@ | |||
21 | 21 | ||
22 | 22 | ||
23 | /* | 23 | /* |
24 | ** grep "ORDER OPR" if you change these enums (ORDER OP) | 24 | ** grep "ORDER OPR" if you change these enums |
25 | */ | 25 | */ |
26 | typedef enum BinOpr { | 26 | typedef enum BinOpr { |
27 | OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW, | 27 | OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW, |
28 | OPR_CONCAT, | 28 | OPR_CONCAT, |
29 | OPR_EQ, OPR_LT, OPR_LE, | 29 | OPR_NE, OPR_EQ, |
30 | OPR_NE, OPR_GT, OPR_GE, | 30 | OPR_LT, OPR_LE, OPR_GT, OPR_GE, |
31 | OPR_AND, OPR_OR, | 31 | OPR_AND, OPR_OR, |
32 | OPR_NOBINOPR | 32 | OPR_NOBINOPR |
33 | } BinOpr; | 33 | } BinOpr; |
@@ -36,17 +36,14 @@ typedef enum BinOpr { | |||
36 | typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr; | 36 | typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr; |
37 | 37 | ||
38 | 38 | ||
39 | #define getcode(fs,e) ((fs)->f->code[(e)->u.info]) | 39 | #define getcode(fs,e) ((fs)->f->code[(e)->u.s.info]) |
40 | 40 | ||
41 | #define luaK_codeAsBx(fs,o,A,sBx) luaK_codeABx(fs,o,A,(sBx)+MAXARG_sBx) | 41 | #define luaK_codeAsBx(fs,o,A,sBx) luaK_codeABx(fs,o,A,(sBx)+MAXARG_sBx) |
42 | 42 | ||
43 | #define luaK_setmultret(fs,e) luaK_setreturns(fs, e, LUA_MULTRET) | 43 | #define luaK_setmultret(fs,e) luaK_setreturns(fs, e, LUA_MULTRET) |
44 | 44 | ||
45 | #define luaK_jumpto(fs,t) luaK_patchlist(fs, luaK_jump(fs), t) | ||
46 | |||
47 | LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx); | 45 | LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx); |
48 | LUAI_FUNC int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C); | 46 | LUAI_FUNC int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C); |
49 | LUAI_FUNC int luaK_codek (FuncState *fs, int reg, int k); | ||
50 | LUAI_FUNC void luaK_fixline (FuncState *fs, int line); | 47 | LUAI_FUNC void luaK_fixline (FuncState *fs, int line); |
51 | LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n); | 48 | LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n); |
52 | LUAI_FUNC void luaK_reserveregs (FuncState *fs, int n); | 49 | LUAI_FUNC void luaK_reserveregs (FuncState *fs, int n); |
@@ -55,14 +52,12 @@ LUAI_FUNC int luaK_stringK (FuncState *fs, TString *s); | |||
55 | LUAI_FUNC int luaK_numberK (FuncState *fs, lua_Number r); | 52 | LUAI_FUNC int luaK_numberK (FuncState *fs, lua_Number r); |
56 | LUAI_FUNC void luaK_dischargevars (FuncState *fs, expdesc *e); | 53 | LUAI_FUNC void luaK_dischargevars (FuncState *fs, expdesc *e); |
57 | LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e); | 54 | LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e); |
58 | LUAI_FUNC void luaK_exp2anyregup (FuncState *fs, expdesc *e); | ||
59 | LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e); | 55 | LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e); |
60 | LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e); | 56 | LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e); |
61 | LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e); | 57 | LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e); |
62 | LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key); | 58 | LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key); |
63 | LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k); | 59 | LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k); |
64 | LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e); | 60 | LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e); |
65 | LUAI_FUNC void luaK_goiffalse (FuncState *fs, expdesc *e); | ||
66 | LUAI_FUNC void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e); | 61 | LUAI_FUNC void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e); |
67 | LUAI_FUNC void luaK_setreturns (FuncState *fs, expdesc *e, int nresults); | 62 | LUAI_FUNC void luaK_setreturns (FuncState *fs, expdesc *e, int nresults); |
68 | LUAI_FUNC void luaK_setoneret (FuncState *fs, expdesc *e); | 63 | LUAI_FUNC void luaK_setoneret (FuncState *fs, expdesc *e); |
@@ -70,13 +65,11 @@ LUAI_FUNC int luaK_jump (FuncState *fs); | |||
70 | LUAI_FUNC void luaK_ret (FuncState *fs, int first, int nret); | 65 | LUAI_FUNC void luaK_ret (FuncState *fs, int first, int nret); |
71 | LUAI_FUNC void luaK_patchlist (FuncState *fs, int list, int target); | 66 | LUAI_FUNC void luaK_patchlist (FuncState *fs, int list, int target); |
72 | LUAI_FUNC void luaK_patchtohere (FuncState *fs, int list); | 67 | LUAI_FUNC void luaK_patchtohere (FuncState *fs, int list); |
73 | LUAI_FUNC void luaK_patchclose (FuncState *fs, int list, int level); | ||
74 | LUAI_FUNC void luaK_concat (FuncState *fs, int *l1, int l2); | 68 | LUAI_FUNC void luaK_concat (FuncState *fs, int *l1, int l2); |
75 | LUAI_FUNC int luaK_getlabel (FuncState *fs); | 69 | LUAI_FUNC int luaK_getlabel (FuncState *fs); |
76 | LUAI_FUNC void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v, int line); | 70 | LUAI_FUNC void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v); |
77 | LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v); | 71 | LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v); |
78 | LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1, | 72 | LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1, expdesc *v2); |
79 | expdesc *v2, int line); | ||
80 | LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore); | 73 | LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore); |
81 | 74 | ||
82 | 75 | ||