Match and link cpu.c on the other versions (#200)

* match and link cpu.c for the other versions * dol apply
zeldaret · Oct 24, 2024 · 76d6932 · 76d6932
1 parent d5cf366
commit 76d6932
Show file tree

Hide file tree

Showing 10 changed files with 1,765 additions and 1,657 deletions.
diff --git a/config/ce-e/config.yml b/config/ce-e/config.yml
@@ -201,3 +201,18 @@ block_relocations:
 - source: 0x800301E0
 - source: 0x800301F0
 - source: 0x80030218
+# cpu.c
+- source: 0x800336BC
+- source: 0x800336C4
+- source: 0x80033724
+- source: 0x8003372C
+- source: 0x80033738
+- source: 0x80033EC8
+- source: 0x80033EF8
+- source: 0x80033EFC
+- source: 0x80033F30
+- source: 0x80033F44
+- source: 0x80033F84
+- source: 0x80033F88
+- source: 0x80033FBC
+- source: 0x80033FD0
diff --git a/config/ce-e/symbols.txt b/config/ce-e/symbols.txt
diff --git a/config/ce-j/symbols.txt b/config/ce-j/symbols.txt
diff --git a/config/ce-u/symbols.txt b/config/ce-u/symbols.txt
diff --git a/config/mq-e/symbols.txt b/config/mq-e/symbols.txt
diff --git a/config/mq-j/splits.txt b/config/mq-j/splits.txt
@@ -125,7 +125,7 @@ emulator/system.c:
 emulator/cpu.c:
 	.text       start:0x80030724 end:0x8006B6F0
 	.data       start:0x800ECB20 end:0x800EEB80
-	.bss        start:0x80131DB8 end:0x80186FB0
+	.bss        start:0x80131DB8 end:0x80131FB0
 	.sdata      start:0x8018B340 end:0x8018B500
 	.sbss       start:0x8018B970 end:0x8018B9F0
 	.sdata2     start:0x8018C1E0 end:0x8018C210
@@ -219,7 +219,7 @@ emulator/_frameGCNcc.c:
 emulator/_buildtev.c:
 	.text       start:0x80097E6C end:0x8009B284
 	.data       start:0x800F1920 end:0x800F1AE8
-	.bss        start:0x80186FB0 end:0x80187280
+	.bss        start:0x80131FB0 end:0x80187280
 	.sdata      start:0x8018B690 end:0x8018B6A0
 	.sdata2     start:0x8018C318 end:0x8018C320
 

diff --git a/config/mq-j/symbols.txt b/config/mq-j/symbols.txt
diff --git a/config/mq-u/symbols.txt b/config/mq-u/symbols.txt
diff --git a/configure.py b/configure.py
@@ -276,7 +276,7 @@ def LinkedFor(*versions):
             Object(Linked, "emulator/soundGCN.c"),
             Object(LinkedFor("ce-j"), "emulator/frame.c", asm_processor=True),
             Object(Linked, "emulator/system.c"),
-            Object(LinkedFor("ce-j"), "emulator/cpu.c"),
+            Object(Linked, "emulator/cpu.c"),
             Object(Linked, "emulator/pif.c"),
             Object(Linked, "emulator/ram.c"),
             Object(Linked, "emulator/rom.c"),

diff --git a/src/emulator/_cpuGCN.c b/src/emulator/_cpuGCN.c
@@ -8318,7 +8318,7 @@ static s32 cpuExecuteLoadStore(Cpu* pCPU, s32 nCount, s32 nAddressN64, s32 nAddr
                 anCode[count++] = 0x90070000 | (iRegisterA << 21) | MIPS_IMM_U16(*opcode);
                 break;
             default:
-                OSPanic("_cpuGCN.c", 4725, "");
+                OSPanic("_cpuGCN.c", VERSION == MQ_J ? 4721 : 4725, "");
                 break;
         }
     } else {
@@ -8540,7 +8540,7 @@ static s32 cpuExecuteLoadStoreF(Cpu* pCPU, s32 nCount, s32 nAddressN64, s32 nAdd
                 anCode[count++] = 0x90070000 | (iRegisterA << 21) | (MIPS_IMM_U16(*opcode) + 4);
                 break;
             default:
-                OSPanic("_cpuGCN.c", 5181, "");
+                OSPanic("_cpuGCN.c", VERSION == MQ_J ? 5177 : 5181, "");
                 break;
         }
     } else {