mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-01-31 03:27:39 +00:00
0dbf01bf1d
This essentially re-does the work of #875 on top of master. This is what I did to check that Cosmo's Lua extensions still worked: ``` $ build/bootstrap/make MODE=aarch64 o/aarch64/third_party/lua/lua $ ape o/aarch64/third_party/lua/lua >: 10 10 >: 010 8 >: 0b10 2 >: string.byte("\e") 27 >: "Hello, %s" % {"world"} Hello, world >: "*" * 3 *** ``` `luaL_traceback2` was used to show the stack trace with parameter values; it's used in `LuaCallWithTrace`, which is used in Redbean to run Lua code. You should be able to see the extended stack trace by running something like this: `redbean -e "function a(b)c()end a(2)"` (with "params" indicating the extended stack trace): ``` stack traceback: [string "function a(b)c()end a(2)"]:1: in function 'a', params: b = 2; [string "function a(b)c()end a(2)"]:1: in main chunk ``` @pkulchenko confirmed that I get the expected result with the updated code. This is what I did to check that Lua itself still worked: ``` $ cd third_party/lua/test/ $ ape ../../../o/aarch64/third_party/lua/lua all.lua ``` There's one test failure, in `files.lua`: ``` ***** FILE 'files.lua'***** testing i/o ../../../o/aarch64/third_party/lua/lua: files.lua:84: assertion failed! stack traceback: [C]: in function 'assert' files.lua:84: in main chunk (...tail calls...) all.lua:195: in main chunk [C]: in ? .>>> closing state <<< ``` That isn't a result of these changes; the same test is failing in master. The failure is here: ```lua if not _port then -- invalid seek local status, msg, code = io.stdin:seek("set", 1000) assert(not status and type(msg) == "string" and type(code) == "number") end ``` The test expects a seek to offset 1,000 on stdin to fail — but it doesn't. `status` ends up being the new offset rather than `nil`. If I comment out that one test, the remaining tests succeed.
80 lines
3.1 KiB
C
80 lines
3.1 KiB
C
#ifndef ldo_h
|
|
#define ldo_h
|
|
|
|
#include "third_party/lua/lobject.h"
|
|
#include "third_party/lua/lstate.h"
|
|
#include "third_party/lua/lzio.h"
|
|
|
|
|
|
/*
|
|
** Macro to check stack size and grow stack if needed. Parameters
|
|
** 'pre'/'pos' allow the macro to preserve a pointer into the
|
|
** stack across reallocations, doing the work only when needed.
|
|
** It also allows the running of one GC step when the stack is
|
|
** reallocated.
|
|
** 'condmovestack' is used in heavy tests to force a stack reallocation
|
|
** at every check.
|
|
*/
|
|
#define luaD_checkstackaux(L,n,pre,pos) \
|
|
if (l_unlikely(L->stack_last.p - L->top.p <= (n))) \
|
|
{ pre; luaD_growstack(L, n, 1); pos; } \
|
|
else { condmovestack(L,pre,pos); }
|
|
|
|
/* In general, 'pre'/'pos' are empty (nothing to save) */
|
|
#define luaD_checkstack(L,n) luaD_checkstackaux(L,n,(void)0,(void)0)
|
|
|
|
|
|
|
|
#define savestack(L,pt) (cast_charp(pt) - cast_charp(L->stack.p))
|
|
#define restorestack(L,n) cast(StkId, cast_charp(L->stack.p) + (n))
|
|
|
|
|
|
/* macro to check stack size, preserving 'p' */
|
|
#define checkstackp(L,n,p) \
|
|
luaD_checkstackaux(L, n, \
|
|
ptrdiff_t t__ = savestack(L, p), /* save 'p' */ \
|
|
p = restorestack(L, t__)) /* 'pos' part: restore 'p' */
|
|
|
|
|
|
/* macro to check stack size and GC, preserving 'p' */
|
|
#define checkstackGCp(L,n,p) \
|
|
luaD_checkstackaux(L, n, \
|
|
ptrdiff_t t__ = savestack(L, p); /* save 'p' */ \
|
|
luaC_checkGC(L), /* stack grow uses memory */ \
|
|
p = restorestack(L, t__)) /* 'pos' part: restore 'p' */
|
|
|
|
|
|
/* macro to check stack size and GC */
|
|
#define checkstackGC(L,fsize) \
|
|
luaD_checkstackaux(L, (fsize), luaC_checkGC(L), (void)0)
|
|
|
|
|
|
/* type of protected functions, to be ran by 'runprotected' */
|
|
typedef void (*Pfunc) (lua_State *L, void *ud);
|
|
|
|
LUAI_FUNC void luaD_seterrorobj (lua_State *L, int errcode, StkId oldtop);
|
|
LUAI_FUNC int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
|
|
const char *mode);
|
|
LUAI_FUNC void luaD_hook (lua_State *L, int event, int line,
|
|
int fTransfer, int nTransfer);
|
|
LUAI_FUNC void luaD_hookcall (lua_State *L, CallInfo *ci);
|
|
LUAI_FUNC int luaD_pretailcall (lua_State *L, CallInfo *ci, StkId func,
|
|
int narg1, int delta);
|
|
LUAI_FUNC CallInfo *luaD_precall (lua_State *L, StkId func, int nResults);
|
|
LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults);
|
|
LUAI_FUNC void luaD_callnoyield (lua_State *L, StkId func, int nResults);
|
|
LUAI_FUNC StkId luaD_tryfuncTM (lua_State *L, StkId func);
|
|
LUAI_FUNC int luaD_closeprotected (lua_State *L, ptrdiff_t level, int status);
|
|
LUAI_FUNC int luaD_pcall (lua_State *L, Pfunc func, void *u,
|
|
ptrdiff_t oldtop, ptrdiff_t ef);
|
|
LUAI_FUNC void luaD_poscall (lua_State *L, CallInfo *ci, int nres);
|
|
LUAI_FUNC int luaD_reallocstack (lua_State *L, int newsize, int raiseerror);
|
|
LUAI_FUNC int luaD_growstack (lua_State *L, int n, int raiseerror);
|
|
LUAI_FUNC void luaD_shrinkstack (lua_State *L);
|
|
LUAI_FUNC void luaD_inctop (lua_State *L);
|
|
|
|
LUAI_FUNC l_noret luaD_throw (lua_State *L, int errcode);
|
|
LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
|
|
|
|
#endif
|
|
|