match and link cpu.c for the other versions

zeldaret · Oct 24, 2024 · 3e8db8d · 3e8db8d
1 parent d5cf366
commit 3e8db8d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 12 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
@@ -392,13 +392,13 @@ cpuExecuteLoadStore = .text:0x80038640; // type:function size:0xE60 scope:local
 cpuExecuteCall = .text:0x800394A0; // type:function size:0x260 scope:local
 cpuExecuteJump = .text:0x80039700; // type:function size:0xD0 scope:local
 cpuExecuteIdle = .text:0x800397D0; // type:function size:0x10C scope:local
-cpuExecuteOpcode = .text:0x800398DC; // type:function size:0x4974 scope:local
+cpuExecuteOpcode = .text:0x800398DC; // type:function size:0x4974
 cpuExecuteUpdate = .text:0x8003E250; // type:function size:0x2FC scope:local
 cpuRetraceCallback = .text:0x8003E54C; // type:function size:0x10 scope:local
 cpuNextInstruction = .text:0x8003E55C; // type:function size:0x2C4 scope:local
 cpuFindAddress = .text:0x8003E820; // type:function size:0x49C scope:local
 cpuMakeFunction = .text:0x8003ECBC; // type:function size:0x490 scope:global
-cpuGetPPC = .text:0x8003F14C; // type:function size:0x29434 scope:local
+cpuGetPPC = .text:0x8003F14C; // type:function size:0x29434
 cpuCheckDelaySlot = .text:0x80068580; // type:function size:0x130 scope:local
 cpuCompile_LWR = .text:0x800686B0; // type:function size:0x18C scope:local
 cpuCompile_LWL = .text:0x8006883C; // type:function size:0x190 scope:local
@@ -1800,7 +1800,7 @@ gTypeFile = .data:0x800DCA20; // type:object size:0x10 scope:global
 gcoverOpen = .data:0x800DCAC0; // type:object size:0x2E61 scope:global align:32
 gnoDisk = .data:0x800DF940; // type:object size:0x2201 scope:global align:32
 gretryErr = .data:0x800E1B60; // type:object size:0x3401 scope:global align:32
-gfatalErr = .data:0x800E4F80; // type:object size:0x4B41 scope:global align:32
+gfatalErr = .data:0x800E4F80; // type:object size:0x4B41 scope:global align:32 noreloc
 gwrongDisk = .data:0x800E9AE0; // type:object size:0x2201 scope:global align:32
 greadingDisk = .data:0x800EBD00; // type:object size:0xB81 scope:global align:32
 gyes = .data:0x800EC8A0; // type:object size:0x141 scope:global align:32
@@ -1818,7 +1818,7 @@ gfrench_mesgOK = .data:0x800FF1E0; // type:object size:0x1C1 scope:global align:
 ggerman_coverOpen = .data:0x800FF3C0; // type:object size:0x2C21 scope:global align:32
 ggerman_noDisk = .data:0x80102000; // type:object size:0x2201 scope:global align:32
 ggerman_retryErr = .data:0x80104220; // type:object size:0x46C1 scope:global align:32
-ggerman_fatalErr = .data:0x80108900; // type:object size:0x46C1 scope:global align:32
+ggerman_fatalErr = .data:0x80108900; // type:object size:0x46C1 scope:global align:32 noreloc
 ggerman_wrongDisk = .data:0x8010CFE0; // type:object size:0x2501 scope:global align:32
 ggerman_readingDisk = .data:0x8010F500; // type:object size:0xD61 scope:global align:32
 ggerman_yes = .data:0x80110280; // type:object size:0x1C1 scope:global align:32

diff --git a/config/mq-e/symbols.txt b/config/mq-e/symbols.txt
@@ -1778,14 +1778,14 @@ gno = .data:0x800EA260; // type:object size:0x101 align:32
 gmesgOK = .data:0x800EA380; // type:object size:0x161 align:32
 gfrench_coverOpen = .data:0x800EA500; // type:object size:0x2C21 align:32 noreloc
 gfrench_noDisk = .data:0x800ED140; // type:object size:0x2201 align:32 noreloc
-gfrench_retryErr = .data:0x800EF360; // type:object size:0x46C1 align:32
+gfrench_retryErr = .data:0x800EF360; // type:object size:0x46C1 align:32 noreloc
 gfrench_fatalErr = .data:0x800F3A40; // type:object size:0x46C1 align:32
 gfrench_wrongDisk = .data:0x800F8120; // type:object size:0x2201 align:32
 gfrench_readingDisk = .data:0x800FA340; // type:object size:0xD61 align:32
 gfrench_yes = .data:0x800FB0C0; // type:object size:0x1C1 align:32
 gfrench_no = .data:0x800FB2A0; // type:object size:0x1C1 align:32
 gfrench_mesgOK = .data:0x800FB480; // type:object size:0x1C1 align:32
-ggerman_coverOpen = .data:0x800FB660; // type:object size:0x2C21 align:32
+ggerman_coverOpen = .data:0x800FB660; // type:object size:0x2C21 align:32 noreloc
 ggerman_noDisk = .data:0x800FE2A0; // type:object size:0x2201 align:32 noreloc
 ggerman_retryErr = .data:0x801004C0; // type:object size:0x46C1 align:32
 ggerman_fatalErr = .data:0x80104BA0; // type:object size:0x46C1 align:32 noreloc

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
@@ -2439,7 +2439,7 @@ lbl_80109920 = .bss:0x80109920; // type:object size:0x276A0
 lbl_80130FC0 = .bss:0x80130FC0; // type:object size:0xC80 data:2byte
 gSystemRomConfigurationList = .bss:0x80131C40; // type:object size:0x174
 ...bss.0 = .bss:0x80131C40; // type:label scope:local
-aHeapTreeFlag = .bss:0x80131DB8; // type:object size:0x1F4 data:4byte
+aHeapTreeFlag = .bss:0x80131DB8; // type:object size:0x1F8 data:4byte
 lbl_80131FB0 = .bss:0x80131FB0; // type:object size:0xA000
 lbl_8013BFB0 = .bss:0x8013BFB0; // type:object size:0x25800 data:2byte
 lbl_801617B0 = .bss:0x801617B0; // type:object size:0x25800 data:2byte

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 {