Skip to content

Commit ce89533

Browse files
LagoLunaticLagoLunatic
authored
Add missing RVL .init splits (zeldaret#2989)
* Fix Debug_BBA being in the wrong split for GCN * Add .init splits/symbols for Wii versions * Fix incorrect relocations detected to __check_pad3 for Wii * Add .init splits and fix __check_pad3 for Shield versions
1 parent 9767e76 commit ce89533

File tree

24 files changed

+131
-44
lines changed

24 files changed

+131
-44
lines changed

‎.vscode/tasks.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"GZ2J01", // GCN JPN
1313
"RZDE01_00", // Wii USA Rev 0
1414
"RZDE01_02", // Wii USA Rev 2
15-
//"RZDP01", // Wii PAL
15+
"RZDP01", // Wii PAL
1616
"RZDJ01", // Wii JPN
1717
//"RZDK01", // Wii KOR
1818
//"DZDE01", // Wii USA Kiosk Demo

‎config/GZ2E01/splits.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3027,7 +3027,7 @@ dolphin/os/OSThread.c:
30273027
.data start:0x803D0838 end:0x803D1048
30283028
.bss start:0x8044BB78 end:0x8044C570
30293029
.sdata start:0x804509B8 end:0x804509C0
3030-
.sbss start:0x804516C0 end:0x804516D8
3030+
.sbss start:0x804516C0 end:0x804516D0
30313031

30323032
dolphin/os/OSTime.c:
30333033
.text start:0x803426FC end:0x80342B78
@@ -3036,6 +3036,10 @@ dolphin/os/OSTime.c:
30363036
dolphin/os/__ppc_eabi_init.cpp:
30373037
.text start:0x80342B78 end:0x80342C0C
30383038

3039+
dolphin/os/__start.c:
3040+
.init start:0x80003100 end:0x80003458
3041+
.sbss start:0x804516D0 end:0x804516D8
3042+
30393043
dolphin/exi/EXIBios.c:
30403044
.text start:0x80342C0C end:0x803445E8
30413045
.data start:0x803D10A8 end:0x803D11B8
@@ -3603,9 +3607,6 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c:
36033607
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c:
36043608
.text start:0x8036F548 end:0x8036F580
36053609

3606-
dolphin/os/__start.c:
3607-
.init start:0x80003100 end:0x80003458
3608-
36093610
PowerPC_EABI_Support/Runtime/Src/__mem.c:
36103611
.init start:0x80003458 end:0x80003590
36113612

‎config/GZ2E01/symbols.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22311,7 +22311,7 @@ HoldDown = .sbss:0x804516B8; // type:object size:0x8 scope:local align:8 data:4b
2231122311
RunQueueBits = .sbss:0x804516C0; // type:object size:0x4 scope:local align:4 data:4byte
2231222312
RunQueueHint = .sbss:0x804516C4; // type:object size:0x4 scope:local align:4 data:4byte
2231322313
Reschedule = .sbss:0x804516C8; // type:object size:0x4 scope:local align:4 data:4byte
22314-
Debug_BBA = .sbss:0x804516D0; // type:object size:0x1 scope:global align:8 data:byte
22314+
Debug_BBA = .sbss:0x804516D0; // type:object size:0x1 scope:local data:byte
2231522315
IDSerialPort1 = .sbss:0x804516D8; // type:object size:0x4 scope:local align:4 data:4byte
2231622316
Chan = .sbss:0x804516E0; // type:object size:0x4 scope:local align:4 data:4byte
2231722317
Dev = .sbss:0x804516E4; // type:object size:0x4 scope:local align:4 data:4byte

‎config/GZ2J01/splits.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2955,7 +2955,7 @@ dolphin/os/OSThread.c:
29552955
.data start:0x803CA978 end:0x803CB188
29562956
.bss start:0x80445CB8 end:0x804466B0
29572957
.sdata start:0x8044AAF8 end:0x8044AB00
2958-
.sbss start:0x8044B800 end:0x8044B818
2958+
.sbss start:0x8044B800 end:0x8044B810
29592959

29602960
dolphin/os/OSTime.c:
29612961
.text start:0x80344B98 end:0x80345014
@@ -2964,6 +2964,10 @@ dolphin/os/OSTime.c:
29642964
dolphin/os/__ppc_eabi_init.cpp:
29652965
.text start:0x80345014 end:0x803450A8
29662966

2967+
dolphin/os/__start.c:
2968+
.init start:0x80003100 end:0x80003458
2969+
.sbss start:0x8044B810 end:0x8044B818
2970+
29672971
dolphin/exi/EXIBios.c:
29682972
.text start:0x803450A8 end:0x80346A84
29692973
.data start:0x803CB1E8 end:0x803CB2F8
@@ -3531,9 +3535,6 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c:
35313535
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c:
35323536
.text start:0x803719E4 end:0x80371A1C
35333537

3534-
dolphin/os/__start.c:
3535-
.init start:0x80003100 end:0x80003458
3536-
35373538
PowerPC_EABI_Support/Runtime/Src/__mem.c:
35383539
.init start:0x80003458 end:0x80003590
35393540

‎config/GZ2J01/symbols.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22340,7 +22340,7 @@ HoldDown = .sbss:0x8044B7F8; // type:object size:0x8 scope:local align:4 data:4b
2234022340
RunQueueBits = .sbss:0x8044B800; // type:object size:0x4 scope:local align:4 data:4byte
2234122341
RunQueueHint = .sbss:0x8044B804; // type:object size:0x4 scope:local align:4 data:4byte
2234222342
Reschedule = .sbss:0x8044B808; // type:object size:0x4 scope:local align:4 data:4byte
22343-
Debug_BBA = .sbss:0x8044B810; // type:object size:0x1 scope:global align:8 data:byte
22343+
Debug_BBA = .sbss:0x8044B810; // type:object size:0x1 scope:local data:byte
2234422344
IDSerialPort1 = .sbss:0x8044B818; // type:object size:0x4 scope:local align:4 data:4byte
2234522345
Chan = .sbss:0x8044B820; // type:object size:0x4 scope:local align:4 data:4byte
2234622346
Dev = .sbss:0x8044B824; // type:object size:0x4 scope:local align:4 data:4byte

‎config/GZ2P01/splits.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2955,7 +2955,7 @@ dolphin/os/OSThread.c:
29552955
.data start:0x803D27D8 end:0x803D2FE8
29562956
.bss start:0x8044DB38 end:0x8044E530
29572957
.sdata start:0x80452978 end:0x80452980
2958-
.sbss start:0x80453688 end:0x804536A0
2958+
.sbss start:0x80453688 end:0x80453698
29592959

29602960
dolphin/os/OSTime.c:
29612961
.text start:0x80343568 end:0x803439E4
@@ -2964,6 +2964,10 @@ dolphin/os/OSTime.c:
29642964
dolphin/os/__ppc_eabi_init.cpp:
29652965
.text start:0x803439E4 end:0x80343A78
29662966

2967+
dolphin/os/__start.c:
2968+
.init start:0x80003100 end:0x80003458
2969+
.sbss start:0x80453698 end:0x804536A0
2970+
29672971
dolphin/exi/EXIBios.c:
29682972
.text start:0x80343A78 end:0x80345454
29692973
.data start:0x803D3048 end:0x803D3158
@@ -3531,9 +3535,6 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c:
35313535
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c:
35323536
.text start:0x80370378 end:0x803703B0
35333537

3534-
dolphin/os/__start.c:
3535-
.init start:0x80003100 end:0x80003458
3536-
35373538
PowerPC_EABI_Support/Runtime/Src/__mem.c:
35383539
.init start:0x80003458 end:0x80003590
35393540

‎config/GZ2P01/symbols.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22353,7 +22353,7 @@ HoldDown = .sbss:0x80453680; // type:object size:0x8 scope:local align:4 data:4b
2235322353
RunQueueBits = .sbss:0x80453688; // type:object size:0x4 scope:local align:4 data:4byte
2235422354
RunQueueHint = .sbss:0x8045368C; // type:object size:0x4 scope:local align:4 data:4byte
2235522355
Reschedule = .sbss:0x80453690; // type:object size:0x4 scope:local align:4 data:4byte
22356-
Debug_BBA = .sbss:0x80453698; // type:object size:0x1 scope:global align:8 data:byte
22356+
Debug_BBA = .sbss:0x80453698; // type:object size:0x1 scope:local data:byte
2235722357
IDSerialPort1 = .sbss:0x804536A0; // type:object size:0x4 scope:local align:4 data:4byte
2235822358
Chan = .sbss:0x804536A8; // type:object size:0x4 scope:local align:4 data:4byte
2235922359
Dev = .sbss:0x804536AC; // type:object size:0x4 scope:local align:4 data:4byte

‎config/RZDE01_00/config.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ force_active: [
1313
_MetroTRK_Has_Framing,
1414
]
1515

16+
block_relocations:
17+
- source: .text:0x80344978
18+
- source: .text:0x803449f0
19+
1620
modules:
1721
- object: files/RELS.arc:rels/mmem/f_pc_profile_lst.rel
1822
hash: 40511841f108b688f4885b19bf8ecf07781aab67

‎config/RZDE01_00/splits.txt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3209,7 +3209,11 @@ revolution/os/OSStateTM.c:
32093209
.text start:0x8034FB88 end:0x8035027C
32103210
.data start:0x8043D210 end:0x8043D2D8
32113211
.bss start:0x804EBB60 end:0x804EBC20
3212-
.sbss start:0x8053B4E0 end:0x8053B508
3212+
.sbss start:0x8053B4E0 end:0x8053B500
3213+
3214+
revolution/os/__start.c:
3215+
.init start:0x80004000 end:0x800042E0
3216+
.sbss start:0x8053B500 end:0x8053B508
32133217

32143218
revolution/os/OSPlayRecord.c:
32153219
.text start:0x8035027C end:0x80350954
@@ -3223,6 +3227,7 @@ revolution/os/OSStateFlags.c:
32233227
.bss start:0x804EBE20 end:0x804EBE40
32243228

32253229
revolution/os/__ppc_eabi_init.cpp:
3230+
.init start:0x800042E0 end:0x80004338
32263231
.text start:0x80350B4C end:0x80350C00
32273232

32283233
revolution/exi/EXIBios.c:
@@ -3963,6 +3968,7 @@ revolution/gd/GDGeometry.c:
39633968
.data start:0x804492A8 end:0x80449310
39643969

39653970
PowerPC_EABI_Support/Runtime/Src/__mem.c:
3971+
.init start:0x80004338 end:0x8000446C
39663972
.text start:0x803BDB38 end:0x803BDB54
39673973

39683974
PowerPC_EABI_Support/Runtime/Src/__va_arg.c:
@@ -4305,6 +4311,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.
43054311
.text start:0x803CA918 end:0x803CA950
43064312

43074313
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c:
4314+
.init start:0x8000446C end:0x800044C0
43084315
.text start:0x803CA950 end:0x803CAA08
43094316

43104317
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c:
@@ -4325,7 +4332,11 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e
43254332
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c:
43264333
.text start:0x803CC7D0 end:0x803CC948
43274334

4335+
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s:
4336+
.init start:0x800044C0 end:0x800063F4
4337+
43284338
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c:
4339+
.init start:0x800063F4 end:0x80006420
43294340
.text start:0x803CC948 end:0x803CCC64
43304341
.data start:0x80449AE0 end:0x80449B20
43314342
.bss start:0x80536FE0 end:0x80536FE8

‎config/RZDE01_02/config.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ force_active: [
1313
_MetroTRK_Has_Framing,
1414
]
1515

16+
block_relocations:
17+
- source: .text:0x8032f348
18+
- source: .text:0x8032f3c0
19+
1620
modules:
1721
- object: files/RELS.arc:rels/mmem/f_pc_profile_lst.rel
1822
hash: a7f24646c20b174199613be4780a362c29ffec9a

0 commit comments

Comments
 (0)