NeoFlock/neonucleus
9
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed the memory corruption

Browse Source 
Stinky Lua
This commit is contained in:
IonutParau
2026-02-15 21:16:03 +01:00
parent 76589e67dd
commit 85d08a0a34
4 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/OpenOS/lib/tty.lua
View File

@@ -30,7 +30,6 @@ function tty.getViewport()
if window.fullscreen and screen and not screen_cache[screen] then if window.fullscreen and screen and not screen_cache[screen] then
screen_cache[screen] = true screen_cache[screen] = true
window.width, window.height = window.gpu.getViewport() window.width, window.height = window.gpu.getViewport()
debug.print("viewport is", window.width, window.height)
end end
return window.width, window.height, window.dx, window.dy, window.x, window.y return window.width, window.height, window.dx, window.dy, window.x, window.y

39
rewrite/luaarch.c
View File

@@ -53,8 +53,7 @@ static luaArch *luaArch_from(lua_State *L) {
} }
// pushes an NN value from a Lua stack index // pushes an NN value from a Lua stack index
static nn_Exit luaArch_luaToNN(luaArch *arch, int luaIdx) { static nn_Exit luaArch_luaToNN(luaArch *arch, lua_State *L, int luaIdx) {
lua_State *L = arch->L;
nn_Computer *C = arch->computer; nn_Computer *C = arch->computer;
if(lua_isnoneornil(L, luaIdx)) { if(lua_isnoneornil(L, luaIdx)) {
@@ -76,8 +75,7 @@ static nn_Exit luaArch_luaToNN(luaArch *arch, int luaIdx) {
} }
// pushes a Lua value from an NN stack index // pushes a Lua value from an NN stack index
static void luaArch_nnToLua(luaArch *arch, size_t nnIdx) { static void luaArch_nnToLua(luaArch *arch, lua_State *L, size_t nnIdx) {
lua_State *L = arch->L;
nn_Computer *C = arch->computer; nn_Computer *C = arch->computer;
if(nn_isnull(C, nnIdx)) { if(nn_isnull(C, nnIdx)) {
@@ -104,8 +102,8 @@ static void luaArch_nnToLua(luaArch *arch, size_t nnIdx) {
nn_dumptable(C, nnIdx, &len); nn_dumptable(C, nnIdx, &len);
lua_createtable(L, 0, len); lua_createtable(L, 0, len);
for(size_t i = 0; i < len; i++) { for(size_t i = 0; i < len; i++) {
luaArch_nnToLua(arch, start + i * 2); luaArch_nnToLua(arch, L, start + i * 2);
luaArch_nnToLua(arch, start + i * 2 + 1); luaArch_nnToLua(arch, L, start + i * 2 + 1);
lua_settable(L, -3); lua_settable(L, -3);
} }
nn_popn(C, len * 2); nn_popn(C, len * 2);
@@ -236,7 +234,7 @@ static int luaArch_computer_pushSignal(lua_State *L) {
size_t signalCount = lua_gettop(L); size_t signalCount = lua_gettop(L);
nn_Exit err; nn_Exit err;
for(int i = 1; i <= signalCount; i++) { for(int i = 1; i <= signalCount; i++) {
err = luaArch_luaToNN(arch, i); err = luaArch_luaToNN(arch, L, i);
if(err) { if(err) {
nn_setErrorFromExit(c, err); nn_setErrorFromExit(c, err);
luaL_error(L, "%s", nn_getError(c)); luaL_error(L, "%s", nn_getError(c));
@@ -260,7 +258,7 @@ static int luaArch_computer_popSignal(lua_State *L) {
nn_Exit err = nn_popSignal(c, &signalCount); nn_Exit err = nn_popSignal(c, &signalCount);
if(err) goto fail; if(err) goto fail;
for(size_t i = 0; i < signalCount; i++) { for(size_t i = 0; i < signalCount; i++) {
luaArch_nnToLua(arch, i); luaArch_nnToLua(arch, L, i);
} }
nn_clearstack(c); nn_clearstack(c);
return signalCount; return signalCount;
@@ -301,7 +299,7 @@ static int luaArch_component_invoke(lua_State *L) {
nn_clearstack(arch->computer); nn_clearstack(arch->computer);
for(size_t i = 3; i <= argc; i++) { for(size_t i = 3; i <= argc; i++) {
luaArch_luaToNN(arch, i); luaArch_luaToNN(arch, L, i);
} }
nn_Exit err = nn_call(arch->computer, address, method); nn_Exit err = nn_call(arch->computer, address, method);
if(err != NN_OK) { if(err != NN_OK) {
@@ -310,29 +308,8 @@ static int luaArch_component_invoke(lua_State *L) {
return 2; return 2;
} }
size_t retc = nn_getstacksize(arch->computer); size_t retc = nn_getstacksize(arch->computer);
if(strcmp(method, "getViewport") == 0) {
printf("component.invoke(%s, %s) = %zu\n", address, method, retc);
for(size_t i = 0; i < retc; i++) { for(size_t i = 0; i < retc; i++) {
printf("%zu. %s\n", i+1, nn_typenameof(arch->computer, i)); luaArch_nnToLua(arch, L, i);
}
printf("prev lua stack size: %d\n", lua_gettop(L));
}
for(size_t i = 0; i < retc; i++) {
if(strcmp(method, "getViewport") == 0) {
printf("lua stack size: %d\n", lua_gettop(L));
}
luaArch_nnToLua(arch, i);
}
if(strcmp(method, "getViewport") == 0) {
printf("RECHECK STACK\n");
for(size_t i = 0; i < retc; i++) {
printf("%zu. %s\n", i+1, nn_typenameof(arch->computer, i));
}
printf("new lua stack size: %d\n", lua_gettop(L));
printf("Lua rets:\n");
for(int i = 0; i < retc; i++) {
printf("%d. %s\n", i+1, luaL_typename(L, i - retc));
}
} }
nn_clearstack(arch->computer); nn_clearstack(arch->computer);
return retc; return retc;

2
rewrite/machine.lua
View File

@@ -227,6 +227,8 @@ if os.getenv("NN_REPL") == "1" then
print("exiting repl") print("exiting repl")
end end
collectgarbage("stop")
local eeprom = component.list("eeprom", true)() local eeprom = component.list("eeprom", true)()
assert(eeprom, "missing firmware") assert(eeprom, "missing firmware")

5
rewrite/main.c
View File

@@ -107,7 +107,6 @@ void ne_fsState_truepath(ne_FsState *state, char truepath[NN_MAX_PATH], const ch
} }
} }
nn_Exit ne_fsState_handler(nn_FilesystemRequest *req) { nn_Exit ne_fsState_handler(nn_FilesystemRequest *req) {
nn_Computer *C = req->computer; nn_Computer *C = req->computer;
ne_FsState *state = req->instance; ne_FsState *state = req->instance;
@@ -988,7 +987,7 @@ int main() {
const char *player = getenv("USER"); const char *player = getenv("USER");
if(player == NULL) player = "me"; if(player == NULL) player = "me";
bool sandboxMem = true; bool sandboxMem = getenv("NN_MEMSAND") != NULL;
nn_Context ctx; nn_Context ctx;
nn_initContext(&ctx); nn_initContext(&ctx);
@@ -1097,7 +1096,7 @@ int main() {
} }
} }
DrawText(TextFormat("mem used: %.2f%%", (double)sand.used / sand.cap * 100), 10, 10, 20, WHITE); if(sand.buf != NULL) DrawText(TextFormat("mem used: %.2f%%", (double)sand.used / sand.cap * 100), 10, 10, 20, WHITE);
EndDrawing(); EndDrawing();