From 3e08c424a3c4e96525ce6afdddc1f777d3ee4dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 17 Oct 2022 08:54:46 +0100 Subject: [PATCH] merge MSL_C++.PPCEABI.bare --- .../{ios_8001488c.s => ios.s} | 115 ++++++++ asm/MSL_C++.PPCEABI.bare.H/ios_800067f4.s | 14 - asm/MSL_C++.PPCEABI.bare.H/ios_80006964.s | 9 - asm/MSL_C++.PPCEABI.bare.H/ios_804075b8.s | 54 ---- asm/MSL_C++.PPCEABI.bare.H/ios_80421a28.s | 18 -- asm/MSL_C++.PPCEABI.bare.H/ios_80556450.s | 20 -- .../{locale_80014944.s => locale.s} | 276 ++++++++++++++++++ asm/MSL_C++.PPCEABI.bare.H/locale_80006804.s | 64 ---- asm/MSL_C++.PPCEABI.bare.H/locale_8000697c.s | 15 - asm/MSL_C++.PPCEABI.bare.H/locale_80406264.s | 4 - asm/MSL_C++.PPCEABI.bare.H/locale_80407658.s | 90 ------ asm/MSL_C++.PPCEABI.bare.H/locale_80421a48.s | 54 ---- asm/MSL_C++.PPCEABI.bare.H/locale_80556468.s | 31 -- asm/MSL_C++.PPCEABI.bare.H/locale_8055c720.s | 18 -- .../{msl_thread_80014f18.s => msl_thread.s} | 23 ++ .../msl_thread_800068bc.s | 14 - .../msl_thread_800069ac.s | 9 - obj_files.mk | 21 +- 18 files changed, 418 insertions(+), 431 deletions(-) rename asm/MSL_C++.PPCEABI.bare.H/{ios_8001488c.s => ios.s} (54%) delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/ios_800067f4.s delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/ios_80006964.s delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/ios_804075b8.s delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/ios_80421a28.s delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/ios_80556450.s rename asm/MSL_C++.PPCEABI.bare.H/{locale_80014944.s => locale.s} (80%) delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/locale_80006804.s delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/locale_8000697c.s delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/locale_80406264.s delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/locale_80407658.s delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/locale_80421a48.s delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/locale_80556468.s delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/locale_8055c720.s rename asm/MSL_C++.PPCEABI.bare.H/{msl_thread_80014f18.s => msl_thread.s} (89%) delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/msl_thread_800068bc.s delete mode 100644 asm/MSL_C++.PPCEABI.bare.H/msl_thread_800069ac.s diff --git a/asm/MSL_C++.PPCEABI.bare.H/ios_8001488c.s b/asm/MSL_C++.PPCEABI.bare.H/ios.s similarity index 54% rename from asm/MSL_C++.PPCEABI.bare.H/ios_8001488c.s rename to asm/MSL_C++.PPCEABI.bare.H/ios.s index 593a2d9e..48f362f1 100644 --- a/asm/MSL_C++.PPCEABI.bare.H/ios_8001488c.s +++ b/asm/MSL_C++.PPCEABI.bare.H/ios.s @@ -1,5 +1,28 @@ .include "macros.inc" +.section extab_, "wa" # 0x80006740 - 0x800068E0 ; 0x000001A0 +.global "@10911" +"@10911": + + .4byte 0x08080000 + .4byte 0 + +.global "@10953" +"@10953": + + .4byte 0x10080000 + .4byte 0 +.include "macros.inc" + +.section extabindex_, "wa" # 0x800068E0 - 0x80006A00 ; 0x00000120 + .4byte "get_deleter__Q43std3tr16detail57shared_ptr_deleter>CFRCQ23std9type_info" + .4byte 0x0000004C + .4byte "@10911" + .4byte "__dt__Q210Metrowerks48move_ptr>Fv" + .4byte 0x00000060 + .4byte "@10953" +.include "macros.inc" + .section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860 .global "get_deleter__Q43std3tr16detail57shared_ptr_deleter>CFRCQ23std9type_info" "get_deleter__Q43std3tr16detail57shared_ptr_deleter>CFRCQ23std9type_info": @@ -66,3 +89,95 @@ lbl_80014924: .global "__dt__Q43std3tr16detail57shared_ptr_deleter>Fv" "__dt__Q43std3tr16detail57shared_ptr_deleter>Fv": /* 80014940 00010780 4B FF 22 90 */ b __dt__Q23std9exceptionFv +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@9022" +"@9022": + + .4byte 0x7374643A + .4byte 0x3A747231 + .4byte 0x3A3A6465 + .4byte 0x7461696C + .4byte 0x3A3A7368 + .4byte 0x61726564 + .4byte 0x5F707472 + .4byte 0x5F64656C + .4byte 0x65746572 + .4byte 0x3C636861 + .4byte 0x722C2073 + .4byte 0x74643A3A + .4byte 0x64657461 + .4byte 0x696C3A3A + .4byte 0x64656661 + .4byte 0x756C745F + .4byte 0x64656C65 + .4byte 0x74653C63 + .4byte 0x6861725B + .4byte 0x5D3E3E00 + +.global "@9050" +"@9050": + + .4byte 0x7374643A + .4byte 0x3A747231 + .4byte 0x3A3A6465 + .4byte 0x7461696C + .4byte 0x3A3A7368 + .4byte 0x61726564 + .4byte 0x5F707472 + .4byte 0x5F64656C + .4byte 0x65746572 + .4byte 0x5F636F6D + .4byte 0x6D6F6E00 + +.global "@9165" +"@9165": + + .4byte 0x7374643A + .4byte 0x3A646574 + .4byte 0x61696C3A + .4byte 0x3A646566 + .4byte 0x61756C74 + .4byte 0x5F64656C + .4byte 0x6574653C + .4byte 0x63686172 + .4byte 0x5B5D3E00 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "__vt__Q43std3tr16detail57shared_ptr_deleter>" +"__vt__Q43std3tr16detail57shared_ptr_deleter>": + + .4byte "__RTTI__Q43std3tr16detail57shared_ptr_deleter>" + .4byte 0 + .4byte "__dt__Q43std3tr16detail57shared_ptr_deleter>Fv" + .4byte "get_deleter__Q43std3tr16detail57shared_ptr_deleter>CFRCQ23std9type_info" + .4byte "dispose__Q43std3tr16detail57shared_ptr_deleter>Fv" + +.global "@9023" +"@9023": + + .4byte __RTTI__Q43std3tr16detail25shared_ptr_deleter_common + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "__RTTI__Q43std3tr16detail57shared_ptr_deleter>" +"__RTTI__Q43std3tr16detail57shared_ptr_deleter>": + + .4byte "@9022" + .4byte "@9023" + +.global __RTTI__Q43std3tr16detail25shared_ptr_deleter_common +__RTTI__Q43std3tr16detail25shared_ptr_deleter_common: + + .4byte "@9050" + .4byte 0 + +.global "__RTTI__Q33std6detail20default_delete" +"__RTTI__Q33std6detail20default_delete": + + .4byte "@9165" + .4byte 0 diff --git a/asm/MSL_C++.PPCEABI.bare.H/ios_800067f4.s b/asm/MSL_C++.PPCEABI.bare.H/ios_800067f4.s deleted file mode 100644 index 838b0ed7..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/ios_800067f4.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section extab_, "wa" # 0x80006740 - 0x800068E0 ; 0x000001A0 -.global "@10911" -"@10911": - - .4byte 0x08080000 - .4byte 0 - -.global "@10953" -"@10953": - - .4byte 0x10080000 - .4byte 0 diff --git a/asm/MSL_C++.PPCEABI.bare.H/ios_80006964.s b/asm/MSL_C++.PPCEABI.bare.H/ios_80006964.s deleted file mode 100644 index 9f7ab3da..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/ios_80006964.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macros.inc" - -.section extabindex_, "wa" # 0x800068E0 - 0x80006A00 ; 0x00000120 - .4byte "get_deleter__Q43std3tr16detail57shared_ptr_deleter>CFRCQ23std9type_info" - .4byte 0x0000004C - .4byte "@10911" - .4byte "__dt__Q210Metrowerks48move_ptr>Fv" - .4byte 0x00000060 - .4byte "@10953" diff --git a/asm/MSL_C++.PPCEABI.bare.H/ios_804075b8.s b/asm/MSL_C++.PPCEABI.bare.H/ios_804075b8.s deleted file mode 100644 index 0a1f8af4..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/ios_804075b8.s +++ /dev/null @@ -1,54 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@9022" -"@9022": - - .4byte 0x7374643A - .4byte 0x3A747231 - .4byte 0x3A3A6465 - .4byte 0x7461696C - .4byte 0x3A3A7368 - .4byte 0x61726564 - .4byte 0x5F707472 - .4byte 0x5F64656C - .4byte 0x65746572 - .4byte 0x3C636861 - .4byte 0x722C2073 - .4byte 0x74643A3A - .4byte 0x64657461 - .4byte 0x696C3A3A - .4byte 0x64656661 - .4byte 0x756C745F - .4byte 0x64656C65 - .4byte 0x74653C63 - .4byte 0x6861725B - .4byte 0x5D3E3E00 - -.global "@9050" -"@9050": - - .4byte 0x7374643A - .4byte 0x3A747231 - .4byte 0x3A3A6465 - .4byte 0x7461696C - .4byte 0x3A3A7368 - .4byte 0x61726564 - .4byte 0x5F707472 - .4byte 0x5F64656C - .4byte 0x65746572 - .4byte 0x5F636F6D - .4byte 0x6D6F6E00 - -.global "@9165" -"@9165": - - .4byte 0x7374643A - .4byte 0x3A646574 - .4byte 0x61696C3A - .4byte 0x3A646566 - .4byte 0x61756C74 - .4byte 0x5F64656C - .4byte 0x6574653C - .4byte 0x63686172 - .4byte 0x5B5D3E00 diff --git a/asm/MSL_C++.PPCEABI.bare.H/ios_80421a28.s b/asm/MSL_C++.PPCEABI.bare.H/ios_80421a28.s deleted file mode 100644 index cff14101..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/ios_80421a28.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "__vt__Q43std3tr16detail57shared_ptr_deleter>" -"__vt__Q43std3tr16detail57shared_ptr_deleter>": - - .4byte "__RTTI__Q43std3tr16detail57shared_ptr_deleter>" - .4byte 0 - .4byte "__dt__Q43std3tr16detail57shared_ptr_deleter>Fv" - .4byte "get_deleter__Q43std3tr16detail57shared_ptr_deleter>CFRCQ23std9type_info" - .4byte "dispose__Q43std3tr16detail57shared_ptr_deleter>Fv" - -.global "@9023" -"@9023": - - .4byte __RTTI__Q43std3tr16detail25shared_ptr_deleter_common - .4byte 0 - .4byte 0 diff --git a/asm/MSL_C++.PPCEABI.bare.H/ios_80556450.s b/asm/MSL_C++.PPCEABI.bare.H/ios_80556450.s deleted file mode 100644 index eaa0f898..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/ios_80556450.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "__RTTI__Q43std3tr16detail57shared_ptr_deleter>" -"__RTTI__Q43std3tr16detail57shared_ptr_deleter>": - - .4byte "@9022" - .4byte "@9023" - -.global __RTTI__Q43std3tr16detail25shared_ptr_deleter_common -__RTTI__Q43std3tr16detail25shared_ptr_deleter_common: - - .4byte "@9050" - .4byte 0 - -.global "__RTTI__Q33std6detail20default_delete" -"__RTTI__Q33std6detail20default_delete": - - .4byte "@9165" - .4byte 0 diff --git a/asm/MSL_C++.PPCEABI.bare.H/locale_80014944.s b/asm/MSL_C++.PPCEABI.bare.H/locale.s similarity index 80% rename from asm/MSL_C++.PPCEABI.bare.H/locale_80014944.s rename to asm/MSL_C++.PPCEABI.bare.H/locale.s index 2ec54182..740ee016 100644 --- a/asm/MSL_C++.PPCEABI.bare.H/locale_80014944.s +++ b/asm/MSL_C++.PPCEABI.bare.H/locale.s @@ -1,5 +1,84 @@ .include "macros.inc" +.section extab_, "wa" # 0x80006740 - 0x800068E0 ; 0x000001A0 +.global "@25556" +"@25556": + + .4byte 0x18180000 + .4byte 0x00000048 + .4byte 0x00000018 + .4byte 0x00000054 + .4byte 0x00000024 + .4byte 0 + .4byte 0x8F000000 + .4byte 0x0000004C + .4byte 0x00000008 + .4byte 0x8D000008 + +.global "@26577" +"@26577": + + .4byte 0x10080000 + .4byte 0 + +.global "@27127" +"@27127": + + .4byte 0x68080000 + .4byte 0x00000094 + .4byte 0x00000038 + .4byte 0x000000B0 + .4byte 0x00000030 + .4byte 0x0000019C + .4byte 0x0000004C + .4byte 0x000001B8 + .4byte 0x00000044 + .4byte 0x0000035C + .4byte 0x00000058 + .4byte 0 + .4byte 0x02000028 + .4byte "__dt__Q210Metrowerks48move_ptr>Fv" + .4byte 0x8680001D + .4byte 0 + .4byte __dt__Q23std9exceptionFv + .4byte 0x02000020 + .4byte "__dt__Q210Metrowerks48move_ptr>Fv" + .4byte 0x8680001E + .4byte 0 + .4byte __dt__Q23std9exceptionFv + .4byte 0x82000030 + .4byte "__dt__Q23std59basic_string,Q23std12allocator>Fv" + +.global "@27197" +"@27197": + + .4byte 0x18180000 + .4byte 0x0000004C + .4byte 0x00000018 + .4byte 0x00000058 + .4byte 0x00000024 + .4byte 0 + .4byte 0x8F000000 + .4byte 0x00000050 + .4byte 0x00000008 + .4byte 0x8D000008 +.include "macros.inc" + +.section extabindex_, "wa" # 0x800068E0 - 0x80006A00 ; 0x00000120 + .4byte __dt__Q23std11logic_errorFv + .4byte 0x00000090 + .4byte "@25556" + .4byte "__dt__Q23std59basic_string,Q23std12allocator>Fv" + .4byte 0x00000064 + .4byte "@26577" + .4byte "do_replace__Q23std59basic_string,Q23std12allocator>FUlUlPCcPCcQ23std26random_access_iterator_tag" + .4byte 0x000003F0 + .4byte "@27127" + .4byte __dt__Q23std12length_errorFv + .4byte 0x00000094 + .4byte "@27197" +.include "macros.inc" + .section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860 .global what__Q23std11logic_errorCFv what__Q23std11logic_errorCFv: @@ -466,3 +545,200 @@ lbl_80014F00: /* 80014F0C 00010D4C 38 00 00 01 */ li r0, 0x1 /* 80014F10 00010D50 98 0D E3 03 */ stb r0, "@GUARD@id__Q23std14codecvt"@sda21(r13) /* 80014F14 00010D54 4E 80 00 20 */ blr +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1locale_cpp" +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@10379" +"@10379": + + .4byte 0x7374643A + .4byte 0x3A6F7574 + .4byte 0x5F6F665F + .4byte 0x72616E67 + .4byte 0x65000000 + +.global "@10381" +"@10381": + + .4byte 0x7374643A + .4byte 0x3A6C656E + .4byte 0x6774685F + .4byte 0x6572726F + .4byte 0x72000000 + +.global "@10387" +"@10387": + + .4byte 0x7374643A + .4byte 0x3A6C6F67 + .4byte 0x69635F65 + .4byte 0x72726F72 + .4byte 0 + +.global "@stringBase0_80407694" +"@stringBase0_80407694": + + .4byte 0x76656374 + .4byte 0x6F72206C + .4byte 0x656E6774 + .4byte 0x68206572 + .4byte 0x726F7200 + .4byte 0x21737464 + .4byte 0x3A3A6578 + .4byte 0x63657074 + .4byte 0x696F6E21 + .4byte 0x21737464 + .4byte 0x3A3A6C6F + .4byte 0x6769635F + .4byte 0x6572726F + .4byte 0x72212173 + .4byte 0x74643A3A + .4byte 0x6C656E67 + .4byte 0x74685F65 + .4byte 0x72726F72 + .4byte 0x21210062 + .4byte 0x61736963 + .4byte 0x5F737472 + .4byte 0x696E673A + .4byte 0x206F7574 + .4byte 0x5F6F665F + .4byte 0x72616E67 + .4byte 0x65002173 + .4byte 0x74643A3A + .4byte 0x65786365 + .4byte 0x7074696F + .4byte 0x6E212173 + .4byte 0x74643A3A + .4byte 0x6C6F6769 + .4byte 0x635F6572 + .4byte 0x726F7221 + .4byte 0x21737464 + .4byte 0x3A3A6F75 + .4byte 0x745F6F66 + .4byte 0x5F72616E + .4byte 0x67652121 + .4byte 0x0043002A + .4byte 0x00626173 + .4byte 0x69635F73 + .4byte 0x7472696E + .4byte 0x673A206C + .4byte 0x656E6774 + .4byte 0x685F6572 + .4byte 0x726F7200 + .4byte 0x62617369 + .4byte 0x635F7374 + .4byte 0x72696E67 + .4byte 0x3A3A7265 + .4byte 0x73657276 + .4byte 0x65206C65 + .4byte 0x6E677468 + .4byte 0x5F657272 + .4byte 0x6F720000 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q23std12out_of_range +__vt__Q23std12out_of_range: + + .4byte __RTTI__Q23std12out_of_range + .4byte 0 + .4byte __dt__Q23std12out_of_rangeFv + .4byte what__Q23std11logic_errorCFv + +.global "@10380" +"@10380": + + .4byte __RTTI__Q23std9exception + .4byte 0 + .4byte __RTTI__Q23std11logic_error + .4byte 0 + .4byte 0 + .4byte 0 + +.global __vt__Q23std12length_error +__vt__Q23std12length_error: + + .4byte __RTTI__Q23std12length_error + .4byte 0 + .4byte __dt__Q23std12length_errorFv + .4byte what__Q23std11logic_errorCFv + +.global "@10382" +"@10382": + + .4byte __RTTI__Q23std9exception + .4byte 0 + .4byte __RTTI__Q23std11logic_error + .4byte 0 + .4byte 0 + .4byte 0 + +.global __vt__Q23std11logic_error +__vt__Q23std11logic_error: + + .4byte __RTTI__Q23std11logic_error + .4byte 0 + .4byte __dt__Q23std11logic_errorFv + .4byte what__Q23std11logic_errorCFv + +.global "@10388" +"@10388": + + .4byte __RTTI__Q23std9exception + .4byte 0 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global __RTTI__Q23std12out_of_range +__RTTI__Q23std12out_of_range: + + .4byte "@10379" + .4byte "@10380" + +.global __RTTI__Q23std12length_error +__RTTI__Q23std12length_error: + + .4byte "@10381" + .4byte "@10382" + +.global __RTTI__Q23std11logic_error +__RTTI__Q23std11logic_error: + + .4byte "@10387" + .4byte "@10388" + +.global "@11481" +"@11481": + + .byte 0x00 + +.global "@11495" +"@11495": + + .balign 4 + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global "@GUARD@id__Q23std8ctype" +"@GUARD@id__Q23std8ctype": + .skip 0x1 + +.global "@GUARD@id__Q23std8ctype" +"@GUARD@id__Q23std8ctype": + .skip 0x1 + +.global "@GUARD@id__Q23std14codecvt" +"@GUARD@id__Q23std14codecvt": + .skip 0x1 + +.global "@GUARD@id__Q23std14codecvt" +"@GUARD@id__Q23std14codecvt": + .skip 0x5 diff --git a/asm/MSL_C++.PPCEABI.bare.H/locale_80006804.s b/asm/MSL_C++.PPCEABI.bare.H/locale_80006804.s deleted file mode 100644 index 0ba167f2..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/locale_80006804.s +++ /dev/null @@ -1,64 +0,0 @@ -.include "macros.inc" - -.section extab_, "wa" # 0x80006740 - 0x800068E0 ; 0x000001A0 -.global "@25556" -"@25556": - - .4byte 0x18180000 - .4byte 0x00000048 - .4byte 0x00000018 - .4byte 0x00000054 - .4byte 0x00000024 - .4byte 0 - .4byte 0x8F000000 - .4byte 0x0000004C - .4byte 0x00000008 - .4byte 0x8D000008 - -.global "@26577" -"@26577": - - .4byte 0x10080000 - .4byte 0 - -.global "@27127" -"@27127": - - .4byte 0x68080000 - .4byte 0x00000094 - .4byte 0x00000038 - .4byte 0x000000B0 - .4byte 0x00000030 - .4byte 0x0000019C - .4byte 0x0000004C - .4byte 0x000001B8 - .4byte 0x00000044 - .4byte 0x0000035C - .4byte 0x00000058 - .4byte 0 - .4byte 0x02000028 - .4byte "__dt__Q210Metrowerks48move_ptr>Fv" - .4byte 0x8680001D - .4byte 0 - .4byte __dt__Q23std9exceptionFv - .4byte 0x02000020 - .4byte "__dt__Q210Metrowerks48move_ptr>Fv" - .4byte 0x8680001E - .4byte 0 - .4byte __dt__Q23std9exceptionFv - .4byte 0x82000030 - .4byte "__dt__Q23std59basic_string,Q23std12allocator>Fv" - -.global "@27197" -"@27197": - - .4byte 0x18180000 - .4byte 0x0000004C - .4byte 0x00000018 - .4byte 0x00000058 - .4byte 0x00000024 - .4byte 0 - .4byte 0x8F000000 - .4byte 0x00000050 - .4byte 0x00000008 - .4byte 0x8D000008 diff --git a/asm/MSL_C++.PPCEABI.bare.H/locale_8000697c.s b/asm/MSL_C++.PPCEABI.bare.H/locale_8000697c.s deleted file mode 100644 index 90de788e..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/locale_8000697c.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macros.inc" - -.section extabindex_, "wa" # 0x800068E0 - 0x80006A00 ; 0x00000120 - .4byte __dt__Q23std11logic_errorFv - .4byte 0x00000090 - .4byte "@25556" - .4byte "__dt__Q23std59basic_string,Q23std12allocator>Fv" - .4byte 0x00000064 - .4byte "@26577" - .4byte "do_replace__Q23std59basic_string,Q23std12allocator>FUlUlPCcPCcQ23std26random_access_iterator_tag" - .4byte 0x000003F0 - .4byte "@27127" - .4byte __dt__Q23std12length_errorFv - .4byte 0x00000094 - .4byte "@27197" diff --git a/asm/MSL_C++.PPCEABI.bare.H/locale_80406264.s b/asm/MSL_C++.PPCEABI.bare.H/locale_80406264.s deleted file mode 100644 index dcaa63b8..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/locale_80406264.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1locale_cpp" diff --git a/asm/MSL_C++.PPCEABI.bare.H/locale_80407658.s b/asm/MSL_C++.PPCEABI.bare.H/locale_80407658.s deleted file mode 100644 index 88429a55..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/locale_80407658.s +++ /dev/null @@ -1,90 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@10379" -"@10379": - - .4byte 0x7374643A - .4byte 0x3A6F7574 - .4byte 0x5F6F665F - .4byte 0x72616E67 - .4byte 0x65000000 - -.global "@10381" -"@10381": - - .4byte 0x7374643A - .4byte 0x3A6C656E - .4byte 0x6774685F - .4byte 0x6572726F - .4byte 0x72000000 - -.global "@10387" -"@10387": - - .4byte 0x7374643A - .4byte 0x3A6C6F67 - .4byte 0x69635F65 - .4byte 0x72726F72 - .4byte 0 - -.global "@stringBase0_80407694" -"@stringBase0_80407694": - - .4byte 0x76656374 - .4byte 0x6F72206C - .4byte 0x656E6774 - .4byte 0x68206572 - .4byte 0x726F7200 - .4byte 0x21737464 - .4byte 0x3A3A6578 - .4byte 0x63657074 - .4byte 0x696F6E21 - .4byte 0x21737464 - .4byte 0x3A3A6C6F - .4byte 0x6769635F - .4byte 0x6572726F - .4byte 0x72212173 - .4byte 0x74643A3A - .4byte 0x6C656E67 - .4byte 0x74685F65 - .4byte 0x72726F72 - .4byte 0x21210062 - .4byte 0x61736963 - .4byte 0x5F737472 - .4byte 0x696E673A - .4byte 0x206F7574 - .4byte 0x5F6F665F - .4byte 0x72616E67 - .4byte 0x65002173 - .4byte 0x74643A3A - .4byte 0x65786365 - .4byte 0x7074696F - .4byte 0x6E212173 - .4byte 0x74643A3A - .4byte 0x6C6F6769 - .4byte 0x635F6572 - .4byte 0x726F7221 - .4byte 0x21737464 - .4byte 0x3A3A6F75 - .4byte 0x745F6F66 - .4byte 0x5F72616E - .4byte 0x67652121 - .4byte 0x0043002A - .4byte 0x00626173 - .4byte 0x69635F73 - .4byte 0x7472696E - .4byte 0x673A206C - .4byte 0x656E6774 - .4byte 0x685F6572 - .4byte 0x726F7200 - .4byte 0x62617369 - .4byte 0x635F7374 - .4byte 0x72696E67 - .4byte 0x3A3A7265 - .4byte 0x73657276 - .4byte 0x65206C65 - .4byte 0x6E677468 - .4byte 0x5F657272 - .4byte 0x6F720000 - .4byte 0 diff --git a/asm/MSL_C++.PPCEABI.bare.H/locale_80421a48.s b/asm/MSL_C++.PPCEABI.bare.H/locale_80421a48.s deleted file mode 100644 index 32fa96d3..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/locale_80421a48.s +++ /dev/null @@ -1,54 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q23std12out_of_range -__vt__Q23std12out_of_range: - - .4byte __RTTI__Q23std12out_of_range - .4byte 0 - .4byte __dt__Q23std12out_of_rangeFv - .4byte what__Q23std11logic_errorCFv - -.global "@10380" -"@10380": - - .4byte __RTTI__Q23std9exception - .4byte 0 - .4byte __RTTI__Q23std11logic_error - .4byte 0 - .4byte 0 - .4byte 0 - -.global __vt__Q23std12length_error -__vt__Q23std12length_error: - - .4byte __RTTI__Q23std12length_error - .4byte 0 - .4byte __dt__Q23std12length_errorFv - .4byte what__Q23std11logic_errorCFv - -.global "@10382" -"@10382": - - .4byte __RTTI__Q23std9exception - .4byte 0 - .4byte __RTTI__Q23std11logic_error - .4byte 0 - .4byte 0 - .4byte 0 - -.global __vt__Q23std11logic_error -__vt__Q23std11logic_error: - - .4byte __RTTI__Q23std11logic_error - .4byte 0 - .4byte __dt__Q23std11logic_errorFv - .4byte what__Q23std11logic_errorCFv - -.global "@10388" -"@10388": - - .4byte __RTTI__Q23std9exception - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/MSL_C++.PPCEABI.bare.H/locale_80556468.s b/asm/MSL_C++.PPCEABI.bare.H/locale_80556468.s deleted file mode 100644 index 1409a156..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/locale_80556468.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global __RTTI__Q23std12out_of_range -__RTTI__Q23std12out_of_range: - - .4byte "@10379" - .4byte "@10380" - -.global __RTTI__Q23std12length_error -__RTTI__Q23std12length_error: - - .4byte "@10381" - .4byte "@10382" - -.global __RTTI__Q23std11logic_error -__RTTI__Q23std11logic_error: - - .4byte "@10387" - .4byte "@10388" - -.global "@11481" -"@11481": - - .byte 0x00 - -.global "@11495" -"@11495": - - .balign 4 - .4byte 0 diff --git a/asm/MSL_C++.PPCEABI.bare.H/locale_8055c720.s b/asm/MSL_C++.PPCEABI.bare.H/locale_8055c720.s deleted file mode 100644 index c4e6186d..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/locale_8055c720.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global "@GUARD@id__Q23std8ctype" -"@GUARD@id__Q23std8ctype": - .skip 0x1 - -.global "@GUARD@id__Q23std8ctype" -"@GUARD@id__Q23std8ctype": - .skip 0x1 - -.global "@GUARD@id__Q23std14codecvt" -"@GUARD@id__Q23std14codecvt": - .skip 0x1 - -.global "@GUARD@id__Q23std14codecvt" -"@GUARD@id__Q23std14codecvt": - .skip 0x5 diff --git a/asm/MSL_C++.PPCEABI.bare.H/msl_thread_80014f18.s b/asm/MSL_C++.PPCEABI.bare.H/msl_thread.s similarity index 89% rename from asm/MSL_C++.PPCEABI.bare.H/msl_thread_80014f18.s rename to asm/MSL_C++.PPCEABI.bare.H/msl_thread.s index c61dbc51..7abcd9ed 100644 --- a/asm/MSL_C++.PPCEABI.bare.H/msl_thread_80014f18.s +++ b/asm/MSL_C++.PPCEABI.bare.H/msl_thread.s @@ -1,5 +1,28 @@ .include "macros.inc" +.section extab_, "wa" # 0x80006740 - 0x800068E0 ; 0x000001A0 +.global "@8323" +"@8323": + + .4byte 0x08080000 + .4byte 0 + +.global "@8430" +"@8430": + + .4byte 0x10080000 + .4byte 0 +.include "macros.inc" + +.section extabindex_, "wa" # 0x800068E0 - 0x80006A00 ; 0x00000120 + .4byte release__Q43std3tr16detail25shared_ptr_deleter_commonFv + .4byte 0x00000078 + .4byte "@8323" + .4byte "__dt__Q33std3tr114functionFv" + .4byte 0x000000A0 + .4byte "@8430" +.include "macros.inc" + .section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860 .global release__Q43std3tr16detail25shared_ptr_deleter_commonFv release__Q43std3tr16detail25shared_ptr_deleter_commonFv: diff --git a/asm/MSL_C++.PPCEABI.bare.H/msl_thread_800068bc.s b/asm/MSL_C++.PPCEABI.bare.H/msl_thread_800068bc.s deleted file mode 100644 index 5237c7bf..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/msl_thread_800068bc.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section extab_, "wa" # 0x80006740 - 0x800068E0 ; 0x000001A0 -.global "@8323" -"@8323": - - .4byte 0x08080000 - .4byte 0 - -.global "@8430" -"@8430": - - .4byte 0x10080000 - .4byte 0 diff --git a/asm/MSL_C++.PPCEABI.bare.H/msl_thread_800069ac.s b/asm/MSL_C++.PPCEABI.bare.H/msl_thread_800069ac.s deleted file mode 100644 index 273ea0d6..00000000 --- a/asm/MSL_C++.PPCEABI.bare.H/msl_thread_800069ac.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macros.inc" - -.section extabindex_, "wa" # 0x800068E0 - 0x80006A00 ; 0x00000120 - .4byte release__Q43std3tr16detail25shared_ptr_deleter_commonFv - .4byte 0x00000078 - .4byte "@8323" - .4byte "__dt__Q33std3tr114functionFv" - .4byte 0x000000A0 - .4byte "@8430" diff --git a/obj_files.mk b/obj_files.mk index 823ef945..51b5b320 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -77,20 +77,15 @@ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Math/Double_precision/ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Math/Double_precision/w_sqrt.o \ $(BUILD_DIR)/asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.o \ \ +$(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/ios.o \ +$(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/locale.o \ +$(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/msl_thread.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/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/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/MSL_C++.PPCEABI.bare.H/ios_8001488c.o \ -$(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/locale_80014944.o \ -$(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/msl_thread_80014f18.o \ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targsupp_80015034.o \ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/cc_gdev_80015054.o \ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/MWCriticalSection_gc_800152c4.o \ @@ -2882,7 +2877,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/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 \ $(BUILD_DIR)/asm/libnw4r_ef/ef_resource_80406270.o \ @@ -2989,8 +2983,6 @@ $(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/Linker/Generated/Symbol/File_80406548.o \ -$(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/ios_804075b8.o \ -$(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/locale_80407658.o \ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targimpl_80407778.o \ $(BUILD_DIR)/asm/os/OSCrc_80407800.o \ $(BUILD_DIR)/asm/mtx/quat_80407840.o \ @@ -3226,8 +3218,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/MSL_C++.PPCEABI.bare.H/ios_80421a28.o \ -$(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/locale_80421a48.o \ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dispatch_80421ab8.o \ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk_80421b28.o \ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_80421b68.o \ @@ -5242,8 +5232,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/MSL_C++.PPCEABI.bare.H/ios_80556450.o \ -$(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/locale_80556468.o \ $(BUILD_DIR)/asm/os/OS_80556488.o \ $(BUILD_DIR)/asm/os/OSAlloc_805564b8.o \ $(BUILD_DIR)/asm/os/OSArena_805564c0.o \ @@ -5711,7 +5699,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/MSL_C++.PPCEABI.bare.H/locale_8055c720.o \ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/cc_gdev_8055c728.o \ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/main_TRK_8055c730.o \ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk_8055c738.o \