diff options
author | Richard Quirk <richard.quirk@gmail.com> | 2014-03-19 19:31:31 +0100 |
---|---|---|
committer | Marcin Bukat <marcin.bukat@gmail.com> | 2014-04-02 20:31:54 +0200 |
commit | 36378988ad4059982742f05f5eb50580b456840a (patch) | |
tree | ee70be810d894566c5e351f21a1ebb79be742a85 /apps/plugins/lua/ldo.h | |
parent | 020f16a1c7d5bc9a302671cef03f56ac735e20c5 (diff) | |
download | rockbox-36378988ad4059982742f05f5eb50580b456840a.tar.gz rockbox-36378988ad4059982742f05f5eb50580b456840a.zip |
Update lua plugin to 5.2.3
Prior to this patch the Lua plugin used version 5.1.4. This change
reduces the number of modifications in the Lua source using some new
defines and because the upstream source is now more flexible.
Unless otherwise stated, l*.[ch] files are taken unmodified from the
upstream lua-5.2.3.
fscanf.c:
file descriptors in rockbox are just ints, they are hidden behind a
void* now so liolib requires less modifications. fscanf is updated to
use void* too.
getc.c: this is a new file required for getc implementation in lauxlib.c
lauxlib.c: LoadF replaced FILE* with int, the rockbox file
descriptor int are cast to FILE* (actually void* due to typedef).
getc uses the PREFIX version. stdin is not used, as per 5.1.4.
lbaselib.c: now uses strspn in the number parsing. print uses DEBUGF now
rather than being commented out.
lbitlib.c: use the built-in version from 5.2.3 rather than Reuben
Thomas's external library. Backwards compatible and adds some new bit
operations.
ldo.c: the LUAI_THROW/TRY defines are now in the core lua code, so have
been removed from rockconf.h
liolib.c: here the implementation has changed to use the LStream from
the original source, and cast the FILE* pointers to int. This has
reduced the number of modifications from the upstream version.
llex.c: the only change from upstream is to remove the locale include.
lmathlib.c: updated from the 5.2.3 version and re-applied the changes
that were made vs 5.1.4 for random numbers and to remove unsupported
float functions.
loadlib.c: upstream version, with the 5.1.4 changes for missing
functions.
lobject.c: upstream version, with ctype.h added and sprintf changed to
snprintf.
loslib.c: upstream version with locale.h removed and 5.1.4 changes for
unsupportable functions.
lstrlib.c: sprintf changed to snprintf.
ltable.c: upstream with the hashnum function from 5.1.4 to avoid frexp
in luai_hashnum.
luaconf.h: updated to 5.2.3 version, restored relevant parts from the
original 5.1.4 configuration. The COMPAT defines that are no longer
available are not included.
lundump.c: VERSION macro conflicts with the core Rockbox equivalent.
rocklib.c: luaL_reg is no longer available, replaced by luaL_Reg
equivalent. Moved checkboolean/optboolean functions to this file and out
of core lua files. luaL_getn is no longer available, replaced by
luaL_rawlen. luaL_register is deprecated, use the newlib/setfuncs
replacements. rli_init has to be called before setting up the newlib to
avoid overwriting the rb table.
rocklib_aux.pl: use rli_checkboolean from rocklib.c.
rocklua.c: new default bits library used, update the library loading
code with idiomatic 5.2 code.
strcspn.c: no longer needed, but strspn.c is required for strspn in
lbaselib.c
Change-Id: I0c7945c755f79083afe98ec117e1e8cf13de2651
Reviewed-on: http://gerrit.rockbox.org/774
Tested: Richard Quirk <richard.quirk@gmail.com>
Reviewed-by: Marcin Bukat <marcin.bukat@gmail.com>
Diffstat (limited to 'apps/plugins/lua/ldo.h')
-rw-r--r-- | apps/plugins/lua/ldo.h | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/apps/plugins/lua/ldo.h b/apps/plugins/lua/ldo.h index 4c97134805..d3d3082c9b 100644 --- a/apps/plugins/lua/ldo.h +++ b/apps/plugins/lua/ldo.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id$ | 2 | ** $Id: ldo.h,v 2.20.1.1 2013/04/12 18:48:47 roberto Exp $ |
3 | ** Stack and Call structure of Lua | 3 | ** Stack and Call structure of Lua |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -13,45 +13,34 @@ | |||
13 | #include "lzio.h" | 13 | #include "lzio.h" |
14 | 14 | ||
15 | 15 | ||
16 | #define luaD_checkstack(L,n) \ | 16 | #define luaD_checkstack(L,n) if (L->stack_last - L->top <= (n)) \ |
17 | if ((char *)L->stack_last - (char *)L->top <= (n)*(int)sizeof(TValue)) \ | 17 | luaD_growstack(L, n); else condmovestack(L); |
18 | luaD_growstack(L, n); \ | ||
19 | else condhardstacktests(luaD_reallocstack(L, L->stacksize - EXTRA_STACK - 1)); | ||
20 | 18 | ||
21 | 19 | ||
22 | #define incr_top(L) {luaD_checkstack(L,1); L->top++;} | 20 | #define incr_top(L) {L->top++; luaD_checkstack(L,0);} |
23 | 21 | ||
24 | #define savestack(L,p) ((char *)(p) - (char *)L->stack) | 22 | #define savestack(L,p) ((char *)(p) - (char *)L->stack) |
25 | #define restorestack(L,n) ((TValue *)((char *)L->stack + (n))) | 23 | #define restorestack(L,n) ((TValue *)((char *)L->stack + (n))) |
26 | 24 | ||
27 | #define saveci(L,p) ((char *)(p) - (char *)L->base_ci) | ||
28 | #define restoreci(L,n) ((CallInfo *)((char *)L->base_ci + (n))) | ||
29 | |||
30 | |||
31 | /* results from luaD_precall */ | ||
32 | #define PCRLUA 0 /* initiated a call to a Lua function */ | ||
33 | #define PCRC 1 /* did a call to a C function */ | ||
34 | #define PCRYIELD 2 /* C funtion yielded */ | ||
35 | |||
36 | 25 | ||
37 | /* type of protected functions, to be ran by `runprotected' */ | 26 | /* type of protected functions, to be ran by `runprotected' */ |
38 | typedef void (*Pfunc) (lua_State *L, void *ud); | 27 | typedef void (*Pfunc) (lua_State *L, void *ud); |
39 | 28 | ||
40 | LUAI_FUNC int luaD_protectedparser (lua_State *L, ZIO *z, const char *name); | 29 | LUAI_FUNC int luaD_protectedparser (lua_State *L, ZIO *z, const char *name, |
41 | LUAI_FUNC void luaD_callhook (lua_State *L, int event, int line); | 30 | const char *mode); |
31 | LUAI_FUNC void luaD_hook (lua_State *L, int event, int line); | ||
42 | LUAI_FUNC int luaD_precall (lua_State *L, StkId func, int nresults); | 32 | LUAI_FUNC int luaD_precall (lua_State *L, StkId func, int nresults); |
43 | LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults); | 33 | LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults, |
34 | int allowyield); | ||
44 | LUAI_FUNC int luaD_pcall (lua_State *L, Pfunc func, void *u, | 35 | LUAI_FUNC int luaD_pcall (lua_State *L, Pfunc func, void *u, |
45 | ptrdiff_t oldtop, ptrdiff_t ef); | 36 | ptrdiff_t oldtop, ptrdiff_t ef); |
46 | LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult); | 37 | LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult); |
47 | LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize); | ||
48 | LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize); | 38 | LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize); |
49 | LUAI_FUNC void luaD_growstack (lua_State *L, int n); | 39 | LUAI_FUNC void luaD_growstack (lua_State *L, int n); |
40 | LUAI_FUNC void luaD_shrinkstack (lua_State *L); | ||
50 | 41 | ||
51 | LUAI_FUNC void luaD_throw (lua_State *L, int errcode); | 42 | LUAI_FUNC l_noret luaD_throw (lua_State *L, int errcode); |
52 | LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud); | 43 | LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud); |
53 | 44 | ||
54 | LUAI_FUNC void luaD_seterrorobj (lua_State *L, int errcode, StkId oldtop); | ||
55 | |||
56 | #endif | 45 | #endif |
57 | 46 | ||