2022-04-24 16:59:22 +00:00
|
|
|
/*-*- 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 │
|
Bring Lua to 5.4.6. (#1214)
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.
2024-06-16 00:13:08 +00:00
|
|
|
│ Copyright © 2004-2023 Lua.org, PUC-Rio. │
|
2022-04-24 16:59:22 +00:00
|
|
|
│ │
|
|
|
|
│ 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. │
|
|
|
|
│ │
|
|
|
|
╚─────────────────────────────────────────────────────────────────────────────*/
|
2021-03-02 13:51:10 +00:00
|
|
|
#define lstring_c
|
|
|
|
#define LUA_CORE
|
Bring Lua to 5.4.6. (#1214)
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.
2024-06-16 00:13:08 +00:00
|
|
|
|
2022-08-11 07:15:29 +00:00
|
|
|
#include "libc/str/str.h"
|
2021-03-07 21:26:57 +00:00
|
|
|
#include "third_party/lua/ldebug.h"
|
|
|
|
#include "third_party/lua/ldo.h"
|
|
|
|
#include "third_party/lua/lmem.h"
|
|
|
|
#include "third_party/lua/lobject.h"
|
|
|
|
#include "third_party/lua/lprefix.h"
|
|
|
|
#include "third_party/lua/lstate.h"
|
|
|
|
#include "third_party/lua/lstring.h"
|
|
|
|
#include "third_party/lua/lua.h"
|
Release Cosmopolitan v3.3
This change upgrades to GCC 12.3 and GNU binutils 2.42. The GNU linker
appears to have changed things so that only a single de-duplicated str
table is present in the binary, and it gets placed wherever the linker
wants, regardless of what the linker script says. To cope with that we
need to stop using .ident to embed licenses. As such, this change does
significant work to revamp how third party licenses are defined in the
codebase, using `.section .notice,"aR",@progbits`.
This new GCC 12.3 toolchain has support for GNU indirect functions. It
lets us support __target_clones__ for the first time. This is used for
optimizing the performance of libc string functions such as strlen and
friends so far on x86, by ensuring AVX systems favor a second codepath
that uses VEX encoding. It shaves some latency off certain operations.
It's a useful feature to have for scientific computing for the reasons
explained by the test/libcxx/openmp_test.cc example which compiles for
fifteen different microarchitectures. Thanks to the upgrades, it's now
also possible to use newer instruction sets, such as AVX512FP16, VNNI.
Cosmo now uses the %gs register on x86 by default for TLS. Doing it is
helpful for any program that links `cosmo_dlopen()`. Such programs had
to recompile their binaries at startup to change the TLS instructions.
That's not great, since it means every page in the executable needs to
be faulted. The work of rewriting TLS-related x86 opcodes, is moved to
fixupobj.com instead. This is great news for MacOS x86 users, since we
previously needed to morph the binary every time for that platform but
now that's no longer necessary. The only platforms where we need fixup
of TLS x86 opcodes at runtime are now Windows, OpenBSD, and NetBSD. On
Windows we morph TLS to point deeper into the TIB, based on a TlsAlloc
assignment, and on OpenBSD/NetBSD we morph %gs back into %fs since the
kernels do not allow us to specify a value for the %gs register.
OpenBSD users are now required to use APE Loader to run Cosmo binaries
and assimilation is no longer possible. OpenBSD kernel needs to change
to allow programs to specify a value for the %gs register, or it needs
to stop marking executable pages loaded by the kernel as mimmutable().
This release fixes __constructor__, .ctor, .init_array, and lastly the
.preinit_array so they behave the exact same way as glibc.
We no longer use hex constants to define math.h symbols like M_PI.
2024-02-20 19:12:09 +00:00
|
|
|
__static_yoink("lua_notice");
|
2021-03-07 21:26:57 +00:00
|
|
|
|
2021-03-02 13:51:10 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
** Maximum size for string table.
|
|
|
|
*/
|
|
|
|
#define MAXSTRTB cast_int(luaM_limitN(MAX_INT, TString*))
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** equality for long strings
|
|
|
|
*/
|
|
|
|
int luaS_eqlngstr (TString *a, TString *b) {
|
|
|
|
size_t len = a->u.lnglen;
|
|
|
|
lua_assert(a->tt == LUA_VLNGSTR && b->tt == LUA_VLNGSTR);
|
|
|
|
return (a == b) || /* same instance or... */
|
|
|
|
((len == b->u.lnglen) && /* equal length and ... */
|
|
|
|
(memcmp(getstr(a), getstr(b), len) == 0)); /* equal contents */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
unsigned int luaS_hash (const char *str, size_t l, unsigned int seed) {
|
|
|
|
unsigned int h = seed ^ cast_uint(l);
|
|
|
|
for (; l > 0; l--)
|
|
|
|
h ^= ((h<<5) + (h>>2) + cast_byte(str[l - 1]));
|
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
unsigned int luaS_hashlongstr (TString *ts) {
|
|
|
|
lua_assert(ts->tt == LUA_VLNGSTR);
|
|
|
|
if (ts->extra == 0) { /* no hash? */
|
|
|
|
size_t len = ts->u.lnglen;
|
|
|
|
ts->hash = luaS_hash(getstr(ts), len, ts->hash);
|
|
|
|
ts->extra = 1; /* now it has its hash */
|
|
|
|
}
|
|
|
|
return ts->hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void tablerehash (TString **vect, int osize, int nsize) {
|
|
|
|
int i;
|
|
|
|
for (i = osize; i < nsize; i++) /* clear new elements */
|
|
|
|
vect[i] = NULL;
|
|
|
|
for (i = 0; i < osize; i++) { /* rehash old part of the array */
|
|
|
|
TString *p = vect[i];
|
|
|
|
vect[i] = NULL;
|
|
|
|
while (p) { /* for each string in the list */
|
|
|
|
TString *hnext = p->u.hnext; /* save next */
|
|
|
|
unsigned int h = lmod(p->hash, nsize); /* new position */
|
|
|
|
p->u.hnext = vect[h]; /* chain it into array */
|
|
|
|
vect[h] = p;
|
|
|
|
p = hnext;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Resize the string table. If allocation fails, keep the current size.
|
|
|
|
** (This can degrade performance, but any non-zero size should work
|
|
|
|
** correctly.)
|
|
|
|
*/
|
|
|
|
void luaS_resize (lua_State *L, int nsize) {
|
|
|
|
stringtable *tb = &G(L)->strt;
|
|
|
|
int osize = tb->size;
|
|
|
|
TString **newvect;
|
|
|
|
if (nsize < osize) /* shrinking table? */
|
|
|
|
tablerehash(tb->hash, osize, nsize); /* depopulate shrinking part */
|
|
|
|
newvect = luaM_reallocvector(L, tb->hash, osize, nsize, TString*);
|
2021-07-28 16:26:35 +00:00
|
|
|
if (l_unlikely(newvect == NULL)) { /* reallocation failed? */
|
2021-03-02 13:51:10 +00:00
|
|
|
if (nsize < osize) /* was it shrinking table? */
|
|
|
|
tablerehash(tb->hash, nsize, osize); /* restore to original size */
|
|
|
|
/* leave table as it was */
|
|
|
|
}
|
|
|
|
else { /* allocation succeeded */
|
|
|
|
tb->hash = newvect;
|
|
|
|
tb->size = nsize;
|
|
|
|
if (nsize > osize)
|
|
|
|
tablerehash(newvect, osize, nsize); /* rehash for new size */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Clear API string cache. (Entries cannot be empty, so fill them with
|
|
|
|
** a non-collectable string.)
|
|
|
|
*/
|
|
|
|
void luaS_clearcache (global_State *g) {
|
|
|
|
int i, j;
|
|
|
|
for (i = 0; i < STRCACHE_N; i++)
|
|
|
|
for (j = 0; j < STRCACHE_M; j++) {
|
|
|
|
if (iswhite(g->strcache[i][j])) /* will entry be collected? */
|
|
|
|
g->strcache[i][j] = g->memerrmsg; /* replace it with something fixed */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Initialize the string table and the string cache
|
|
|
|
*/
|
|
|
|
void luaS_init (lua_State *L) {
|
|
|
|
global_State *g = G(L);
|
|
|
|
int i, j;
|
|
|
|
stringtable *tb = &G(L)->strt;
|
|
|
|
tb->hash = luaM_newvector(L, MINSTRTABSIZE, TString*);
|
|
|
|
tablerehash(tb->hash, 0, MINSTRTABSIZE); /* clear array */
|
|
|
|
tb->size = MINSTRTABSIZE;
|
|
|
|
/* pre-create memory-error message */
|
|
|
|
g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
|
|
|
|
luaC_fix(L, obj2gco(g->memerrmsg)); /* it should never be collected */
|
|
|
|
for (i = 0; i < STRCACHE_N; i++) /* fill cache with valid strings */
|
|
|
|
for (j = 0; j < STRCACHE_M; j++)
|
|
|
|
g->strcache[i][j] = g->memerrmsg;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** creates a new string object
|
|
|
|
*/
|
|
|
|
static TString *createstrobj (lua_State *L, size_t l, int tag, unsigned int h) {
|
|
|
|
TString *ts;
|
|
|
|
GCObject *o;
|
|
|
|
size_t totalsize; /* total size of TString object */
|
|
|
|
totalsize = sizelstring(l);
|
|
|
|
o = luaC_newobj(L, tag, totalsize);
|
|
|
|
ts = gco2ts(o);
|
|
|
|
ts->hash = h;
|
|
|
|
ts->extra = 0;
|
|
|
|
getstr(ts)[l] = '\0'; /* ending 0 */
|
|
|
|
return ts;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
TString *luaS_createlngstrobj (lua_State *L, size_t l) {
|
|
|
|
TString *ts = createstrobj(L, l, LUA_VLNGSTR, G(L)->seed);
|
|
|
|
ts->u.lnglen = l;
|
|
|
|
return ts;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void luaS_remove (lua_State *L, TString *ts) {
|
|
|
|
stringtable *tb = &G(L)->strt;
|
|
|
|
TString **p = &tb->hash[lmod(ts->hash, tb->size)];
|
|
|
|
while (*p != ts) /* find previous element */
|
|
|
|
p = &(*p)->u.hnext;
|
|
|
|
*p = (*p)->u.hnext; /* remove element from its list */
|
|
|
|
tb->nuse--;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void growstrtab (lua_State *L, stringtable *tb) {
|
2021-07-28 16:26:35 +00:00
|
|
|
if (l_unlikely(tb->nuse == MAX_INT)) { /* too many strings? */
|
2021-03-02 13:51:10 +00:00
|
|
|
luaC_fullgc(L, 1); /* try to free some... */
|
|
|
|
if (tb->nuse == MAX_INT) /* still too many? */
|
|
|
|
luaM_error(L); /* cannot even create a message... */
|
|
|
|
}
|
|
|
|
if (tb->size <= MAXSTRTB / 2) /* can grow string table? */
|
|
|
|
luaS_resize(L, tb->size * 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Checks whether short string exists and reuses it or creates a new one.
|
|
|
|
*/
|
|
|
|
static TString *internshrstr (lua_State *L, const char *str, size_t l) {
|
|
|
|
TString *ts;
|
|
|
|
global_State *g = G(L);
|
|
|
|
stringtable *tb = &g->strt;
|
|
|
|
unsigned int h = luaS_hash(str, l, g->seed);
|
|
|
|
TString **list = &tb->hash[lmod(h, tb->size)];
|
|
|
|
lua_assert(str != NULL); /* otherwise 'memcmp'/'memcpy' are undefined */
|
|
|
|
for (ts = *list; ts != NULL; ts = ts->u.hnext) {
|
|
|
|
if (l == ts->shrlen && (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
|
|
|
|
/* found! */
|
|
|
|
if (isdead(g, ts)) /* dead (but not collected yet)? */
|
|
|
|
changewhite(ts); /* resurrect it */
|
|
|
|
return ts;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* else must create a new string */
|
|
|
|
if (tb->nuse >= tb->size) { /* need to grow string table? */
|
|
|
|
growstrtab(L, tb);
|
|
|
|
list = &tb->hash[lmod(h, tb->size)]; /* rehash with new size */
|
|
|
|
}
|
|
|
|
ts = createstrobj(L, l, LUA_VSHRSTR, h);
|
|
|
|
memcpy(getstr(ts), str, l * sizeof(char));
|
|
|
|
ts->shrlen = cast_byte(l);
|
|
|
|
ts->u.hnext = *list;
|
|
|
|
*list = ts;
|
|
|
|
tb->nuse++;
|
|
|
|
return ts;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** new string (with explicit length)
|
|
|
|
*/
|
|
|
|
TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
|
|
|
|
if (l <= LUAI_MAXSHORTLEN) /* short string? */
|
|
|
|
return internshrstr(L, str, l);
|
|
|
|
else {
|
|
|
|
TString *ts;
|
2021-07-28 16:26:35 +00:00
|
|
|
if (l_unlikely(l >= (MAX_SIZE - sizeof(TString))/sizeof(char)))
|
2021-03-02 13:51:10 +00:00
|
|
|
luaM_toobig(L);
|
|
|
|
ts = luaS_createlngstrobj(L, l);
|
|
|
|
memcpy(getstr(ts), str, l * sizeof(char));
|
|
|
|
return ts;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Create or reuse a zero-terminated string, first checking in the
|
|
|
|
** cache (using the string address as a key). The cache can contain
|
|
|
|
** only zero-terminated strings, so it is safe to use 'strcmp' to
|
|
|
|
** check hits.
|
|
|
|
*/
|
|
|
|
TString *luaS_new (lua_State *L, const char *str) {
|
|
|
|
unsigned int i = point2uint(str) % STRCACHE_N; /* hash */
|
|
|
|
int j;
|
|
|
|
TString **p = G(L)->strcache[i];
|
|
|
|
for (j = 0; j < STRCACHE_M; j++) {
|
|
|
|
if (strcmp(str, getstr(p[j])) == 0) /* hit? */
|
|
|
|
return p[j]; /* that is it */
|
|
|
|
}
|
|
|
|
/* normal route */
|
|
|
|
for (j = STRCACHE_M - 1; j > 0; j--)
|
|
|
|
p[j] = p[j - 1]; /* move out last element */
|
|
|
|
/* new element is first in the list */
|
|
|
|
p[0] = luaS_newlstr(L, str, strlen(str));
|
|
|
|
return p[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Udata *luaS_newudata (lua_State *L, size_t s, int nuvalue) {
|
|
|
|
Udata *u;
|
|
|
|
int i;
|
|
|
|
GCObject *o;
|
2021-07-28 16:26:35 +00:00
|
|
|
if (l_unlikely(s > MAX_SIZE - udatamemoffset(nuvalue)))
|
2021-03-02 13:51:10 +00:00
|
|
|
luaM_toobig(L);
|
|
|
|
o = luaC_newobj(L, LUA_VUSERDATA, sizeudata(nuvalue, s));
|
|
|
|
u = gco2u(o);
|
|
|
|
u->len = s;
|
|
|
|
u->nuvalue = nuvalue;
|
|
|
|
u->metatable = NULL;
|
|
|
|
for (i = 0; i < nuvalue; i++)
|
|
|
|
setnilvalue(&u->uv[i].uv);
|
|
|
|
return u;
|
|
|
|
}
|
|
|
|
|