Hack to figure which binary doesn't have the function in generate_fun…

…ction_diff
happyhavoc · Mar 10, 2024 · 16fc486 · 16fc486
1 parent 35f352c
commit 16fc486
Showing 1 changed file with 39 additions and 30 deletions.
diff --git a/scripts/generate_function_diff.py b/scripts/generate_function_diff.py
@@ -21,37 +21,46 @@ def generate_function_diff(fn_name):
 
     os.makedirs(diff_dir / fs_fn_name, exist_ok=True)
     with open(orig_asm_path, "w") as out:
-        out = subprocess.run(
-            [
-                "satsuki",
-                "--mapping-file-csv",
-                str(config_dir / "mapping.csv"),
-                "disassemble",
-                str(resource_dir / "game.exe"),
-                "--resolve-names",
-                fn_name,
-            ],
-            stdout=out,
-            stderr=subprocess.PIPE,
-            check=True,
-        )
+        try:
+            out = subprocess.run(
+                [
+                    "satsuki",
+                    "--mapping-file-csv",
+                    str(config_dir / "mapping.csv"),
+                    "disassemble",
+                    str(resource_dir / "game.exe"),
+                    "--resolve-names",
+                    fn_name,
+                ],
+                stdout=out,
+                stderr=subprocess.PIPE,
+                check=True,
+            )
+        except subprocess.CalledProcessError as e:
+            e.stderr = b"original: " + e.stderr
+            raise
+
     with open(reimpl_asm_path, "w") as out:
-        out = subprocess.run(
-            [
-                "satsuki",
-                "--mapping-file-csv",
-                str(config_dir / "mapping.csv"),
-                "disassemble",
-                str(build_dir / "th06e.exe"),
-                "--pdb-file",
-                str(build_dir / "th06e.pdb"),
-                "--resolve-names",
-                fn_name,
-            ],
-            stdout=out,
-            stderr=subprocess.PIPE,
-            check=True,
-        )
+        try:
+            out = subprocess.run(
+                [
+                    "satsuki",
+                    "--mapping-file-csv",
+                    str(config_dir / "mapping.csv"),
+                    "disassemble",
+                    str(build_dir / "th06e.exe"),
+                    "--pdb-file",
+                    str(build_dir / "th06e.pdb"),
+                    "--resolve-names",
+                    fn_name,
+                ],
+                stdout=out,
+                stderr=subprocess.PIPE,
+                check=True,
+            )
+        except subprocess.CalledProcessError as e:
+            e.stderr = b"reimpl: " + e.stderr
+            raise
 
     return orig_asm_path.read_text(), reimpl_asm_path.read_text()