Remove spm-headers ppcdis support

SeekyCt · Sep 3, 2024 · db5efed · db5efed
1 parent 8757e45
commit db5efed
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 14 deletions.
diff --git a/.vscode.example/c_cpp_properties.json b/.vscode.example/c_cpp_properties.json
@@ -9,7 +9,6 @@
             ],
             "defines": [
                 "DECOMP",
-                "SKIP_PPCDIS",
                 "SPM_EU0"
             ],
             "cStandard": "c99",
@@ -33,7 +32,6 @@
             ],
             "defines": [
                 "DECOMP",
-                "SKIP_PPCDIS",
                 "SPM_EU0"
             ],
             "cStandard": "c99",

diff --git a/configure.py b/configure.py
@@ -189,7 +189,6 @@
 
     # spm-headers
     "-DDECOMP",
-    "-DSKIP_PPCDIS",
     f"-DSPM_{config.version.upper()}",
     f"-i {SPM_HEADERS}/include",
     f"-i {SPM_HEADERS}/decomp",

diff --git a/spm-headers/README.md b/spm-headers/README.md
@@ -21,10 +21,6 @@ It is recommended to use this with [git subrepo](https://github.com/ingydotnet/g
 
 For use in decomp, the `include` and `decomp` folders should be added to the include path, and the preprocessor define `DECOMP` should be used.
 
-### Testing
-
-The `SKIP_PPCDIS` preprocessor define will stop `ppcdis.h` being included.
-
 ## Mods
 
 For use in mods, the `include` and `mod` folder should be added to the include path and an lst from `linker` should be used. If including your compiler's C++ standard library, the preprocessor define `USE_STL` should be used.

diff --git a/spm-headers/configure.py b/spm-headers/configure.py
@@ -245,7 +245,7 @@ def test_old_mod_ctx(regions: List[str]):
 def test_decomp_ctx(regions: List[str]):
     assert args.codewarrior, "Error: decomp_ctx test requires --codewarrior"
     compile_regions(os.path.join("$builddir", "{region}", "decomp.o"), "$decomp_source", regions,
-                    DECOMP_INCLUDES, ["DECOMP", "SKIP_PPCDIS"], True)
+                    DECOMP_INCLUDES, ["DECOMP"], True)
 
 # Test shuffled include orders
 def test_mod_ctx_shuffle(regions: List[str]):

diff --git a/spm-headers/include/common.h b/spm-headers/include/common.h
@@ -1,12 +1,7 @@
 #pragma once
 
-#if (defined DECOMP) && !(defined SKIP_PPCDIS)
-// Decomp should include ppcdis.h in all files
-#include <ppcdis.h>
-#else
-// Unknown function is useful outside of decomp too
+// Unknown function declaration
 #define UNKNOWN_FUNCTION(name) void name(void)
-#endif
 
 // Intellisense doesn't like asm compiler extensions
 #ifdef __INTELLISENSE__