diff --git a/asm/Runtime.PPCEABI.H/GCN_mem_alloc_8000917c.s b/asm/Runtime.PPCEABI.H/GCN_mem_alloc.s similarity index 79% rename from asm/Runtime.PPCEABI.H/GCN_mem_alloc_8000917c.s rename to asm/Runtime.PPCEABI.H/GCN_mem_alloc.s index b4782f05..4f66528e 100644 --- a/asm/Runtime.PPCEABI.H/GCN_mem_alloc_8000917c.s +++ b/asm/Runtime.PPCEABI.H/GCN_mem_alloc.s @@ -51,3 +51,37 @@ lbl_8000920C: /* 80009228 00005068 7C 08 03 A6 */ mtlr r0 /* 8000922C 0000506C 38 21 00 20 */ addi r1, r1, 0x20 /* 80009230 00005070 4E 80 00 20 */ blr +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@stringBase0_80406600" +"@stringBase0_80406600": + + .4byte 0x47434E5F + .4byte 0x4D656D5F + .4byte 0x416C6C6F + .4byte 0x632E6320 + .4byte 0x3A20496E + .4byte 0x69744465 + .4byte 0x6661756C + .4byte 0x74486561 + .4byte 0x702E204E + .4byte 0x6F204865 + .4byte 0x61702041 + .4byte 0x7661696C + .4byte 0x61626C65 + .4byte 0x0A004D65 + .4byte 0x74726F77 + .4byte 0x65726B73 + .4byte 0x20435720 + .4byte 0x72756E74 + .4byte 0x696D6520 + .4byte 0x6C696272 + .4byte 0x61727920 + .4byte 0x696E6974 + .4byte 0x69616C69 + .4byte 0x7A696E67 + .4byte 0x20646566 + .4byte 0x61756C74 + .4byte 0x20686561 + .4byte 0x700A0000 diff --git a/asm/Runtime.PPCEABI.H/GCN_mem_alloc_80406600.s b/asm/Runtime.PPCEABI.H/GCN_mem_alloc_80406600.s deleted file mode 100644 index 5df85cbf..00000000 --- a/asm/Runtime.PPCEABI.H/GCN_mem_alloc_80406600.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@stringBase0_80406600" -"@stringBase0_80406600": - - .4byte 0x47434E5F - .4byte 0x4D656D5F - .4byte 0x416C6C6F - .4byte 0x632E6320 - .4byte 0x3A20496E - .4byte 0x69744465 - .4byte 0x6661756C - .4byte 0x74486561 - .4byte 0x702E204E - .4byte 0x6F204865 - .4byte 0x61702041 - .4byte 0x7661696C - .4byte 0x61626C65 - .4byte 0x0A004D65 - .4byte 0x74726F77 - .4byte 0x65726B73 - .4byte 0x20435720 - .4byte 0x72756E74 - .4byte 0x696D6520 - .4byte 0x6C696272 - .4byte 0x61727920 - .4byte 0x696E6974 - .4byte 0x69616C69 - .4byte 0x7A696E67 - .4byte 0x20646566 - .4byte 0x61756C74 - .4byte 0x20686561 - .4byte 0x700A0000 diff --git a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80007a6c.s b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s similarity index 96% rename from asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80007a6c.s rename to asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s index a2b7e988..5bda42c4 100644 --- a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80007a6c.s +++ b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s @@ -1,5 +1,79 @@ .include "macros.inc" +.section extab_, "wa" # 0x80006740 - 0x800068E0 ; 0x000001A0 +.global "@283" +"@283": + + .4byte 0x10080000 + .4byte 0 + +.global "@367" +"@367": + + .4byte 0x10080000 + .4byte 0 + +.global "@557" +"@557": + + .4byte 0x280A0000 + .4byte 0 + +.global "@861_800067A0" +"@861_800067A0": + + .4byte 0x50080000 + .4byte 0x00000054 + .4byte 0x01250010 + .4byte 0 + .4byte 0x8E000000 + +.global "@952" +"@952": + + .4byte 0x28180000 + .4byte 0x00000020 + .4byte 0x00000018 + .4byte 0x00000044 + .4byte 0x004F0028 + .4byte 0 + .4byte 0x90000000 + .4byte 0 + .4byte 0x00000024 + .4byte 0x00000020 + .4byte 0x8D000020 + +.global "@1130" +"@1130": + + .4byte 0x28080000 + .4byte 0x00000274 + .4byte 0x000F0010 + .4byte 0 + .4byte 0x8E000000 +.include "macros.inc" + +.section extabindex_, "wa" # 0x800068E0 - 0x80006A00 ; 0x00000120 + .4byte ExPPC_FindExceptionRecord__FPcP15MWExceptionInfo + .4byte 0x000001B0 + .4byte "@283" + .4byte ExPPC_NextAction__FP14ActionIterator + .4byte 0x000001B0 + .4byte "@367" + .4byte ExPPC_PopStackFrame__FP12ThrowContextP15MWExceptionInfo + .4byte 0x00000554 + .4byte "@557" + .4byte ExPPC_UnwindStack__FP12ThrowContextP15MWExceptionInfoPv + .4byte 0x0000050C + .4byte "@861_800067A0" + .4byte __unexpected + .4byte 0x000001B8 + .4byte "@952" + .4byte ExPPC_ThrowHandler__FP12ThrowContext + .4byte 0x00000408 + .4byte "@1130" +.include "macros.inc" + .section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860 .global __register_fragment __register_fragment: @@ -1867,3 +1941,121 @@ what__Q23std13bad_exceptionCFv: /* 80009170 00004FB0 3C 60 80 42 */ lis r3, "@STRING@what__Q23std13bad_exceptionCFv"@ha /* 80009174 00004FB4 38 63 10 E4 */ addi r3, r3, "@STRING@what__Q23std13bad_exceptionCFv"@l /* 80009178 00004FB8 4E 80 00 20 */ blr +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@1152" +"@1152": + + .4byte 0x7374643A + .4byte 0x3A626164 + .4byte 0x5F657863 + .4byte 0x65707469 + .4byte 0x6F6E0000 + +.global "@stringBase0_804065AC" +"@stringBase0_804065AC": + + .4byte 0x21626164 + .4byte 0x5F657863 + .4byte 0x65707469 + .4byte 0x6F6E2121 + .4byte 0x00217374 + .4byte 0x643A3A65 + .4byte 0x78636570 + .4byte 0x74696F6E + .4byte 0x21217374 + .4byte 0x643A3A62 + .4byte 0x61645F65 + .4byte 0x78636570 + .4byte 0x74696F6E + .4byte 0x21210021 + .4byte 0x7374643A + .4byte 0x3A626164 + .4byte 0x5F657863 + .4byte 0x65707469 + .4byte 0x6F6E2121 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@366" +"@366": + + .4byte lbl_80007E90 + .4byte lbl_80007E90 + .4byte lbl_80007DE8 + .4byte lbl_80007DF4 + .4byte lbl_80007E00 + .4byte lbl_80007E0C + .4byte lbl_80007E18 + .4byte lbl_80007E18 + .4byte lbl_80007E24 + .4byte lbl_80007E30 + .4byte lbl_80007E3C + .4byte lbl_80007E48 + .4byte lbl_80007E54 + .4byte lbl_80007E6C + .4byte lbl_80007E90 + .4byte lbl_80007E78 + .4byte lbl_80007E60 + +.global "@860_80421084" +"@860_80421084": + + .4byte lbl_80008910 + .4byte lbl_800084C8 + .4byte lbl_800084DC + .4byte lbl_80008508 + .4byte lbl_8000856C + .4byte lbl_800085B8 + .4byte lbl_8000860C + .4byte lbl_80008660 + .4byte lbl_800086B4 + .4byte lbl_8000873C + .4byte lbl_800087B8 + .4byte lbl_80008800 + .4byte lbl_8000887C + .4byte lbl_800088A4 + .4byte lbl_80008910 + .4byte lbl_800088F0 + .4byte lbl_80008890 + +.global __vt__Q23std13bad_exception +__vt__Q23std13bad_exception: + + .4byte __RTTI__Q23std13bad_exception + .4byte 0 + .4byte __dt__Q23std13bad_exceptionFv + .4byte what__Q23std13bad_exceptionCFv + +.global "@1153" +"@1153": + + .4byte __RTTI__Q23std9exception + .4byte 0 + .4byte 0 + +.global "@STRING@what__Q23std13bad_exceptionCFv" +"@STRING@what__Q23std13bad_exceptionCFv": + + .4byte 0x6261645F + .4byte 0x65786365 + .4byte 0x7074696F + .4byte 0x6E000000 + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global fragmentinfo +fragmentinfo: + .skip 0x180 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global __RTTI__Q23std13bad_exception +__RTTI__Q23std13bad_exception: + + .4byte "@1152" + .4byte "@1153" diff --git a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80006788.s b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80006788.s deleted file mode 100644 index ae8a231b..00000000 --- a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80006788.s +++ /dev/null @@ -1,53 +0,0 @@ -.include "macros.inc" - -.section extab_, "wa" # 0x80006740 - 0x800068E0 ; 0x000001A0 -.global "@283" -"@283": - - .4byte 0x10080000 - .4byte 0 - -.global "@367" -"@367": - - .4byte 0x10080000 - .4byte 0 - -.global "@557" -"@557": - - .4byte 0x280A0000 - .4byte 0 - -.global "@861_800067A0" -"@861_800067A0": - - .4byte 0x50080000 - .4byte 0x00000054 - .4byte 0x01250010 - .4byte 0 - .4byte 0x8E000000 - -.global "@952" -"@952": - - .4byte 0x28180000 - .4byte 0x00000020 - .4byte 0x00000018 - .4byte 0x00000044 - .4byte 0x004F0028 - .4byte 0 - .4byte 0x90000000 - .4byte 0 - .4byte 0x00000024 - .4byte 0x00000020 - .4byte 0x8D000020 - -.global "@1130" -"@1130": - - .4byte 0x28080000 - .4byte 0x00000274 - .4byte 0x000F0010 - .4byte 0 - .4byte 0x8E000000 diff --git a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_8000691c.s b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_8000691c.s deleted file mode 100644 index 1efaa9c7..00000000 --- a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_8000691c.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macros.inc" - -.section extabindex_, "wa" # 0x800068E0 - 0x80006A00 ; 0x00000120 - .4byte ExPPC_FindExceptionRecord__FPcP15MWExceptionInfo - .4byte 0x000001B0 - .4byte "@283" - .4byte ExPPC_NextAction__FP14ActionIterator - .4byte 0x000001B0 - .4byte "@367" - .4byte ExPPC_PopStackFrame__FP12ThrowContextP15MWExceptionInfo - .4byte 0x00000554 - .4byte "@557" - .4byte ExPPC_UnwindStack__FP12ThrowContextP15MWExceptionInfoPv - .4byte 0x0000050C - .4byte "@861_800067A0" - .4byte __unexpected - .4byte 0x000001B8 - .4byte "@952" - .4byte ExPPC_ThrowHandler__FP12ThrowContext - .4byte 0x00000408 - .4byte "@1130" diff --git a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80406598.s b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80406598.s deleted file mode 100644 index 5c879ac8..00000000 --- a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80406598.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@1152" -"@1152": - - .4byte 0x7374643A - .4byte 0x3A626164 - .4byte 0x5F657863 - .4byte 0x65707469 - .4byte 0x6F6E0000 - -.global "@stringBase0_804065AC" -"@stringBase0_804065AC": - - .4byte 0x21626164 - .4byte 0x5F657863 - .4byte 0x65707469 - .4byte 0x6F6E2121 - .4byte 0x00217374 - .4byte 0x643A3A65 - .4byte 0x78636570 - .4byte 0x74696F6E - .4byte 0x21217374 - .4byte 0x643A3A62 - .4byte 0x61645F65 - .4byte 0x78636570 - .4byte 0x74696F6E - .4byte 0x21210021 - .4byte 0x7374643A - .4byte 0x3A626164 - .4byte 0x5F657863 - .4byte 0x65707469 - .4byte 0x6F6E2121 - .4byte 0 - .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80421040.s b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80421040.s deleted file mode 100644 index eb87e871..00000000 --- a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80421040.s +++ /dev/null @@ -1,68 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@366" -"@366": - - .4byte lbl_80007E90 - .4byte lbl_80007E90 - .4byte lbl_80007DE8 - .4byte lbl_80007DF4 - .4byte lbl_80007E00 - .4byte lbl_80007E0C - .4byte lbl_80007E18 - .4byte lbl_80007E18 - .4byte lbl_80007E24 - .4byte lbl_80007E30 - .4byte lbl_80007E3C - .4byte lbl_80007E48 - .4byte lbl_80007E54 - .4byte lbl_80007E6C - .4byte lbl_80007E90 - .4byte lbl_80007E78 - .4byte lbl_80007E60 - -.global "@860_80421084" -"@860_80421084": - - .4byte lbl_80008910 - .4byte lbl_800084C8 - .4byte lbl_800084DC - .4byte lbl_80008508 - .4byte lbl_8000856C - .4byte lbl_800085B8 - .4byte lbl_8000860C - .4byte lbl_80008660 - .4byte lbl_800086B4 - .4byte lbl_8000873C - .4byte lbl_800087B8 - .4byte lbl_80008800 - .4byte lbl_8000887C - .4byte lbl_800088A4 - .4byte lbl_80008910 - .4byte lbl_800088F0 - .4byte lbl_80008890 - -.global __vt__Q23std13bad_exception -__vt__Q23std13bad_exception: - - .4byte __RTTI__Q23std13bad_exception - .4byte 0 - .4byte __dt__Q23std13bad_exceptionFv - .4byte what__Q23std13bad_exceptionCFv - -.global "@1153" -"@1153": - - .4byte __RTTI__Q23std9exception - .4byte 0 - .4byte 0 - -.global "@STRING@what__Q23std13bad_exceptionCFv" -"@STRING@what__Q23std13bad_exceptionCFv": - - .4byte 0x6261645F - .4byte 0x65786365 - .4byte 0x7074696F - .4byte 0x6E000000 - .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80496700.s b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80496700.s deleted file mode 100644 index 912c1ec2..00000000 --- a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80496700.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global fragmentinfo -fragmentinfo: - .skip 0x180 diff --git a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80556438.s b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80556438.s deleted file mode 100644 index 0dd69726..00000000 --- a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80556438.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global __RTTI__Q23std13bad_exception -__RTTI__Q23std13bad_exception: - - .4byte "@1152" - .4byte "@1153" diff --git a/asm/Runtime.PPCEABI.H/NMWException_80006c10.s b/asm/Runtime.PPCEABI.H/NMWException.s similarity index 94% rename from asm/Runtime.PPCEABI.H/NMWException_80006c10.s rename to asm/Runtime.PPCEABI.H/NMWException.s index a7ec61d7..d75ee4bd 100644 --- a/asm/Runtime.PPCEABI.H/NMWException_80006c10.s +++ b/asm/Runtime.PPCEABI.H/NMWException.s @@ -1,5 +1,54 @@ .include "macros.inc" +.section extab_, "wa" # 0x80006740 - 0x800068E0 ; 0x000001A0 +.global "@340" +"@340": + + .4byte 0x28080000 + .4byte 0x00000070 + .4byte 0x00000010 + .4byte 0 + .4byte 0x82000008 + .4byte __dt__26__partial_array_destructorFv + +.global "@351" +"@351": + + .4byte 0x18080000 + .4byte 0 + +.global "@383" +"@383": + + .4byte 0x20080000 + .4byte 0x0000005C + .4byte 0x00000010 + .4byte 0 + .4byte 0x82000008 + .4byte __dt__26__partial_array_destructorFv + +.global "@401" +"@401": + + .4byte 0x20080000 + .4byte 0 +.include "macros.inc" + +.section extabindex_, "wa" # 0x800068E0 - 0x80006A00 ; 0x00000120 + .4byte __construct_new_array + .4byte 0x00000104 + .4byte "@340" + .4byte __dt__26__partial_array_destructorFv + .4byte 0x000000BC + .4byte "@351" + .4byte __construct_array + .4byte 0x000000F8 + .4byte "@383" + .4byte __destroy_arr + .4byte 0x00000078 + .4byte "@401" +.include "macros.inc" + .section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860 .global dthandler__3stdFv dthandler__3stdFv: @@ -457,3 +506,15 @@ lbl_8000716C: /* 80007188 00002FC8 7C 08 03 A6 */ mtlr r0 /* 8000718C 00002FCC 38 21 00 20 */ addi r1, r1, 0x20 /* 80007190 00002FD0 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global thandler__3std +thandler__3std: + + .4byte dthandler__3stdFv + +.global uhandler__3std +uhandler__3std: + + .4byte duhandler__3stdFv diff --git a/asm/Runtime.PPCEABI.H/NMWException_80006748.s b/asm/Runtime.PPCEABI.H/NMWException_80006748.s deleted file mode 100644 index d08f505c..00000000 --- a/asm/Runtime.PPCEABI.H/NMWException_80006748.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section extab_, "wa" # 0x80006740 - 0x800068E0 ; 0x000001A0 -.global "@340" -"@340": - - .4byte 0x28080000 - .4byte 0x00000070 - .4byte 0x00000010 - .4byte 0 - .4byte 0x82000008 - .4byte __dt__26__partial_array_destructorFv - -.global "@351" -"@351": - - .4byte 0x18080000 - .4byte 0 - -.global "@383" -"@383": - - .4byte 0x20080000 - .4byte 0x0000005C - .4byte 0x00000010 - .4byte 0 - .4byte 0x82000008 - .4byte __dt__26__partial_array_destructorFv - -.global "@401" -"@401": - - .4byte 0x20080000 - .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/NMWException_800068ec.s b/asm/Runtime.PPCEABI.H/NMWException_800068ec.s deleted file mode 100644 index 37cdcdb4..00000000 --- a/asm/Runtime.PPCEABI.H/NMWException_800068ec.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macros.inc" - -.section extabindex_, "wa" # 0x800068E0 - 0x80006A00 ; 0x00000120 - .4byte __construct_new_array - .4byte 0x00000104 - .4byte "@340" - .4byte __dt__26__partial_array_destructorFv - .4byte 0x000000BC - .4byte "@351" - .4byte __construct_array - .4byte 0x000000F8 - .4byte "@383" - .4byte __destroy_arr - .4byte 0x00000078 - .4byte "@401" diff --git a/asm/Runtime.PPCEABI.H/NMWException_80556428.s b/asm/Runtime.PPCEABI.H/NMWException_80556428.s deleted file mode 100644 index 1491e004..00000000 --- a/asm/Runtime.PPCEABI.H/NMWException_80556428.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global thandler__3std -thandler__3std: - - .4byte dthandler__3stdFv - -.global uhandler__3std -uhandler__3std: - - .4byte duhandler__3stdFv diff --git a/asm/Runtime.PPCEABI.H/New_80006bd0.s b/asm/Runtime.PPCEABI.H/New.s similarity index 59% rename from asm/Runtime.PPCEABI.H/New_80006bd0.s rename to asm/Runtime.PPCEABI.H/New.s index 720d570b..614ab672 100644 --- a/asm/Runtime.PPCEABI.H/New_80006bd0.s +++ b/asm/Runtime.PPCEABI.H/New.s @@ -1,5 +1,22 @@ .include "macros.inc" +.section extab_, "wa" # 0x80006740 - 0x800068E0 ; 0x000001A0 +.global "@190" +"@190": + + .4byte 0x08080000 + .4byte 0 +.include "macros.inc" + +.section extabindex_, "wa" # 0x800068E0 - 0x80006A00 ; 0x00000120 +.global "@191" +"@191": + + .4byte __dt__Q23std9exceptionFv + .4byte 0x00000040 + .4byte "@190" +.include "macros.inc" + .section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860 .global __dt__Q23std9exceptionFv __dt__Q23std9exceptionFv: @@ -21,3 +38,21 @@ lbl_80006BF8: /* 80006C04 00002A44 7C 08 03 A6 */ mtlr r0 /* 80006C08 00002A48 38 21 00 10 */ addi r1, r1, 0x10 /* 80006C0C 00002A4C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@278" +"@278": + + .4byte 0x7374643A + .4byte 0x3A657863 + .4byte 0x65707469 + .4byte 0x6F6E0000 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global __RTTI__Q23std9exception +__RTTI__Q23std9exception: + + .4byte "@278" + .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/New_80006740.s b/asm/Runtime.PPCEABI.H/New_80006740.s deleted file mode 100644 index b5ce9c14..00000000 --- a/asm/Runtime.PPCEABI.H/New_80006740.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section extab_, "wa" # 0x80006740 - 0x800068E0 ; 0x000001A0 -.global "@190" -"@190": - - .4byte 0x08080000 - .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/New_800068e0.s b/asm/Runtime.PPCEABI.H/New_800068e0.s deleted file mode 100644 index 385834db..00000000 --- a/asm/Runtime.PPCEABI.H/New_800068e0.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macros.inc" - -.section extabindex_, "wa" # 0x800068E0 - 0x80006A00 ; 0x00000120 -.global "@191" -"@191": - - .4byte __dt__Q23std9exceptionFv - .4byte 0x00000040 - .4byte "@190" diff --git a/asm/Runtime.PPCEABI.H/New_80406560.s b/asm/Runtime.PPCEABI.H/New_80406560.s deleted file mode 100644 index 0067ad2f..00000000 --- a/asm/Runtime.PPCEABI.H/New_80406560.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@278" -"@278": - - .4byte 0x7374643A - .4byte 0x3A657863 - .4byte 0x65707469 - .4byte 0x6F6E0000 diff --git a/asm/Runtime.PPCEABI.H/New_80556420.s b/asm/Runtime.PPCEABI.H/New_80556420.s deleted file mode 100644 index 374d1a12..00000000 --- a/asm/Runtime.PPCEABI.H/New_80556420.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global __RTTI__Q23std9exception -__RTTI__Q23std9exception: - - .4byte "@278" - .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_800079fc.s b/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s similarity index 82% rename from asm/Runtime.PPCEABI.H/__init_cpp_exceptions_800079fc.s rename to asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s index 1aa69102..1691da7c 100644 --- a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_800079fc.s +++ b/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s @@ -38,3 +38,22 @@ lbl_80007A5C: /* 80007A60 000038A0 7C 08 03 A6 */ mtlr r0 /* 80007A64 000038A4 38 21 00 10 */ addi r1, r1, 0x10 /* 80007A68 000038A8 4E 80 00 20 */ blr +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 +.global _ctors +_ctors: + + .4byte lbl_800079FC +.include "macros.inc" + +.section .dtors, "wa" # 0x80406540 - 0x80406560 ; 0x00000020 + .4byte lbl_80007A38 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global lbl_80556430 +lbl_80556430: + + .4byte 0xFFFFFFFE + .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_80406260.s b/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_80406260.s deleted file mode 100644 index 2be8749f..00000000 --- a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_80406260.s +++ /dev/null @@ -1,7 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 -.global _ctors -_ctors: - - .4byte lbl_800079FC diff --git a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_80406540.s b/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_80406540.s deleted file mode 100644 index 6868a052..00000000 --- a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_80406540.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .dtors, "wa" # 0x80406540 - 0x80406560 ; 0x00000020 - .4byte lbl_80007A38 diff --git a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_80556430.s b/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_80556430.s deleted file mode 100644 index e8c70906..00000000 --- a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_80556430.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global lbl_80556430 -lbl_80556430: - - .4byte 0xFFFFFFFE - .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/__mem_80004000.s b/asm/Runtime.PPCEABI.H/__mem.s similarity index 96% rename from asm/Runtime.PPCEABI.H/__mem_80004000.s rename to asm/Runtime.PPCEABI.H/__mem.s index 0e3ad5be..17b53085 100644 --- a/asm/Runtime.PPCEABI.H/__mem_80004000.s +++ b/asm/Runtime.PPCEABI.H/__mem.s @@ -294,3 +294,17 @@ memset: /* 80004374 00000474 7C 08 03 A6 */ mtlr r0 /* 80004378 00000478 38 21 00 10 */ addi r1, r1, 0x10 /* 8000437C 0000047C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860 +.global strlen +strlen: +/* 80006A8C 000028CC 38 83 FF FF */ addi r4, r3, -0x1 +/* 80006A90 000028D0 38 60 FF FF */ li r3, -0x1 +.global lbl_80006A94 +lbl_80006A94: +/* 80006A94 000028D4 8C 04 00 01 */ lbzu r0, 0x1(r4) +/* 80006A98 000028D8 38 63 00 01 */ addi r3, r3, 0x1 +/* 80006A9C 000028DC 2C 00 00 00 */ cmpwi r0, 0x0 +/* 80006AA0 000028E0 40 82 FF F4 */ bne lbl_80006A94 +/* 80006AA4 000028E4 4E 80 00 20 */ blr diff --git a/asm/Runtime.PPCEABI.H/__mem_80006a8c.s b/asm/Runtime.PPCEABI.H/__mem_80006a8c.s deleted file mode 100644 index 4fc5ef59..00000000 --- a/asm/Runtime.PPCEABI.H/__mem_80006a8c.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860 -.global strlen -strlen: -/* 80006A8C 000028CC 38 83 FF FF */ addi r4, r3, -0x1 -/* 80006A90 000028D0 38 60 FF FF */ li r3, -0x1 -.global lbl_80006A94 -lbl_80006A94: -/* 80006A94 000028D4 8C 04 00 01 */ lbzu r0, 0x1(r4) -/* 80006A98 000028D8 38 63 00 01 */ addi r3, r3, 0x1 -/* 80006A9C 000028DC 2C 00 00 00 */ cmpwi r0, 0x0 -/* 80006AA0 000028E0 40 82 FF F4 */ bne lbl_80006A94 -/* 80006AA4 000028E4 4E 80 00 20 */ blr diff --git a/asm/Runtime.PPCEABI.H/__va_arg_80006aa8.s b/asm/Runtime.PPCEABI.H/__va_arg.s similarity index 100% rename from asm/Runtime.PPCEABI.H/__va_arg_80006aa8.s rename to asm/Runtime.PPCEABI.H/__va_arg.s diff --git a/asm/Runtime.PPCEABI.H/global_destructor_chain_80006b70.s b/asm/Runtime.PPCEABI.H/global_destructor_chain.s similarity index 91% rename from asm/Runtime.PPCEABI.H/global_destructor_chain_80006b70.s rename to asm/Runtime.PPCEABI.H/global_destructor_chain.s index 4924459a..ffe0138c 100644 --- a/asm/Runtime.PPCEABI.H/global_destructor_chain_80006b70.s +++ b/asm/Runtime.PPCEABI.H/global_destructor_chain.s @@ -36,3 +36,9 @@ lbl_80006BB4: /* 80006BC4 00002A04 7C 08 03 A6 */ mtlr r0 /* 80006BC8 00002A08 38 21 00 10 */ addi r1, r1, 0x10 /* 80006BCC 00002A0C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global lbl_8055C6E0 +lbl_8055C6E0: + .skip 0x8 diff --git a/asm/Runtime.PPCEABI.H/global_destructor_chain_8055c6e0.s b/asm/Runtime.PPCEABI.H/global_destructor_chain_8055c6e0.s deleted file mode 100644 index 27594afc..00000000 --- a/asm/Runtime.PPCEABI.H/global_destructor_chain_8055c6e0.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global lbl_8055C6E0 -lbl_8055C6E0: - .skip 0x8 diff --git a/asm/Runtime.PPCEABI.H/ptmf_80007194.s b/asm/Runtime.PPCEABI.H/ptmf.s similarity index 92% rename from asm/Runtime.PPCEABI.H/ptmf_80007194.s rename to asm/Runtime.PPCEABI.H/ptmf.s index 0ab9a94c..13747882 100644 --- a/asm/Runtime.PPCEABI.H/ptmf_80007194.s +++ b/asm/Runtime.PPCEABI.H/ptmf.s @@ -43,3 +43,13 @@ __ptmf_scall4: lbl_8000720C: /* 8000720C 0000304C 7D 89 03 A6 */ mtctr r12 /* 80007210 00003050 4E 80 04 20 */ bctr +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global __ptmf_null +__ptmf_null: + + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/ptmf_80406570.s b/asm/Runtime.PPCEABI.H/ptmf_80406570.s deleted file mode 100644 index 3469631c..00000000 --- a/asm/Runtime.PPCEABI.H/ptmf_80406570.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global __ptmf_null -__ptmf_null: - - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/runtime_80007214.s b/asm/Runtime.PPCEABI.H/runtime.s similarity index 99% rename from asm/Runtime.PPCEABI.H/runtime_80007214.s rename to asm/Runtime.PPCEABI.H/runtime.s index d0d31ea5..99fc3ff0 100644 --- a/asm/Runtime.PPCEABI.H/runtime_80007214.s +++ b/asm/Runtime.PPCEABI.H/runtime.s @@ -729,3 +729,15 @@ lbl_800079D4: lbl_800079F4: /* 800079F4 00003834 38 21 00 10 */ addi r1, r1, 0x10 /* 800079F8 00003838 4E 80 00 20 */ blr +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global __constants +__constants: + + .4byte 0 + .4byte 0 + .4byte 0x41F00000 + .4byte 0 + .4byte 0x41E00000 + .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/runtime_80406580.s b/asm/Runtime.PPCEABI.H/runtime_80406580.s deleted file mode 100644 index fecabf8d..00000000 --- a/asm/Runtime.PPCEABI.H/runtime_80406580.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global __constants -__constants: - - .4byte 0 - .4byte 0 - .4byte 0x41F00000 - .4byte 0 - .4byte 0x41E00000 - .4byte 0 diff --git a/asm/snd_adpcm_80006a00.s b/asm/snd_adpcm.s similarity index 100% rename from asm/snd_adpcm_80006a00.s rename to asm/snd_adpcm.s diff --git a/obj_files.mk b/obj_files.mk index 86e4f096..33bf12e7 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -1,33 +1,28 @@ -O_FILES := $(BUILD_DIR)/asm/Runtime.PPCEABI.H/__mem_80004000.o \ +O_FILES := \ +$(BUILD_DIR)/asm/snd_adpcm.o \ +$(BUILD_DIR)/asm/Runtime.PPCEABI.H/__mem.o \ +$(BUILD_DIR)/asm/Runtime.PPCEABI.H/__va_arg.o \ +$(BUILD_DIR)/asm/Runtime.PPCEABI.H/global_destructor_chain.o \ +$(BUILD_DIR)/asm/Runtime.PPCEABI.H/New.o \ +$(BUILD_DIR)/asm/Runtime.PPCEABI.H/NMWException.o \ +$(BUILD_DIR)/asm/Runtime.PPCEABI.H/ptmf.o \ +$(BUILD_DIR)/asm/Runtime.PPCEABI.H/runtime.o \ +$(BUILD_DIR)/src/Runtime.PPCEABI.H/__init_cpp_exceptions.o \ +$(BUILD_DIR)/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.o \ +$(BUILD_DIR)/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.o \ +$(BUILD_DIR)/asm/Runtime.PPCEABI.H/GCN_mem_alloc.o \ +\ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/__exception_80004380.o \ $(BUILD_DIR)/asm/os/__start_800062c0.o \ $(BUILD_DIR)/asm/os/__ppc_eabi_init_80006620.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/New_80006740.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/NMWException_80006748.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80006788.o \ $(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/ios_800067f4.o \ $(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/locale_80006804.o \ $(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/msl_thread_800068bc.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/New_800068e0.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/NMWException_800068ec.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_8000691c.o \ $(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/ios_80006964.o \ $(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/locale_8000697c.o \ $(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/msl_thread_800069ac.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/snd_adpcm_80006a00.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/__mem_80006a8c.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/__va_arg_80006aa8.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/global_destructor_chain_80006b70.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/New_80006bd0.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/NMWException_80006c10.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/ptmf_80007194.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/runtime_80007214.o \ -$(BUILD_DIR)/src/Runtime.PPCEABI.H/__init_cpp_exceptions.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_800079fc.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80007a6c.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/GCN_mem_alloc_8000917c.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/alloc_80009234.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/ansi_files_80009748.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/ansi_fp_80009858.o \ @@ -2881,7 +2876,6 @@ $(BUILD_DIR)/asm/src/SIntAABBox_80405b68.o \ $(BUILD_DIR)/asm/src/StateChanger_80405cd0.o \ $(BUILD_DIR)/asm/src/Thread_80405f14.o \ $(BUILD_DIR)/asm/src/UIntAABBox_8040603c.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_80406260.o \ $(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/locale_80406264.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_80406268.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_particlemanager_8040626c.o \ @@ -2988,13 +2982,7 @@ $(BUILD_DIR)/asm/src/MintCommander_80406520.o \ $(BUILD_DIR)/asm/src/MintSERequestor_80406524.o \ $(BUILD_DIR)/asm/src/Alarm_80406528.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_8040652c.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_80406540.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/New_80406560.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/ptmf_80406570.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/runtime_80406580.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80406598.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/GCN_mem_alloc_80406600.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/alloc_80406670.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/ansi_fp_80406688.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/ctype_80406768.o \ @@ -3245,7 +3233,6 @@ $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \ $(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \ $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80421040.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/ansi_files_804210f8.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/ansi_fp_80421238.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/locale_80421360.o \ @@ -5103,7 +5090,6 @@ $(BUILD_DIR)/asm/src/WaveHandle_804966b8.o \ $(BUILD_DIR)/asm/src/StorageUtil_804966d0.o \ $(BUILD_DIR)/asm/src/Alarm_804966e0.o \ $(BUILD_DIR)/asm/src/StateChanger_804966f0.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80496700.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/alloc_80496880.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/ansi_files_804968b8.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/signal_80496bb8.o \ @@ -5271,10 +5257,6 @@ $(BUILD_DIR)/asm/src/ScoreCoin_80554888.o \ $(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \ $(BUILD_DIR)/asm/src/Table_80556398.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/New_80556420.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/NMWException_80556428.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/__init_cpp_exceptions_80556430.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC_80556438.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/printf_80556440.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/float_80556448.o \ $(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/ios_80556450.o \ @@ -5746,7 +5728,6 @@ $(BUILD_DIR)/asm/src/StepMain_8055c688.o \ $(BUILD_DIR)/asm/src/CinemaScopeModel_8055c6a0.o \ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \ $(BUILD_DIR)/asm/src/Wipe_8055c6c0.o \ -$(BUILD_DIR)/asm/Runtime.PPCEABI.H/global_destructor_chain_8055c6e0.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/alloc_8055c6e8.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/errno_8055c6f0.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/uart_console_io_gcn_8055c6f8.o \