update luajit

fesily · Jul 18, 2024 · 1da2cb2 · 1da2cb2
1 parent 8aa0a43
commit 1da2cb2
Show file tree

Hide file tree

Showing 10 changed files with 1,594 additions and 1,413 deletions.
diff --git a/Mod/bin64/windows/signatures_client.json b/Mod/bin64/windows/signatures_client.json
diff --git a/Mod/bin64/windows/signatures_server.json b/Mod/bin64/windows/signatures_server.json
diff --git a/luajit b/luajit
diff --git a/src/Signatures_client.txt b/src/Signatures_client.txt
diff --git a/src/Signatures_server.txt b/src/Signatures_server.txt
diff --git a/tests/bug1.lua b/tests/bug1.lua
diff --git a/tests/windows_x64/Signatures_client.txt b/tests/windows_x64/Signatures_client.txt
diff --git a/tests/windows_x64/Signatures_server.txt b/tests/windows_x64/Signatures_server.txt
diff --git a/tools/Checker/main.cpp b/tools/Checker/main.cpp
@@ -1,7 +1,7 @@
 #define NOMINMAX
 
-#include "frida-gum.h"
 #include "SignatureJson.hpp"
+#include "frida-gum.h"
 
 #include "LuaModule.hpp"
 #include "platform.hpp"
@@ -44,15 +44,17 @@ int check(const char *path, bool isClient) {
         fprintf(stderr, "%s", "can find lua module base addr\n");
         return 1;
     }
-
+    using namespace std::literals;
     SignatureJson sjCopy{isClient};
-    sjCopy.file_path = "F:\\dontstarveluajit2\\ida.json";
+    auto p = std::filesystem::path{PROJECT_DIR} / "tests" / "windows_x64" / (("Signatures_"s + (isClient ? "client" : "server")) + ".txt.json");
+    sjCopy.file_path = p.string();
     auto sCopy = sjCopy.read_from_signatures().value();
 
     auto count = 0;
     for (auto [func, info]: signatures.funcs) {
-        if (sCopy.funcs.at(func).offset != info.offset) {
-            fprintf(stderr, "[%s]%s", func.c_str(), "can't match the address");
+        const auto ida_offset = sCopy.funcs.at(func).offset;
+        if (ida_offset != info.offset) {
+            fprintf(stderr, "[%s]%s [%d]-[%d]\n", func.c_str(), "can't match the address", (int) ida_offset, (int) info.offset);
             count++;
         }
     }
@@ -70,5 +72,5 @@ int main() {
         return 1;
     set_worker_directory(worker_dir);
     SignatureJson::version_path = GAMEDIR "/version.txt";
-    return check(game_server_path, false);
+    return check(game_path, true) + check(game_server_path, false);
 }
diff --git a/tools/Signature.py b/tools/Signature.py
@@ -5,7 +5,7 @@
 current_game_version = util.read_version()
 argparser = argparse.ArgumentParser()
 argparser.add_argument("input")
-argparser.add_argument("output")
+argparser.add_argument("--output", required=False)
 missfuncs = set()
 with open("src/missfunc.txt", "r") as f:
     for line in f:
@@ -55,6 +55,8 @@ def generator(input, output):
 
     with open(output, mode='w+') as f:
         f.write(json.dumps({'version': int(current_game_version), 'funcs':outputs}))
-
+        
 myargs = argparser.parse_args()
+if myargs.output is None:
+    myargs.output = myargs.input + ".json"
 generator(myargs.input, myargs.output)
+4 −2		CMakeLists.txt
+1 −0		Makefile
+5 −1		doc/extensions.html
+2 −1		src/Makefile.dep
+1 −1		src/jit/bcsave.lua
+1 −1		src/lib_ffi.c
+5 −1		src/lib_math.c
+1 −3		src/lj_buf.c
+6 −4		src/lj_crecord.c
+1 −0		src/lj_errmsg.h
+9 −4		src/lj_parse.c
+24 −2		src/lj_record.c
+3 −1		src/lj_trace.c