调试器的内置脚本切换到Lua55

actboy168 · actboy168 · commit 03d530df21cc · 2025-12-04T22:54:59.000+08:00
diff --git a/3rd/bee.lua b/3rd/bee.lua
@@ -1 +1 @@
-Subproject commit 973fd8a0ba2d3a0f1988ac03c1817e8c932a7b82
+Subproject commit c3f1b2e7598710ce209d05eac43ac4282b15340c
diff --git a/compile/common/bee.lua b/compile/common/bee.lua
@@ -2,7 +2,8 @@ local lm = require "luamake"
 
 lm.rootdir = "../../3rd/bee.lua"
 
-lm:lua_src "source_bee" {
+lm:source_set "source_bee" {
+    includes = "3rd/lua55",
     sources = "3rd/lua-seri/lua-seri.cpp",
     msvc = {
         flags = "/wd4244"
@@ -43,7 +44,7 @@ end
 lm:source_set "source_bee" {
     includes = {
         ".",
-        "3rd/lua54/",
+        "3rd/lua55/",
     },
     sources = "bee/**/*.cpp",
     windows = {
@@ -101,8 +102,8 @@ lm:source_set "source_bee" {
     }
 }
 
-lm:lua_src "source_bee" {
-    includes = ".",
+lm:source_set "source_bee" {
+    includes = { "3rd/lua55", "." },
     defines = {
         lm.EXE ~= "lua" and "BEE_STATIC",
     },
@@ -175,9 +176,9 @@ lm:source_set "source_lua" {
 }
 
 lm:source_set "source_lua" {
-    includes = "3rd/lua54",
+    includes = "3rd/lua55",
     sources = {
-        "3rd/lua54/onelua.c",
+        "3rd/lua55/onelua.c",
     },
     defines = "MAKE_LIB",
     windows = {
@@ -224,7 +225,7 @@ lm:source_set "source_bootstrap" {
         "source_bee",
         "source_lua",
     },
-    includes = { "3rd/lua54", "." },
+    includes = { "3rd/lua55", "." },
     sources = {
         "bootstrap/main.cpp",
         "bootstrap/bootstrap_init.cpp",
diff --git a/compile/common/launcher.lua b/compile/common/launcher.lua
@@ -11,15 +11,15 @@ lm:source_set "launcher_hook_luajit" {
     sources = "src/launcher/hook/luajit_listener.cpp",
 }
 
-lm:lua_src 'launcher_source' {
+lm:source_set 'launcher_source' {
     deps = {
         "frida",
         "launcher_hook_luajit",
     },
     includes = {
         "3rd/bee.lua",
         "3rd/frida_gum/gumpp",
-        "3rd/lua/lua54",
+        "3rd/lua/lua55",
         "src/launcher",
     },
     sources = {
diff --git a/compile/common/lua-debug.lua b/compile/common/lua-debug.lua
@@ -5,7 +5,7 @@ if lm.os == "windows" then
         bindir = "publish/bin",
         includes = {
             "3rd/bee.lua",
-            "3rd/bee.lua/3rd/lua54",
+            "3rd/bee.lua/3rd/lua55",
             "3rd/wow64ext/src",
         },
         sources = {
diff --git a/compile/common/runtime.lua b/compile/common/runtime.lua
@@ -11,7 +11,7 @@ local bindir = "publish/runtime/"..lm.runtime_platform
 
 lm:source_set 'onelua' {
     includes = {
-        "3rd/bee.lua/3rd/lua54/",
+        "3rd/bee.lua/3rd/lua55/",
         "3rd/bee.lua/",
         "src/luadebug/",
     },
@@ -41,7 +41,7 @@ lm:source_set 'luadbg' {
     includes = {
         "src/luadebug",
         "3rd/bee.lua",
-        "3rd/bee.lua/3rd/lua54",
+        "3rd/bee.lua/3rd/lua55",
     },
     sources = {
         "src/luadebug/luadbg/*.cpp",
diff --git a/compile/linux/runtime.lua b/compile/linux/runtime.lua
@@ -4,6 +4,7 @@ require "compile.common.runtime"
 require "compile.common.launcher"
 
 lm:lua_dll 'launcher' {
+    luaversion = "lua55",
     bindir = "publish/bin/",
     export_luaopen = "off",
     deps = {
diff --git a/compile/luadbg/build.lua b/compile/luadbg/build.lua
@@ -1,7 +1,7 @@
 local lm = require "luamake"
 
 local newname <const> = "luadbg"
-local luapath <const> = [[3rd/bee.lua/3rd/lua54/]]
+local luapath <const> = [[3rd/bee.lua/3rd/lua55/]]
 local outpath <const> = [[src/luadebug/luadbg/inc/]]
 local filelist <const> = {
     "lua.h",
diff --git a/compile/luadbg/compile.lua b/compile/luadbg/compile.lua
@@ -8,31 +8,39 @@ local function lua_exports()
     local function search_marco(line)
         local marco = line:match "^%s*#define%s+([lL][uU][aA][%w_]+)"
         if marco and not marco:match "_h$" and not marco:match "^LUA_USE_" then
-            marcos[#marcos + 1] = marco
+            marcos[#marcos+1] = marco
         end
     end
     for line in io.lines(luapath.."lua.h") do
         local api = line:match "^%s*LUA_API[%w%s%*_]+%(([%w_]+)%)"
         if api then
-            exports[#exports + 1] = api
+            exports[#exports+1] = api
         else
             search_marco(line)
         end
     end
     for line in io.lines(luapath.."lauxlib.h") do
         local api = line:match "^%s*LUALIB_API[%w%s%*_]+%(([%w_]+)%)"
         if api then
-            exports[#exports + 1] = api
+            exports[#exports+1] = api
         else
             search_marco(line)
         end
     end
+    ---@TODO: lua55的临时处理
+    exports[#exports+1] = "luaL_alloc"
+
     for line in io.lines(luapath.."lualib.h") do
         local api = line:match "^%s*LUALIB_API[%w%s%*_]+%(([%w_]+)%)"
         if api then
-            exports[#exports + 1] = api
+            exports[#exports+1] = api
         else
-            search_marco(line)
+            local api = line:match "^%s*LUAMOD_API[%w%s%*_]+%(([%w_]+)%)"
+            if api then
+                exports[#exports+1] = api
+            else
+                search_marco(line)
+            end
         end
     end
     for line in io.lines(luapath.."luaconf.h") do
@@ -84,9 +92,11 @@ do
     write "lua_Integer"
     write "lua_Number"
     write "lua_CFunction"
+    write "lua_Alloc"
     write "luaL_Stream"
     write "luaL_Buffer"
     write "luaL_Reg"
+
     f:write "\n"
     for _, marco in ipairs(marcos) do
         f:write(("#define %s %s\n"):format(marco, compile(marco)))
diff --git a/compile/macos/runtime.lua b/compile/macos/runtime.lua
@@ -5,6 +5,7 @@ require "compile.common.runtime"
 require "compile.common.launcher"
 
 lm:lua_dll 'launcher' {
+    luaversion = "lua55",
     export_luaopen = "off",
     deps = {
         "launcher_source",
diff --git a/compile/test/make.lua b/compile/test/make.lua
@@ -39,7 +39,7 @@ lm:executable "test_delayload" {
     sources = "test/delayload.cpp",
     includes = {
         "src/launcher",
-        "3rd/lua/lua54"
+        "3rd/lua/lua55"
     },
 }
 
diff --git a/compile/windows/runtime.lua b/compile/windows/runtime.lua
@@ -27,6 +27,7 @@ local ArchAlias = {
 }
 
 lm:lua_dll ('launcher.'..ArchAlias[platform]) {
+    luaversion = "lua55",
     bindir = "publish/bin",
     export_luaopen = "off",
     deps = {
diff --git a/extension/script/bootstrap.lua b/extension/script/bootstrap.lua
@@ -2,24 +2,23 @@ local root; do
     local pattern = "[/][^/]+"
     root = package.cpath:match("(.+)"..pattern..pattern.."$")
 end
-package.path = root .. "/script/?.lua"
+package.path = root.."/script/?.lua"
 
 for i = 1, #arg do
     if arg[i] == '-e' then
-        i = i + 1
-        local expr = assert(arg[i], "'-e' needs argument")
+        local expr = assert(arg[i + 1], "'-e' needs argument")
         assert(load(expr, "=(command line)"))()
-		table.remove(arg, i)
-		table.remove(arg, i - 1)
+        table.remove(arg, i + 1)
+        table.remove(arg, i)
         break
     end
 end
 
 for i = #arg, 1, -1 do
-	if arg[i] == '' then
-		table.remove(arg, i)
-	end
+    if arg[i] == '' then
+        table.remove(arg, i)
+    end
 end
 
-local func = assert(loadfile(root .. "/script/frontend/main.lua"))
-func(arg[1])
+local func = assert(loadfile(root.."/script/frontend/main.lua"))
+func(arg[1])
diff --git a/src/luadebug/luadbg/onelua.c b/src/luadebug/luadbg/onelua.c
@@ -82,7 +82,11 @@
 #include "lutf8lib.c"
 #include "linit.c"
 
-LClosure* luaU_undump(lua_State* L, ZIO* Z, const char* name) {
+#if LUA_VERSION_NUM >= 505
+LClosure *luaU_undump (lua_State *L, ZIO *Z, const char *name, int fixed) {
+#else
+LClosure *luaU_undump (lua_State *L, ZIO *Z, const char *name) {
+#endif
     luaO_pushfstring(L, "%s: binary loader not available", name);
     luaD_throw(L, LUA_ERRSYNTAX);
     return NULL;

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ lm:executable "test_delayload" {`
`39`	`39`	`sources = "test/delayload.cpp",`
`40`	`40`	`includes = {`
`41`	`41`	`"src/launcher",`
`42`		`- "3rd/lua/lua54"`
	`42`	`+ "3rd/lua/lua55"`
`43`	`43`	`},`
`44`	`44`	`}`
`45`	`45`