Remove the asm processor (#62)

zeldaret · Oct 14, 2024 · 017fcdf · 017fcdf
1 parent 1c3ca7a
commit 017fcdf
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 1,597 deletions.
diff --git a/configure.py b/configure.py
@@ -252,7 +252,7 @@ def LinkedFor(*versions):
             Object(LinkedFor("oot-j", "oot-u", "oot-e"), "emulator/pi.c"),
             Object(LinkedFor("oot-j", "oot-u", "oot-e"), "emulator/mi.c"),
             Object(LinkedFor("oot-j", "oot-u", "oot-e"), "emulator/disk.c"),
-            Object(NotLinked, "emulator/cpu.c", asm_processor=True),
+            Object(NotLinked, "emulator/cpu.c"),
             Object(LinkedFor("oot-j", "oot-u", "oot-e"), "emulator/pif.c"),
             Object(LinkedFor("oot-j", "oot-u", "oot-e"), "emulator/ram.c"),
             Object(LinkedFor("oot-j", "oot-u", "oot-e"), "emulator/rom.c"),

diff --git a/src/emulator/_buildtev.c b/src/emulator/_buildtev.c
@@ -174,7 +174,7 @@ s32 AddAlphaTevOrder(CombineModeTev* tvP, s32 foundTypes, s32 curStage) {
     return ret;
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/_buildtev/SetupStage.s")
+// SetupStage
 
 void BuildCycle(CombineModeTev* tvP, u8 (*stageValues)[4]) {
     s32 numCParts;

diff --git a/src/emulator/cpu.c b/src/emulator/cpu.c
@@ -1502,7 +1502,6 @@ static void cpuCompileNOP(s32* anCode, s32* iCode, s32 number) {
 
 #ifndef NON_MATCHING
 static bool fn_8000E734(Cpu* pCPU, s32 arg1, s32 arg2, s32 arg3);
-// #pragma GLOBAL_ASM("asm/non_matchings/cpu/fn_8000E734.s")
 #else
 static bool fn_8000E734(Cpu* pCPU, s32 arg1, s32 arg2, s32 arg3) {
     if (gpSystem->eTypeROM == CLBJ || gpSystem->eTypeROM == CLBE || gpSystem->eTypeROM == CLBP) {
@@ -1602,7 +1601,6 @@ s32 fn_8000E81C(Cpu* pCPU, s32 arg1, s32 arg2, s32 arg3, s32 arg5, s32* arg6, s3
  * @return bool true on success, false otherwise.
  */
 static bool cpuGetPPC(Cpu* pCPU, s32* pnAddress, CpuFunction* pFunction, s32* anCode, s32* piCode, bool bSlot);
-// #pragma GLOBAL_ASM("asm/non_matchings/cpu/cpuGetPPC.s")
 
 //! TODO: remove NO_INLINE once this is matched
 static bool fn_80031D4C(Cpu* pCPU, CpuFunction* pFunction, s32 unknown) NO_INLINE { return false; }