mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-01-31 11:37:35 +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.
246 lines
7.3 KiB
C
246 lines
7.3 KiB
C
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
|
│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi │
|
|
╚──────────────────────────────────────────────────────────────────────────────╝
|
|
│ │
|
|
│ Lua │
|
|
│ Copyright © 2004-2023 Lua.org, PUC-Rio. │
|
|
│ │
|
|
│ Permission is hereby granted, free of charge, to any person obtaining │
|
|
│ a copy of this software and associated documentation files (the │
|
|
│ "Software"), to deal in the Software without restriction, including │
|
|
│ without limitation the rights to use, copy, modify, merge, publish, │
|
|
│ distribute, sublicense, and/or sell copies of the Software, and to │
|
|
│ permit persons to whom the Software is furnished to do so, subject to │
|
|
│ the following conditions: │
|
|
│ │
|
|
│ The above copyright notice and this permission notice shall be │
|
|
│ included in all copies or substantial portions of the Software. │
|
|
│ │
|
|
│ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, │
|
|
│ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF │
|
|
│ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. │
|
|
│ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY │
|
|
│ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, │
|
|
│ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE │
|
|
│ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. │
|
|
│ │
|
|
╚─────────────────────────────────────────────────────────────────────────────*/
|
|
#define ldump_c
|
|
#define LUA_CORE
|
|
|
|
#include "third_party/lua/lobject.h"
|
|
#include "third_party/lua/lprefix.h"
|
|
#include "third_party/lua/lstate.h"
|
|
#include "third_party/lua/lua.h"
|
|
#include "third_party/lua/lundump.h"
|
|
__static_yoink("lua_notice");
|
|
|
|
|
|
typedef struct {
|
|
lua_State *L;
|
|
lua_Writer writer;
|
|
void *data;
|
|
int strip;
|
|
int status;
|
|
} DumpState;
|
|
|
|
|
|
/*
|
|
** All high-level dumps go through dumpVector; you can change it to
|
|
** change the endianness of the result
|
|
*/
|
|
#define dumpVector(D,v,n) dumpBlock(D,v,(n)*sizeof((v)[0]))
|
|
|
|
#define dumpLiteral(D, s) dumpBlock(D,s,sizeof(s) - sizeof(char))
|
|
|
|
|
|
static void dumpBlock (DumpState *D, const void *b, size_t size) {
|
|
if (D->status == 0 && size > 0) {
|
|
lua_unlock(D->L);
|
|
D->status = (*D->writer)(D->L, b, size, D->data);
|
|
lua_lock(D->L);
|
|
}
|
|
}
|
|
|
|
|
|
#define dumpVar(D,x) dumpVector(D,&x,1)
|
|
|
|
|
|
static void dumpByte (DumpState *D, int y) {
|
|
lu_byte x = (lu_byte)y;
|
|
dumpVar(D, x);
|
|
}
|
|
|
|
|
|
/*
|
|
** 'dumpSize' buffer size: each byte can store up to 7 bits. (The "+6"
|
|
** rounds up the division.)
|
|
*/
|
|
#define DIBS ((sizeof(size_t) * CHAR_BIT + 6) / 7)
|
|
|
|
static void dumpSize (DumpState *D, size_t x) {
|
|
lu_byte buff[DIBS];
|
|
int n = 0;
|
|
do {
|
|
buff[DIBS - (++n)] = x & 0x7f; /* fill buffer in reverse order */
|
|
x >>= 7;
|
|
} while (x != 0);
|
|
buff[DIBS - 1] |= 0x80; /* mark last byte */
|
|
dumpVector(D, buff + DIBS - n, n);
|
|
}
|
|
|
|
|
|
static void dumpInt (DumpState *D, int x) {
|
|
dumpSize(D, x);
|
|
}
|
|
|
|
|
|
static void dumpNumber (DumpState *D, lua_Number x) {
|
|
dumpVar(D, x);
|
|
}
|
|
|
|
|
|
static void dumpInteger (DumpState *D, lua_Integer x) {
|
|
dumpVar(D, x);
|
|
}
|
|
|
|
|
|
static void dumpString (DumpState *D, const TString *s) {
|
|
if (s == NULL)
|
|
dumpSize(D, 0);
|
|
else {
|
|
size_t size = tsslen(s);
|
|
const char *str = getstr(s);
|
|
dumpSize(D, size + 1);
|
|
dumpVector(D, str, size);
|
|
}
|
|
}
|
|
|
|
|
|
static void dumpCode (DumpState *D, const Proto *f) {
|
|
dumpInt(D, f->sizecode);
|
|
dumpVector(D, f->code, f->sizecode);
|
|
}
|
|
|
|
|
|
static void dumpFunction(DumpState *D, const Proto *f, TString *psource);
|
|
|
|
static void dumpConstants (DumpState *D, const Proto *f) {
|
|
int i;
|
|
int n = f->sizek;
|
|
dumpInt(D, n);
|
|
for (i = 0; i < n; i++) {
|
|
const TValue *o = &f->k[i];
|
|
int tt = ttypetag(o);
|
|
dumpByte(D, tt);
|
|
switch (tt) {
|
|
case LUA_VNUMFLT:
|
|
dumpNumber(D, fltvalue(o));
|
|
break;
|
|
case LUA_VNUMINT:
|
|
dumpInteger(D, ivalue(o));
|
|
break;
|
|
case LUA_VSHRSTR:
|
|
case LUA_VLNGSTR:
|
|
dumpString(D, tsvalue(o));
|
|
break;
|
|
default:
|
|
lua_assert(tt == LUA_VNIL || tt == LUA_VFALSE || tt == LUA_VTRUE);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
static void dumpProtos (DumpState *D, const Proto *f) {
|
|
int i;
|
|
int n = f->sizep;
|
|
dumpInt(D, n);
|
|
for (i = 0; i < n; i++)
|
|
dumpFunction(D, f->p[i], f->source);
|
|
}
|
|
|
|
|
|
static void dumpUpvalues (DumpState *D, const Proto *f) {
|
|
int i, n = f->sizeupvalues;
|
|
dumpInt(D, n);
|
|
for (i = 0; i < n; i++) {
|
|
dumpByte(D, f->upvalues[i].instack);
|
|
dumpByte(D, f->upvalues[i].idx);
|
|
dumpByte(D, f->upvalues[i].kind);
|
|
}
|
|
}
|
|
|
|
|
|
static void dumpDebug (DumpState *D, const Proto *f) {
|
|
int i, n;
|
|
n = (D->strip) ? 0 : f->sizelineinfo;
|
|
dumpInt(D, n);
|
|
dumpVector(D, f->lineinfo, n);
|
|
n = (D->strip) ? 0 : f->sizeabslineinfo;
|
|
dumpInt(D, n);
|
|
for (i = 0; i < n; i++) {
|
|
dumpInt(D, f->abslineinfo[i].pc);
|
|
dumpInt(D, f->abslineinfo[i].line);
|
|
}
|
|
n = (D->strip) ? 0 : f->sizelocvars;
|
|
dumpInt(D, n);
|
|
for (i = 0; i < n; i++) {
|
|
dumpString(D, f->locvars[i].varname);
|
|
dumpInt(D, f->locvars[i].startpc);
|
|
dumpInt(D, f->locvars[i].endpc);
|
|
}
|
|
n = (D->strip) ? 0 : f->sizeupvalues;
|
|
dumpInt(D, n);
|
|
for (i = 0; i < n; i++)
|
|
dumpString(D, f->upvalues[i].name);
|
|
}
|
|
|
|
|
|
static void dumpFunction (DumpState *D, const Proto *f, TString *psource) {
|
|
if (D->strip || f->source == psource)
|
|
dumpString(D, NULL); /* no debug info or same source as its parent */
|
|
else
|
|
dumpString(D, f->source);
|
|
dumpInt(D, f->linedefined);
|
|
dumpInt(D, f->lastlinedefined);
|
|
dumpByte(D, f->numparams);
|
|
dumpByte(D, f->is_vararg);
|
|
dumpByte(D, f->maxstacksize);
|
|
dumpCode(D, f);
|
|
dumpConstants(D, f);
|
|
dumpUpvalues(D, f);
|
|
dumpProtos(D, f);
|
|
dumpDebug(D, f);
|
|
}
|
|
|
|
|
|
static void dumpHeader (DumpState *D) {
|
|
dumpLiteral(D, LUA_SIGNATURE);
|
|
dumpByte(D, LUAC_VERSION);
|
|
dumpByte(D, LUAC_FORMAT);
|
|
dumpLiteral(D, LUAC_DATA);
|
|
dumpByte(D, sizeof(Instruction));
|
|
dumpByte(D, sizeof(lua_Integer));
|
|
dumpByte(D, sizeof(lua_Number));
|
|
dumpInteger(D, LUAC_INT);
|
|
dumpNumber(D, LUAC_NUM);
|
|
}
|
|
|
|
|
|
/*
|
|
** dump Lua function as precompiled chunk
|
|
*/
|
|
int luaU_dump(lua_State *L, const Proto *f, lua_Writer w, void *data,
|
|
int strip) {
|
|
DumpState D;
|
|
D.L = L;
|
|
D.writer = w;
|
|
D.data = data;
|
|
D.strip = strip;
|
|
D.status = 0;
|
|
dumpHeader(&D);
|
|
dumpByte(&D, f->sizeupvalues);
|
|
dumpFunction(&D, f, NULL);
|
|
return D.status;
|
|
}
|
|
|