mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-13 04:46:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adds JSUList, JKRDisposer, and JKRHeap. (#4)

Browse Source 
* Added JSUList, JKRDisposer, and JKRHeap.

JSUList: Decompiled JSUPtrLink and JSUPtrList with their respected
functions. The templated class JSUList is left.

JKRDisposer: Constructor matched but the destructor is close but
not yet a match.

JKRHeap: No functions matches yet. JKRHeap.cpp now includes
"operator delete" which makes it possible to forward compile
destructors.

* moved files from src/ to libs/
This commit is contained in:
Jonathan Wase
2020-11-29 17:47:00 +01:00
committed by GitHub
parent 68a46e15cb
commit 635fbc34ec
385 changed files with 4633 additions and 4131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/m/Do/controller/m_Do_controller_pad.s
+4 -4
View File
@@ -9,7 +9,7 @@ mDoCPd_c_NS_create:
/* 80007958 00004898 7C 08 02 A6 */ mflr r0
/* 8000795C 0000489C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80007960 000048A0 38 60 00 B0 */ li r3, 0xb0
/* 80007964 000048A4 48 2C 72 E9 */ bl __nw
/* 80007964 000048A4 48 2C 72 E9 */ bl __nw__FUl
/* 80007968 000048A8 7C 60 1B 79 */ or. r0, r3, r3
/* 8000796C 000048AC 41 82 00 10 */ beq lbl_8000797C
/* 80007970 000048B0 38 80 00 00 */ li r4, 0
@@ -22,7 +22,7 @@ lbl_8000797C:
/* 80007988 000048C8 7C 00 07 75 */ extsb. r0, r0
/* 8000798C 000048CC 41 82 00 80 */ beq lbl_80007A0C
/* 80007990 000048D0 38 60 00 B0 */ li r3, 0xb0
/* 80007994 000048D4 48 2C 72 B9 */ bl __nw
/* 80007994 000048D4 48 2C 72 B9 */ bl __nw__FUl
/* 80007998 000048D8 7C 60 1B 79 */ or. r0, r3, r3
/* 8000799C 000048DC 41 82 00 10 */ beq lbl_800079AC
/* 800079A0 000048E0 38 80 00 01 */ li r4, 1
@@ -33,7 +33,7 @@ lbl_800079AC:
/* 800079B0 000048F0 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 800079B4 000048F4 90 03 00 04 */ stw r0, 4(r3)
/* 800079B8 000048F8 38 60 00 B0 */ li r3, 0xb0
/* 800079BC 000048FC 48 2C 72 91 */ bl __nw
/* 800079BC 000048FC 48 2C 72 91 */ bl __nw__FUl
/* 800079C0 00004900 7C 60 1B 79 */ or. r0, r3, r3
/* 800079C4 00004904 41 82 00 10 */ beq lbl_800079D4
/* 800079C8 00004908 38 80 00 02 */ li r4, 2
@@ -44,7 +44,7 @@ lbl_800079D4:
/* 800079D8 00004918 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 800079DC 0000491C 90 03 00 08 */ stw r0, 8(r3)
/* 800079E0 00004920 38 60 00 B0 */ li r3, 0xb0
/* 800079E4 00004924 48 2C 72 69 */ bl __nw
/* 800079E4 00004924 48 2C 72 69 */ bl __nw__FUl
/* 800079E8 00004928 7C 60 1B 79 */ or. r0, r3, r3
/* 800079EC 0000492C 41 82 00 10 */ beq lbl_800079FC
/* 800079F0 00004930 38 80 00 03 */ li r4, 3
asm/m/Do/dvd/m_Do_dvd_thread.s
+13 -13
View File
@@ -19,7 +19,7 @@ mDoDvdThd_NS_main:
/* 80015828 00012768 38 80 FF FF */ li r4, -1
/* 8001582C 0001276C 48 2B BF 2D */ bl JKRThread_NS_dtor
/* 80015830 00012770 4B FF 94 B5 */ bl mDoExt_getAssertHeap
/* 80015834 00012774 48 2B 8C 05 */ bl JKRHeap_NS_becomeCurrentHeap
/* 80015834 00012774 48 2B 8C 05 */ bl becomeCurrentHeap__7JKRHeapFv
/* 80015838 00012778 7F E3 FB 78 */ mr r3, r31
/* 8001583C 0001277C 48 00 02 9D */ bl mDoDvdThd_param_c_NS_mainLoop
/* 80015840 00012780 38 60 00 00 */ li r3, 0
@@ -94,7 +94,7 @@ mDoDvdThd_command_c_NS_dtor:
/* 8001591C 0001285C 90 1F 00 10 */ stw r0, 0x10(r31)
/* 80015920 00012860 7C 80 07 35 */ extsh. r0, r4
/* 80015924 00012864 40 81 00 08 */ ble lbl_8001592C
/* 80015928 00012868 48 2B 94 15 */ bl __dl
/* 80015928 00012868 48 2B 94 15 */ bl __dl__FPv
lbl_8001592C:
/* 8001592C 0001286C 7F E3 FB 78 */ mr r3, r31
/* 80015930 00012870 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -307,7 +307,7 @@ mDoDvdThd_command_c:
/* 80015BEC 00012B2C 7F E0 07 35 */ extsh. r0, r31
/* 80015BF0 00012B30 40 81 00 0C */ ble lbl_80015BFC
/* 80015BF4 00012B34 7F C3 F3 78 */ mr r3, r30
/* 80015BF8 00012B38 48 2B 91 45 */ bl __dl
/* 80015BF8 00012B38 48 2B 91 45 */ bl __dl__FPv
lbl_80015BFC:
/* 80015BFC 00012B3C 7F C3 F3 78 */ mr r3, r30
/* 80015C00 00012B40 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -356,7 +356,7 @@ mDoDvdThd_callback_c_NS_create:
/* 80015C94 00012BD4 7C 64 1B 78 */ mr r4, r3
/* 80015C98 00012BD8 38 60 00 20 */ li r3, 0x20
/* 80015C9C 00012BDC 38 A0 FF FC */ li r5, -4
/* 80015CA0 00012BE0 48 2B 8F F9 */ bl __nw_X2_
/* 80015CA0 00012BE0 48 2B 8F F9 */ bl __nw__FUlP7JKRHeapi
/* 80015CA4 00012BE4 7C 7F 1B 79 */ or. r31, r3, r3
/* 80015CA8 00012BE8 41 82 00 14 */ beq lbl_80015CBC
/* 80015CAC 00012BEC 7F A4 EB 78 */ mr r4, r29
@@ -415,7 +415,7 @@ lbl_80015CD4:
/* 80015D78 00012CB8 7F E0 07 35 */ extsh. r0, r31
/* 80015D7C 00012CBC 40 81 00 0C */ ble lbl_80015D88
/* 80015D80 00012CC0 7F C3 F3 78 */ mr r3, r30
/* 80015D84 00012CC4 48 2B 8F B9 */ bl __dl
/* 80015D84 00012CC4 48 2B 8F B9 */ bl __dl__FPv
lbl_80015D88:
/* 80015D88 00012CC8 7F C3 F3 78 */ mr r3, r30
/* 80015D8C 00012CCC 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -471,7 +471,7 @@ mDoDvdThd_mountArchive_c_NS_create:
/* 80015E38 00012D78 7C 64 1B 78 */ mr r4, r3
/* 80015E3C 00012D7C 38 60 00 24 */ li r3, 0x24
/* 80015E40 00012D80 38 A0 FF FC */ li r5, -4
/* 80015E44 00012D84 48 2B 8E 55 */ bl __nw_X2_
/* 80015E44 00012D84 48 2B 8E 55 */ bl __nw__FUlP7JKRHeapi
/* 80015E48 00012D88 7C 7F 1B 79 */ or. r31, r3, r3
/* 80015E4C 00012D8C 41 82 00 10 */ beq lbl_80015E5C
/* 80015E50 00012D90 7F A4 EB 78 */ mr r4, r29
@@ -563,7 +563,7 @@ lbl_80015F70:
/* 80015F7C 00012EBC 38 60 00 70 */ li r3, 0x70
/* 80015F80 00012EC0 7F 24 CB 78 */ mr r4, r25
/* 80015F84 00012EC4 38 A0 00 00 */ li r5, 0
/* 80015F88 00012EC8 48 2B 8D 11 */ bl __nw_X2_
/* 80015F88 00012EC8 48 2B 8D 11 */ bl __nw__FUlP7JKRHeapi
/* 80015F8C 00012ECC 7C 60 1B 79 */ or. r0, r3, r3
/* 80015F90 00012ED0 41 82 00 14 */ beq lbl_80015FA4
/* 80015F94 00012ED4 80 9A 00 18 */ lwz r4, 0x18(r26)
@@ -577,7 +577,7 @@ lbl_80015FAC:
/* 80015FAC 00012EEC 38 60 00 70 */ li r3, 0x70
/* 80015FB0 00012EF0 7F 24 CB 78 */ mr r4, r25
/* 80015FB4 00012EF4 38 A0 FF FC */ li r5, -4
/* 80015FB8 00012EF8 48 2B 8C E1 */ bl __nw_X2_
/* 80015FB8 00012EF8 48 2B 8C E1 */ bl __nw__FUlP7JKRHeapi
/* 80015FBC 00012EFC 7C 60 1B 79 */ or. r0, r3, r3
/* 80015FC0 00012F00 41 82 00 14 */ beq lbl_80015FD4
/* 80015FC4 00012F04 80 9A 00 18 */ lwz r4, 0x18(r26)
@@ -686,7 +686,7 @@ lbl_800160D8:
/* 8001613C 0001307C 7F E0 07 35 */ extsh. r0, r31
/* 80016140 00013080 40 81 00 0C */ ble lbl_8001614C
/* 80016144 00013084 7F C3 F3 78 */ mr r3, r30
/* 80016148 00013088 48 2B 8B F5 */ bl __dl
/* 80016148 00013088 48 2B 8B F5 */ bl __dl__FPv
lbl_8001614C:
/* 8001614C 0001308C 7F C3 F3 78 */ mr r3, r30
/* 80016150 00013090 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -745,7 +745,7 @@ mDoDvdThd_mountXArchive_c_NS_create:
/* 80016208 00013148 7C 64 1B 78 */ mr r4, r3
/* 8001620C 0001314C 38 60 00 28 */ li r3, 0x28
/* 80016210 00013150 38 A0 FF FC */ li r5, -4
/* 80016214 00013154 48 2B 8A 85 */ bl __nw_X2_
/* 80016214 00013154 48 2B 8A 85 */ bl __nw__FUlP7JKRHeapi
/* 80016218 00013158 7C 7F 1B 79 */ or. r31, r3, r3
/* 8001621C 0001315C 41 82 00 14 */ beq lbl_80016230
/* 80016220 00013160 7F 84 E3 78 */ mr r4, r28
@@ -867,7 +867,7 @@ mDoDvdThd_toMainRam_c_NS_create:
/* 800163B8 000132F8 7C 64 1B 78 */ mr r4, r3
/* 800163BC 000132FC 38 60 00 28 */ li r3, 0x28
/* 800163C0 00013300 38 A0 FF FC */ li r5, -4
/* 800163C4 00013304 48 2B 88 D5 */ bl __nw_X2_
/* 800163C4 00013304 48 2B 88 D5 */ bl __nw__FUlP7JKRHeapi
/* 800163C8 00013308 7C 7F 1B 79 */ or. r31, r3, r3
/* 800163CC 0001330C 41 82 00 10 */ beq lbl_800163DC
/* 800163D0 00013310 7F A4 EB 78 */ mr r4, r29
@@ -925,7 +925,7 @@ lbl_80016440:
/* 80016490 000133D0 7F E0 07 35 */ extsh. r0, r31
/* 80016494 000133D4 40 81 00 0C */ ble lbl_800164A0
/* 80016498 000133D8 7F C3 F3 78 */ mr r3, r30
/* 8001649C 000133DC 48 2B 88 A1 */ bl __dl
/* 8001649C 000133DC 48 2B 88 A1 */ bl __dl__FPv
lbl_800164A0:
/* 800164A0 000133E0 7F C3 F3 78 */ mr r3, r30
/* 800164A4 000133E4 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -969,7 +969,7 @@ lbl_8001651C:
/* 80016530 00013470 28 04 00 00 */ cmplwi r4, 0
/* 80016534 00013474 41 82 00 10 */ beq lbl_80016544
/* 80016538 00013478 7F E3 FB 78 */ mr r3, r31
/* 8001653C 0001347C 48 2B 81 C5 */ bl JKRHeap_NS_getSize_X1_
/* 8001653C 0001347C 48 2B 81 C5 */ bl getSize__7JKRHeapFPv
/* 80016540 00013480 90 7E 00 20 */ stw r3, 0x20(r30)
lbl_80016544:
/* 80016544 00013484 38 00 00 01 */ li r0, 1
asm/m/Do/m_Do_DVDError.s
+1 -1
View File
@@ -96,7 +96,7 @@ mDoDvdErr_Watch:
/* 800166D0 00013610 38 80 FF FF */ li r4, -1
/* 800166D4 00013614 48 2B B0 85 */ bl JKRThread_NS_dtor
/* 800166D8 00013618 4B FF 86 0D */ bl mDoExt_getAssertHeap
/* 800166DC 0001361C 48 2B 7D 5D */ bl JKRHeap_NS_becomeCurrentHeap
/* 800166DC 0001361C 48 2B 7D 5D */ bl becomeCurrentHeap__7JKRHeapFv
/* 800166E0 00013620 3C 60 80 3E */ lis r3, lbl_803DECC0@ha
/* 800166E4 00013624 3B E3 EC C0 */ addi r31, r3, lbl_803DECC0@l
lbl_800166E8:
asm/m/Do/m_Do_MemCard.s
+1 -1
View File
@@ -990,7 +990,7 @@ mDoMemCd_main:
/* 80017440 00014380 38 80 FF FF */ li r4, -1
/* 80017444 00014384 48 2B A3 15 */ bl JKRThread_NS_dtor
/* 80017448 00014388 4B FF 78 9D */ bl mDoExt_getAssertHeap
/* 8001744C 0001438C 48 2B 6F ED */ bl JKRHeap_NS_becomeCurrentHeap
/* 8001744C 0001438C 48 2B 6F ED */ bl becomeCurrentHeap__7JKRHeapFv
/* 80017450 00014390 3C 60 80 3F */ lis r3, lbl_803EAF40@ha
/* 80017454 00014394 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l
/* 80017458 00014398 4B FF F3 79 */ bl mDoMemCd_Ctrl_c_NS_main
asm/m/Do/m_Do_audio.s
+12 -12
View File
@@ -54,7 +54,7 @@ lbl_80007030:
/* 80007058 00003F98 41 82 00 50 */ beq lbl_800070A8
/* 8000705C 00003F9C 80 6D 8D F4 */ lwz r3, lbl_80451374-_SDA_BASE_(r13)
/* 80007060 00003FA0 38 80 00 05 */ li r4, 5
/* 80007064 00003FA4 48 2C 77 4D */ bl JKRHeap_NS_changeGroupID
/* 80007064 00003FA4 48 2C 77 4D */ bl changeGroupID__7JKRHeapFUc
/* 80007068 00003FA8 7C 7F 1B 78 */ mr r31, r3
/* 8000706C 00003FAC 80 6D 86 44 */ lwz r3, lbl_80450BC4-_SDA_BASE_(r13)
/* 80007070 00003FB0 80 E3 00 1C */ lwz r7, 0x1c(r3)
@@ -67,7 +67,7 @@ lbl_80007030:
/* 8000708C 00003FCC 48 2C 62 C1 */ bl Z2AudioMgr_NS_init
/* 80007090 00003FD0 80 6D 8D F4 */ lwz r3, lbl_80451374-_SDA_BASE_(r13)
/* 80007094 00003FD4 57 E4 06 3E */ clrlwi r4, r31, 0x18
/* 80007098 00003FD8 48 2C 77 19 */ bl JKRHeap_NS_changeGroupID
/* 80007098 00003FD8 48 2C 77 19 */ bl changeGroupID__7JKRHeapFUc
/* 8000709C 00003FDC 80 6D 86 3C */ lwz r3, lbl_80450BBC-_SDA_BASE_(r13)
/* 800070A0 00003FE0 48 2C 9B 55 */ bl JKRSolidHeap_NS_adjustSize
/* 800070A4 00003FE4 48 00 00 18 */ b lbl_800070BC
@@ -95,7 +95,7 @@ lbl_800070BC:
/* 800070F4 00004034 80 6D 86 40 */ lwz r3, lbl_80450BC0-_SDA_BASE_(r13)
/* 800070F8 00004038 80 63 00 1C */ lwz r3, 0x1c(r3)
/* 800070FC 0000403C 38 80 00 00 */ li r4, 0
/* 80007100 00004040 48 2C 74 01 */ bl JKRHeap_NS_free
/* 80007100 00004040 48 2C 74 01 */ bl free__7JKRHeapFPvP7JKRHeap
/* 80007104 00004044 80 6D 86 40 */ lwz r3, lbl_80450BC0-_SDA_BASE_(r13)
/* 80007108 00004048 28 03 00 00 */ cmplwi r3, 0
/* 8000710C 0000404C 41 82 00 18 */ beq lbl_80007124
@@ -299,7 +299,7 @@ mDoAud_zelAudio_c_NS_dtor:
/* 8000739C 000042DC 7F E0 07 35 */ extsh. r0, r31
/* 800073A0 000042E0 40 81 00 0C */ ble lbl_800073AC
/* 800073A4 000042E4 7F C3 F3 78 */ mr r3, r30
/* 800073A8 000042E8 48 2C 79 95 */ bl __dl
/* 800073A8 000042E8 48 2C 79 95 */ bl __dl__FPv
lbl_800073AC:
/* 800073AC 000042EC 7F C3 F3 78 */ mr r3, r30
/* 800073B0 000042F0 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -433,7 +433,7 @@ lbl_8000755C:
/* 80007578 000044B8 34 7D 00 58 */ addic. r3, r29, 0x58
/* 8000757C 000044BC 41 82 00 0C */ beq lbl_80007588
/* 80007580 000044C0 38 80 00 00 */ li r4, 0
/* 80007584 000044C4 48 2D 49 29 */ bl JSUPtrList_NS_dtor
/* 80007584 000044C4 48 2D 49 29 */ bl __dt__10JSUPtrListFv
lbl_80007588:
/* 80007588 000044C8 28 1D 00 00 */ cmplwi r29, 0
/* 8000758C 000044CC 41 82 00 18 */ beq lbl_800075A4
@@ -451,7 +451,7 @@ lbl_800075A4:
/* 800075B8 000044F8 34 7D 00 64 */ addic. r3, r29, 0x64
/* 800075BC 000044FC 41 82 00 0C */ beq lbl_800075C8
/* 800075C0 00004500 38 80 00 00 */ li r4, 0
/* 800075C4 00004504 48 2D 48 E9 */ bl JSUPtrList_NS_dtor
/* 800075C4 00004504 48 2D 48 E9 */ bl __dt__10JSUPtrListFv
lbl_800075C8:
/* 800075C8 00004508 7F A3 EB 78 */ mr r3, r29
/* 800075CC 0000450C 38 80 00 00 */ li r4, 0
@@ -527,7 +527,7 @@ lbl_800076AC:
/* 800076C4 00004604 41 82 00 10 */ beq lbl_800076D4
/* 800076C8 00004608 38 7E 04 F4 */ addi r3, r30, 0x4f4
/* 800076CC 0000460C 38 80 00 00 */ li r4, 0
/* 800076D0 00004610 48 2D 47 DD */ bl JSUPtrList_NS_dtor
/* 800076D0 00004610 48 2D 47 DD */ bl __dt__10JSUPtrListFv
lbl_800076D4:
/* 800076D4 00004614 34 1E 04 F4 */ addic. r0, r30, 0x4f4
/* 800076D8 00004618 41 82 00 1C */ beq lbl_800076F4
@@ -625,7 +625,7 @@ lbl_8000780C:
/* 8000780C 0000474C 7F E0 07 35 */ extsh. r0, r31
/* 80007810 00004750 40 81 00 0C */ ble lbl_8000781C
/* 80007814 00004754 7F C3 F3 78 */ mr r3, r30
/* 80007818 00004758 48 2C 75 25 */ bl __dl
/* 80007818 00004758 48 2C 75 25 */ bl __dl__FPv
lbl_8000781C:
/* 8000781C 0000475C 7F C3 F3 78 */ mr r3, r30
/* 80007820 00004760 39 61 00 20 */ addi r11, r1, 0x20
@@ -648,7 +648,7 @@ JAISoundHandle_NS_dtor:
/* 8000785C 0000479C 7F E0 07 35 */ extsh. r0, r31
/* 80007860 000047A0 40 81 00 0C */ ble lbl_8000786C
/* 80007864 000047A4 7F C3 F3 78 */ mr r3, r30
/* 80007868 000047A8 48 2C 74 D5 */ bl __dl
/* 80007868 000047A8 48 2C 74 D5 */ bl __dl__FPv
lbl_8000786C:
/* 8000786C 000047AC 7F C3 F3 78 */ mr r3, r30
/* 80007870 000047B0 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -672,7 +672,7 @@ Z2MultiSeObj_NS_dtor:
/* 800078B0 000047F0 7F E0 07 35 */ extsh. r0, r31
/* 800078B4 000047F4 40 81 00 0C */ ble lbl_800078C0
/* 800078B8 000047F8 7F C3 F3 78 */ mr r3, r30
/* 800078BC 000047FC 48 2C 74 81 */ bl __dl
/* 800078BC 000047FC 48 2C 74 81 */ bl __dl__FPv
lbl_800078C0:
/* 800078C0 00004800 7F C3 F3 78 */ mr r3, r30
/* 800078C4 00004804 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -698,7 +698,7 @@ JAISeCategoryMgr_NS_dtor:
/* 8000790C 0000484C 41 82 00 10 */ beq lbl_8000791C
/* 80007910 00004850 38 7E 00 58 */ addi r3, r30, 0x58
/* 80007914 00004854 38 80 00 00 */ li r4, 0
/* 80007918 00004858 48 2D 45 95 */ bl JSUPtrList_NS_dtor
/* 80007918 00004858 48 2D 45 95 */ bl __dt__10JSUPtrListFv
lbl_8000791C:
/* 8000791C 0000485C 7F C3 F3 78 */ mr r3, r30
/* 80007920 00004860 38 80 00 00 */ li r4, 0
@@ -706,7 +706,7 @@ lbl_8000791C:
/* 80007928 00004868 7F E0 07 35 */ extsh. r0, r31
/* 8000792C 0000486C 40 81 00 0C */ ble lbl_80007938
/* 80007930 00004870 7F C3 F3 78 */ mr r3, r30
/* 80007934 00004874 48 2C 74 09 */ bl __dl
/* 80007934 00004874 48 2C 74 09 */ bl __dl__FPv
lbl_80007938:
/* 80007938 00004878 7F C3 F3 78 */ mr r3, r30
/* 8000793C 0000487C 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/m/Do/m_Do_ext.s
+47 -47
View File
@@ -539,7 +539,7 @@ mDoExt_bckAnm_NS_init:
/* 8000D810 0000A750 55 20 06 3F */ clrlwi. r0, r9, 0x18
/* 8000D814 0000A754 40 82 00 58 */ bne lbl_8000D86C
/* 8000D818 0000A758 38 60 00 0C */ li r3, 0xc
/* 8000D81C 0000A75C 48 2C 14 31 */ bl __nw
/* 8000D81C 0000A75C 48 2C 14 31 */ bl __nw__FUl
/* 8000D820 0000A760 28 03 00 00 */ cmplwi r3, 0
/* 8000D824 0000A764 41 82 00 30 */ beq lbl_8000D854
/* 8000D828 0000A768 80 BF 00 14 */ lwz r5, 0x14(r31)
@@ -615,7 +615,7 @@ lbl_8000D920:
/* 8000D920 0000A860 7C 80 07 35 */ extsh. r0, r4
/* 8000D924 0000A864 40 81 00 0C */ ble lbl_8000D930
/* 8000D928 0000A868 7F E3 FB 78 */ mr r3, r31
/* 8000D92C 0000A86C 48 2C 14 11 */ bl __dl
/* 8000D92C 0000A86C 48 2C 14 11 */ bl __dl__FPv
lbl_8000D930:
/* 8000D930 0000A870 7F E3 FB 78 */ mr r3, r31
/* 8000D934 0000A874 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -634,7 +634,7 @@ lbl_8000D930:
/* 8000D968 0000A8A8 90 1F 00 00 */ stw r0, 0(r31)
/* 8000D96C 0000A8AC 7C 80 07 35 */ extsh. r0, r4
/* 8000D970 0000A8B0 40 81 00 08 */ ble lbl_8000D978
/* 8000D974 0000A8B4 48 2C 13 C9 */ bl __dl
/* 8000D974 0000A8B4 48 2C 13 C9 */ bl __dl__FPv
lbl_8000D978:
/* 8000D978 0000A8B8 7F E3 FB 78 */ mr r3, r31
/* 8000D97C 0000A8BC 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -1125,7 +1125,7 @@ J3DIndTexCoordScale_NS_dtor:
/* 8000E038 0000AF78 41 82 00 10 */ beq lbl_8000E048
/* 8000E03C 0000AF7C 7C 80 07 35 */ extsh. r0, r4
/* 8000E040 0000AF80 40 81 00 08 */ ble lbl_8000E048
/* 8000E044 0000AF84 48 2C 0C F9 */ bl __dl
/* 8000E044 0000AF84 48 2C 0C F9 */ bl __dl__FPv
lbl_8000E048:
/* 8000E048 0000AF88 7F E3 FB 78 */ mr r3, r31
/* 8000E04C 0000AF8C 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -1144,7 +1144,7 @@ J3DIndTexMtx_NS_dtor:
/* 8000E078 0000AFB8 41 82 00 10 */ beq lbl_8000E088
/* 8000E07C 0000AFBC 7C 80 07 35 */ extsh. r0, r4
/* 8000E080 0000AFC0 40 81 00 08 */ ble lbl_8000E088
/* 8000E084 0000AFC4 48 2C 0C B9 */ bl __dl
/* 8000E084 0000AFC4 48 2C 0C B9 */ bl __dl__FPv
lbl_8000E088:
/* 8000E088 0000AFC8 7F E3 FB 78 */ mr r3, r31
/* 8000E08C 0000AFCC 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -1489,7 +1489,7 @@ J3DGXColor:
/* 8000E560 0000B4A0 A3 FE 00 2C */ lhz r31, 0x2c(r30)
/* 8000E564 0000B4A4 1C 7F 00 18 */ mulli r3, r31, 0x18
/* 8000E568 0000B4A8 38 63 00 10 */ addi r3, r3, 0x10
/* 8000E56C 0000B4AC 48 2C 07 59 */ bl __nwa
/* 8000E56C 0000B4AC 48 2C 07 59 */ bl __nwa__FUl
.global mDoExt_invJntPacket
/* 8000E570 0000B4B0 3C 80 80 01 */ lis r4, mDoExt_invJntPacket@ha
.global mDoExt_invJntPacket
@@ -1551,7 +1551,7 @@ lbl_8000E62C:
/* 8000E62C 0000B56C 7C 80 07 35 */ extsh. r0, r4
/* 8000E630 0000B570 40 81 00 0C */ ble lbl_8000E63C
/* 8000E634 0000B574 7F E3 FB 78 */ mr r3, r31
/* 8000E638 0000B578 48 2C 07 05 */ bl __dl
/* 8000E638 0000B578 48 2C 07 05 */ bl __dl__FPv
lbl_8000E63C:
/* 8000E63C 0000B57C 7F E3 FB 78 */ mr r3, r31
/* 8000E640 0000B580 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -1583,7 +1583,7 @@ mDoExt_invJntPacket:
/* 8000E6A0 0000B5E0 90 1F 00 00 */ stw r0, 0(r31)
/* 8000E6A4 0000B5E4 7C 80 07 35 */ extsh. r0, r4
/* 8000E6A8 0000B5E8 40 81 00 08 */ ble lbl_8000E6B0
/* 8000E6AC 0000B5EC 48 2C 06 91 */ bl __dl
/* 8000E6AC 0000B5EC 48 2C 06 91 */ bl __dl__FPv
lbl_8000E6B0:
/* 8000E6B0 0000B5F0 7F E3 FB 78 */ mr r3, r31
/* 8000E6B4 0000B5F4 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -2181,7 +2181,7 @@ lbl_8000EEAC:
/* 8000EEB0 0000BDF0 41 82 00 10 */ beq lbl_8000EEC0
/* 8000EEB4 0000BDF4 7F E3 FB 78 */ mr r3, r31
/* 8000EEB8 0000BDF8 38 80 00 01 */ li r4, 1
/* 8000EEBC 0000BDFC 48 2B FC BD */ bl JKRHeap_NS_setErrorFlag
/* 8000EEBC 0000BDFC 48 2B FC BD */ bl setErrorFlag__7JKRHeapFb
lbl_8000EEC0:
/* 8000EEC0 0000BE00 7F E3 FB 78 */ mr r3, r31
/* 8000EEC4 0000BE04 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -2399,7 +2399,7 @@ mDoExt_destroySolidHeap:
/* 8000F18C 0000C0CC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8000F190 0000C0D0 7C 08 02 A6 */ mflr r0
/* 8000F194 0000C0D4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8000F198 0000C0D8 48 2B F2 B1 */ bl JKRHeap_NS_destroy
/* 8000F198 0000C0D8 48 2B F2 B1 */ bl destroy__7JKRHeapFv
/* 8000F19C 0000C0DC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8000F1A0 0000C0E0 7C 08 03 A6 */ mtlr r0
/* 8000F1A4 0000C0E4 38 21 00 10 */ addi r1, r1, 0x10
@@ -2410,7 +2410,7 @@ mDoExt_destroyExpHeap:
/* 8000F1AC 0000C0EC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8000F1B0 0000C0F0 7C 08 02 A6 */ mflr r0
/* 8000F1B4 0000C0F4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8000F1B8 0000C0F8 48 2B F2 91 */ bl JKRHeap_NS_destroy
/* 8000F1B8 0000C0F8 48 2B F2 91 */ bl destroy__7JKRHeapFv
/* 8000F1BC 0000C0FC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8000F1C0 0000C100 7C 08 03 A6 */ mtlr r0
/* 8000F1C4 0000C104 38 21 00 10 */ addi r1, r1, 0x10
@@ -2421,7 +2421,7 @@ mDoExt_setCurrentHeap:
/* 8000F1CC 0000C10C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8000F1D0 0000C110 7C 08 02 A6 */ mflr r0
/* 8000F1D4 0000C114 90 01 00 14 */ stw r0, 0x14(r1)
/* 8000F1D8 0000C118 48 2B F2 61 */ bl JKRHeap_NS_becomeCurrentHeap
/* 8000F1D8 0000C118 48 2B F2 61 */ bl becomeCurrentHeap__7JKRHeapFv
/* 8000F1DC 0000C11C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8000F1E0 0000C120 7C 08 03 A6 */ mtlr r0
/* 8000F1E4 0000C124 38 21 00 10 */ addi r1, r1, 0x10
@@ -2438,7 +2438,7 @@ mDoExt_restoreCurrentHeap:
/* 8000F1F8 0000C138 7C 08 02 A6 */ mflr r0
/* 8000F1FC 0000C13C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8000F200 0000C140 80 6D 86 C0 */ lwz r3, lbl_80450C40-_SDA_BASE_(r13)
/* 8000F204 0000C144 48 2B F2 35 */ bl JKRHeap_NS_becomeCurrentHeap
/* 8000F204 0000C144 48 2B F2 35 */ bl becomeCurrentHeap__7JKRHeapFv
/* 8000F208 0000C148 38 00 00 00 */ li r0, 0
/* 8000F20C 0000C14C 90 0D 86 C0 */ stw r0, lbl_80450C40-_SDA_BASE_(r13)
/* 8000F210 0000C150 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -2979,7 +2979,7 @@ mDoExt_morf_c:
/* 8000F9F8 0000C938 90 1F 00 00 */ stw r0, 0(r31)
/* 8000F9FC 0000C93C 7C 80 07 35 */ extsh. r0, r4
/* 8000FA00 0000C940 40 81 00 08 */ ble lbl_8000FA08
/* 8000FA04 0000C944 48 2B F3 39 */ bl __dl
/* 8000FA04 0000C944 48 2B F3 39 */ bl __dl__FPv
lbl_8000FA08:
/* 8000FA08 0000C948 7F E3 FB 78 */ mr r3, r31
/* 8000FA0C 0000C94C 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -3008,7 +3008,7 @@ lbl_8000FA64:
/* 8000FA64 0000C9A4 7C 80 07 35 */ extsh. r0, r4
/* 8000FA68 0000C9A8 40 81 00 0C */ ble lbl_8000FA74
/* 8000FA6C 0000C9AC 7F E3 FB 78 */ mr r3, r31
/* 8000FA70 0000C9B0 48 2B F2 CD */ bl __dl
/* 8000FA70 0000C9B0 48 2B F2 CD */ bl __dl__FPv
lbl_8000FA74:
/* 8000FA74 0000C9B4 7F E3 FB 78 */ mr r3, r31
/* 8000FA78 0000C9B8 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -3033,7 +3033,7 @@ lbl_8000FAC0:
/* 8000FAC0 0000CA00 7C 80 07 35 */ extsh. r0, r4
/* 8000FAC4 0000CA04 40 81 00 0C */ ble lbl_8000FAD0
/* 8000FAC8 0000CA08 7F E3 FB 78 */ mr r3, r31
/* 8000FACC 0000CA0C 48 2B F2 71 */ bl __dl
/* 8000FACC 0000CA0C 48 2B F2 71 */ bl __dl__FPv
lbl_8000FAD0:
/* 8000FAD0 0000CA10 7F E3 FB 78 */ mr r3, r31
/* 8000FAD4 0000CA14 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -3076,7 +3076,7 @@ lbl_8000FB54:
/* 8000FB54 0000CA94 7C 80 07 35 */ extsh. r0, r4
/* 8000FB58 0000CA98 40 81 00 0C */ ble lbl_8000FB64
/* 8000FB5C 0000CA9C 7F E3 FB 78 */ mr r3, r31
/* 8000FB60 0000CAA0 48 2B F1 DD */ bl __dl
/* 8000FB60 0000CAA0 48 2B F1 DD */ bl __dl__FPv
lbl_8000FB64:
/* 8000FB64 0000CAA4 7F E3 FB 78 */ mr r3, r31
/* 8000FB68 0000CAA8 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -3222,7 +3222,7 @@ lbl_8000FD5C:
/* 8000FD68 0000CCA8 7F E0 07 35 */ extsh. r0, r31
/* 8000FD6C 0000CCAC 40 81 00 0C */ ble lbl_8000FD78
/* 8000FD70 0000CCB0 7F C3 F3 78 */ mr r3, r30
/* 8000FD74 0000CCB4 48 2B EF C9 */ bl __dl
/* 8000FD74 0000CCB4 48 2B EF C9 */ bl __dl__FPv
lbl_8000FD78:
/* 8000FD78 0000CCB8 7F C3 F3 78 */ mr r3, r30
/* 8000FD7C 0000CCBC 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -3306,7 +3306,7 @@ lbl_8000FE90:
/* 8000FE90 0000CDD0 2C 1D 00 00 */ cmpwi r29, 0
/* 8000FE94 0000CDD4 41 82 00 34 */ beq lbl_8000FEC8
/* 8000FE98 0000CDD8 38 60 00 4C */ li r3, 0x4c
/* 8000FE9C 0000CDDC 48 2B ED B1 */ bl __nw
/* 8000FE9C 0000CDDC 48 2B ED B1 */ bl __nw__FUl
/* 8000FEA0 0000CDE0 7C 7D 1B 79 */ or. r29, r3, r3
/* 8000FEA4 0000CDE4 41 82 00 14 */ beq lbl_8000FEB8
/* 8000FEA8 0000CDE8 48 2A EC ED */ bl Z2SoundObjAnime
@@ -3343,7 +3343,7 @@ lbl_8000FEC8:
/* 8000FF1C 0000CE5C A3 36 00 2C */ lhz r25, 0x2c(r22)
/* 8000FF20 0000CE60 57 23 28 34 */ slwi r3, r25, 5
/* 8000FF24 0000CE64 38 63 00 10 */ addi r3, r3, 0x10
/* 8000FF28 0000CE68 48 2B ED 9D */ bl __nwa
/* 8000FF28 0000CE68 48 2B ED 9D */ bl __nwa__FUl
/* 8000FF2C 0000CE6C 38 80 00 00 */ li r4, 0
/* 8000FF30 0000CE70 38 A0 00 00 */ li r5, 0
/* 8000FF34 0000CE74 38 C0 00 20 */ li r6, 0x20
@@ -3355,7 +3355,7 @@ lbl_8000FEC8:
/* 8000FF4C 0000CE8C 41 82 00 B0 */ beq lbl_8000FFFC
/* 8000FF50 0000CE90 A0 16 00 2C */ lhz r0, 0x2c(r22)
/* 8000FF54 0000CE94 54 03 23 36 */ rlwinm r3, r0, 4, 0xc, 0x1b
/* 8000FF58 0000CE98 48 2B ED 6D */ bl __nwa
/* 8000FF58 0000CE98 48 2B ED 6D */ bl __nwa__FUl
/* 8000FF5C 0000CE9C 90 75 00 24 */ stw r3, 0x24(r21)
/* 8000FF60 0000CEA0 80 15 00 24 */ lwz r0, 0x24(r21)
/* 8000FF64 0000CEA4 28 00 00 00 */ cmplwi r0, 0
@@ -4011,7 +4011,7 @@ mDoExt_McaMorfSO:
/* 800108C4 0000D804 7F E0 07 35 */ extsh. r0, r31
/* 800108C8 0000D808 40 81 00 0C */ ble lbl_800108D4
/* 800108CC 0000D80C 7F C3 F3 78 */ mr r3, r30
/* 800108D0 0000D810 48 2B E4 6D */ bl __dl
/* 800108D0 0000D810 48 2B E4 6D */ bl __dl__FPv
lbl_800108D4:
/* 800108D4 0000D814 7F C3 F3 78 */ mr r3, r30
/* 800108D8 0000D818 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -4110,7 +4110,7 @@ lbl_800109D8:
/* 80010A28 0000D968 A3 78 00 2C */ lhz r27, 0x2c(r24)
/* 80010A2C 0000D96C 57 63 28 34 */ slwi r3, r27, 5
/* 80010A30 0000D970 38 63 00 10 */ addi r3, r3, 0x10
/* 80010A34 0000D974 48 2B E2 91 */ bl __nwa
/* 80010A34 0000D974 48 2B E2 91 */ bl __nwa__FUl
/* 80010A38 0000D978 38 80 00 00 */ li r4, 0
/* 80010A3C 0000D97C 38 A0 00 00 */ li r5, 0
/* 80010A40 0000D980 38 C0 00 20 */ li r6, 0x20
@@ -4122,7 +4122,7 @@ lbl_800109D8:
/* 80010A58 0000D998 41 82 00 B0 */ beq lbl_80010B08
/* 80010A5C 0000D99C A0 18 00 2C */ lhz r0, 0x2c(r24)
/* 80010A60 0000D9A0 54 03 23 36 */ rlwinm r3, r0, 4, 0xc, 0x1b
/* 80010A64 0000D9A4 48 2B E2 61 */ bl __nwa
/* 80010A64 0000D9A4 48 2B E2 61 */ bl __nwa__FUl
/* 80010A68 0000D9A8 90 77 00 24 */ stw r3, 0x24(r23)
/* 80010A6C 0000D9AC 80 17 00 24 */ lwz r0, 0x24(r23)
/* 80010A70 0000D9B0 28 00 00 00 */ cmplwi r0, 0
@@ -4812,7 +4812,7 @@ lbl_80011338:
/* 80011438 0000E378 7F E0 07 35 */ extsh. r0, r31
/* 8001143C 0000E37C 40 81 00 0C */ ble lbl_80011448
/* 80011440 0000E380 7F C3 F3 78 */ mr r3, r30
/* 80011444 0000E384 48 2B D8 F9 */ bl __dl
/* 80011444 0000E384 48 2B D8 F9 */ bl __dl__FPv
lbl_80011448:
/* 80011448 0000E388 7F C3 F3 78 */ mr r3, r30
/* 8001144C 0000E38C 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -4909,7 +4909,7 @@ lbl_8001153C:
/* 80011598 0000E4D8 A3 36 00 2C */ lhz r25, 0x2c(r22)
/* 8001159C 0000E4DC 57 23 28 34 */ slwi r3, r25, 5
/* 800115A0 0000E4E0 38 63 00 10 */ addi r3, r3, 0x10
/* 800115A4 0000E4E4 48 2B D7 21 */ bl __nwa
/* 800115A4 0000E4E4 48 2B D7 21 */ bl __nwa__FUl
/* 800115A8 0000E4E8 38 80 00 00 */ li r4, 0
/* 800115AC 0000E4EC 38 A0 00 00 */ li r5, 0
/* 800115B0 0000E4F0 38 C0 00 20 */ li r6, 0x20
@@ -4926,7 +4926,7 @@ lbl_8001153C:
lbl_800115DC:
/* 800115DC 0000E51C A0 16 00 2C */ lhz r0, 0x2c(r22)
/* 800115E0 0000E520 54 03 23 36 */ rlwinm r3, r0, 4, 0xc, 0x1b
/* 800115E4 0000E524 48 2B D6 E1 */ bl __nwa
/* 800115E4 0000E524 48 2B D6 E1 */ bl __nwa__FUl
/* 800115E8 0000E528 90 75 00 24 */ stw r3, 0x24(r21)
/* 800115EC 0000E52C 80 15 00 24 */ lwz r0, 0x24(r21)
/* 800115F0 0000E530 28 00 00 00 */ cmplwi r0, 0
@@ -5893,7 +5893,7 @@ mDoExt_3Dline_c_NS_init:
/* 800123F4 0000F334 54 9B 04 3E */ clrlwi r27, r4, 0x10
/* 800123F8 0000F338 1C 7B 00 0C */ mulli r3, r27, 0xc
/* 800123FC 0000F33C 38 63 00 10 */ addi r3, r3, 0x10
/* 80012400 0000F340 48 2B C8 C5 */ bl __nwa
/* 80012400 0000F340 48 2B C8 C5 */ bl __nwa__FUl
/* 80012404 0000F344 3C 80 80 01 */ lis r4, cXyz@ha
/* 80012408 0000F348 38 84 25 DC */ addi r4, r4, cXyz@l
/* 8001240C 0000F34C 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha
@@ -5911,7 +5911,7 @@ lbl_80012438:
/* 80012438 0000F378 2C 1E 00 00 */ cmpwi r30, 0
/* 8001243C 0000F37C 41 82 00 24 */ beq lbl_80012460
/* 80012440 0000F380 57 63 10 3A */ slwi r3, r27, 2
/* 80012444 0000F384 48 2B C8 81 */ bl __nwa
/* 80012444 0000F384 48 2B C8 81 */ bl __nwa__FUl
/* 80012448 0000F388 90 7C 00 04 */ stw r3, 4(r28)
/* 8001244C 0000F38C 80 1C 00 04 */ lwz r0, 4(r28)
/* 80012450 0000F390 28 00 00 00 */ cmplwi r0, 0
@@ -5928,7 +5928,7 @@ lbl_80012468:
/* 80012474 0000F3B4 7C 1B 03 78 */ mr r27, r0
/* 80012478 0000F3B8 1C 60 00 0C */ mulli r3, r0, 0xc
/* 8001247C 0000F3BC 38 63 00 10 */ addi r3, r3, 0x10
/* 80012480 0000F3C0 48 2B C8 45 */ bl __nwa
/* 80012480 0000F3C0 48 2B C8 45 */ bl __nwa__FUl
/* 80012484 0000F3C4 3C 80 80 01 */ lis r4, cXyz@ha
/* 80012488 0000F3C8 38 84 25 DC */ addi r4, r4, cXyz@l
/* 8001248C 0000F3CC 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha
@@ -5945,7 +5945,7 @@ lbl_80012468:
lbl_800124B8:
/* 800124B8 0000F3F8 1C 7F 00 0C */ mulli r3, r31, 0xc
/* 800124BC 0000F3FC 38 63 00 10 */ addi r3, r3, 0x10
/* 800124C0 0000F400 48 2B C8 05 */ bl __nwa
/* 800124C0 0000F400 48 2B C8 05 */ bl __nwa__FUl
/* 800124C4 0000F404 3C 80 80 01 */ lis r4, cXyz@ha
/* 800124C8 0000F408 38 84 25 DC */ addi r4, r4, cXyz@l
/* 800124CC 0000F40C 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha
@@ -5962,7 +5962,7 @@ lbl_800124B8:
lbl_800124F8:
/* 800124F8 0000F438 1F 7F 00 03 */ mulli r27, r31, 3
/* 800124FC 0000F43C 7F 63 DB 78 */ mr r3, r27
/* 80012500 0000F440 48 2B C7 C5 */ bl __nwa
/* 80012500 0000F440 48 2B C7 C5 */ bl __nwa__FUl
/* 80012504 0000F444 90 7C 00 10 */ stw r3, 0x10(r28)
/* 80012508 0000F448 80 1C 00 10 */ lwz r0, 0x10(r28)
/* 8001250C 0000F44C 28 00 00 00 */ cmplwi r0, 0
@@ -5971,7 +5971,7 @@ lbl_800124F8:
/* 80012518 0000F458 48 00 00 AC */ b lbl_800125C4
lbl_8001251C:
/* 8001251C 0000F45C 7F 63 DB 78 */ mr r3, r27
/* 80012520 0000F460 48 2B C7 A5 */ bl __nwa
/* 80012520 0000F460 48 2B C7 A5 */ bl __nwa__FUl
/* 80012524 0000F464 90 7C 00 14 */ stw r3, 0x14(r28)
/* 80012528 0000F468 80 1C 00 14 */ lwz r0, 0x14(r28)
/* 8001252C 0000F46C 28 00 00 00 */ cmplwi r0, 0
@@ -5983,7 +5983,7 @@ lbl_8001253C:
/* 80012540 0000F480 41 82 00 80 */ beq lbl_800125C0
/* 80012544 0000F484 57 FB 18 38 */ slwi r27, r31, 3
/* 80012548 0000F488 7F 63 DB 78 */ mr r3, r27
/* 8001254C 0000F48C 48 2B C7 79 */ bl __nwa
/* 8001254C 0000F48C 48 2B C7 79 */ bl __nwa__FUl
/* 80012550 0000F490 90 7C 00 18 */ stw r3, 0x18(r28)
/* 80012554 0000F494 80 1C 00 18 */ lwz r0, 0x18(r28)
/* 80012558 0000F498 28 00 00 00 */ cmplwi r0, 0
@@ -5992,7 +5992,7 @@ lbl_8001253C:
/* 80012564 0000F4A4 48 00 00 60 */ b lbl_800125C4
lbl_80012568:
/* 80012568 0000F4A8 7F 63 DB 78 */ mr r3, r27
/* 8001256C 0000F4AC 48 2B C7 59 */ bl __nwa
/* 8001256C 0000F4AC 48 2B C7 59 */ bl __nwa__FUl
/* 80012570 0000F4B0 90 7C 00 1C */ stw r3, 0x1c(r28)
/* 80012574 0000F4B4 80 1C 00 1C */ lwz r0, 0x1c(r28)
/* 80012578 0000F4B8 28 00 00 00 */ cmplwi r0, 0
@@ -6042,7 +6042,7 @@ cXyz:
/* 8001260C 0000F54C 54 9F 04 3E */ clrlwi r31, r4, 0x10
/* 80012610 0000F550 54 83 2A F4 */ rlwinm r3, r4, 5, 0xb, 0x1a
/* 80012614 0000F554 38 63 00 10 */ addi r3, r3, 0x10
/* 80012618 0000F558 48 2B C6 AD */ bl __nwa
/* 80012618 0000F558 48 2B C6 AD */ bl __nwa__FUl
.global mDoExt_3Dline_c
/* 8001261C 0000F55C 3C 80 80 01 */ lis r4, mDoExt_3Dline_c@ha
.global mDoExt_3Dline_c
@@ -6940,7 +6940,7 @@ lbl_80013334:
/* 80013390 000102D0 54 9D 04 3E */ clrlwi r29, r4, 0x10
/* 80013394 000102D4 54 83 2A F4 */ rlwinm r3, r4, 5, 0xb, 0x1a
/* 80013398 000102D8 38 63 00 10 */ addi r3, r3, 0x10
/* 8001339C 000102DC 48 2B B9 29 */ bl __nwa
/* 8001339C 000102DC 48 2B B9 29 */ bl __nwa__FUl
.global mDoExt_3Dline_c
/* 800133A0 000102E0 3C 80 80 01 */ lis r4, mDoExt_3Dline_c@ha
.global mDoExt_3Dline_c
@@ -8348,7 +8348,7 @@ mDoExt_initFontCommon:
/* 80014860 000117A0 38 60 00 B8 */ li r3, 0xb8
/* 80014864 000117A4 7F 44 D3 78 */ mr r4, r26
/* 80014868 000117A8 38 A0 00 00 */ li r5, 0
/* 8001486C 000117AC 48 2B A4 2D */ bl __nw_X2_
/* 8001486C 000117AC 48 2B A4 2D */ bl __nw__FUlP7JKRHeapi
/* 80014870 000117B0 7C 64 1B 79 */ or. r4, r3, r3
/* 80014874 000117B4 41 82 00 18 */ beq lbl_8001488C
/* 80014878 000117B8 80 9F 00 00 */ lwz r4, 0(r31)
@@ -8372,7 +8372,7 @@ lbl_800148A4:
/* 800148B8 000117F8 48 00 00 28 */ b lbl_800148E0
lbl_800148BC:
/* 800148BC 000117FC 38 60 00 70 */ li r3, 0x70
/* 800148C0 00011800 48 2B A3 8D */ bl __nw
/* 800148C0 00011800 48 2B A3 8D */ bl __nw__FUl
/* 800148C4 00011804 7C 60 1B 79 */ or. r0, r3, r3
/* 800148C8 00011808 41 82 00 14 */ beq lbl_800148DC
/* 800148CC 0001180C 80 9F 00 00 */ lwz r4, 0(r31)
@@ -8422,7 +8422,7 @@ lbl_80014934:
/* 8001496C 000118AC 90 1F 00 00 */ stw r0, 0(r31)
/* 80014970 000118B0 7C 80 07 35 */ extsh. r0, r4
/* 80014974 000118B4 40 81 00 08 */ ble lbl_8001497C
/* 80014978 000118B8 48 2B A3 C5 */ bl __dl
/* 80014978 000118B8 48 2B A3 C5 */ bl __dl__FPv
lbl_8001497C:
/* 8001497C 000118BC 7F E3 FB 78 */ mr r3, r31
/* 80014980 000118C0 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -8502,7 +8502,7 @@ lbl_80014A70:
/* 80014A7C 000119BC 28 03 00 00 */ cmplwi r3, 0
/* 80014A80 000119C0 41 82 00 14 */ beq lbl_80014A94
/* 80014A84 000119C4 38 80 00 00 */ li r4, 0
/* 80014A88 000119C8 48 2B 9A 79 */ bl JKRHeap_NS_free
/* 80014A88 000119C8 48 2B 9A 79 */ bl free__7JKRHeapFPvP7JKRHeap
/* 80014A8C 000119CC 38 00 00 00 */ li r0, 0
/* 80014A90 000119D0 90 0D 86 CC */ stw r0, lbl_80450C4C-_SDA_BASE_(r13)
lbl_80014A94:
@@ -8629,7 +8629,7 @@ lbl_80014C20:
/* 80014C2C 00011B6C 28 03 00 00 */ cmplwi r3, 0
/* 80014C30 00011B70 41 82 00 14 */ beq lbl_80014C44
/* 80014C34 00011B74 38 80 00 00 */ li r4, 0
/* 80014C38 00011B78 48 2B 98 C9 */ bl JKRHeap_NS_free
/* 80014C38 00011B78 48 2B 98 C9 */ bl free__7JKRHeapFPvP7JKRHeap
/* 80014C3C 00011B7C 38 00 00 00 */ li r0, 0
/* 80014C40 00011B80 90 0D 86 E4 */ stw r0, lbl_80450C64-_SDA_BASE_(r13)
lbl_80014C44:
@@ -8650,7 +8650,7 @@ mDoExt_J3DModel__create:
/* 80014C70 00011BB0 7C BE 2B 78 */ mr r30, r5
/* 80014C74 00011BB4 41 82 00 CC */ beq lbl_80014D40
/* 80014C78 00011BB8 38 60 00 DC */ li r3, 0xdc
/* 80014C7C 00011BBC 48 2B 9F D1 */ bl __nw
/* 80014C7C 00011BBC 48 2B 9F D1 */ bl __nw__FUl
/* 80014C80 00011BC0 7C 7F 1B 79 */ or. r31, r3, r3
/* 80014C84 00011BC4 41 82 00 20 */ beq lbl_80014CA4
/* 80014C88 00011BC8 3C 60 80 3D */ lis r3, lbl_803CED20@ha
@@ -8788,7 +8788,7 @@ lbl_80014E54:
/* 80014E54 00011D94 7C 80 07 35 */ extsh. r0, r4
/* 80014E58 00011D98 40 81 00 0C */ ble lbl_80014E64
/* 80014E5C 00011D9C 7F E3 FB 78 */ mr r3, r31
/* 80014E60 00011DA0 48 2B 9E DD */ bl __dl
/* 80014E60 00011DA0 48 2B 9E DD */ bl __dl__FPv
lbl_80014E64:
/* 80014E64 00011DA4 7F E3 FB 78 */ mr r3, r31
/* 80014E68 00011DA8 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -8838,7 +8838,7 @@ lbl_80014F14:
/* 80014F14 00011E54 7C 80 07 35 */ extsh. r0, r4
/* 80014F18 00011E58 40 81 00 0C */ ble lbl_80014F24
/* 80014F1C 00011E5C 7F E3 FB 78 */ mr r3, r31
/* 80014F20 00011E60 48 2B 9E 1D */ bl __dl
/* 80014F20 00011E60 48 2B 9E 1D */ bl __dl__FPv
lbl_80014F24:
/* 80014F24 00011E64 7F E3 FB 78 */ mr r3, r31
/* 80014F28 00011E68 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -8871,7 +8871,7 @@ lbl_80014F90:
/* 80014F90 00011ED0 7C 80 07 35 */ extsh. r0, r4
/* 80014F94 00011ED4 40 81 00 0C */ ble lbl_80014FA0
/* 80014F98 00011ED8 7F E3 FB 78 */ mr r3, r31
/* 80014F9C 00011EDC 48 2B 9D A1 */ bl __dl
/* 80014F9C 00011EDC 48 2B 9D A1 */ bl __dl__FPv
lbl_80014FA0:
/* 80014FA0 00011EE0 7F E3 FB 78 */ mr r3, r31
/* 80014FA4 00011EE4 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -8904,7 +8904,7 @@ lbl_8001500C:
/* 8001500C 00011F4C 7C 80 07 35 */ extsh. r0, r4
/* 80015010 00011F50 40 81 00 0C */ ble lbl_8001501C
/* 80015014 00011F54 7F E3 FB 78 */ mr r3, r31
/* 80015018 00011F58 48 2B 9D 25 */ bl __dl
/* 80015018 00011F58 48 2B 9D 25 */ bl __dl__FPv
lbl_8001501C:
/* 8001501C 00011F5C 7F E3 FB 78 */ mr r3, r31
/* 80015020 00011F60 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/m/Do/m_Do_graphic.s
+6 -6
View File
@@ -20,7 +20,7 @@ createTimg:
/* 80007DCC 00004D0C 7F E3 FB 78 */ mr r3, r31
/* 80007DD0 00004D10 38 80 00 20 */ li r4, 0x20
/* 80007DD4 00004D14 38 A0 00 00 */ li r5, 0
/* 80007DD8 00004D18 48 2C 66 9D */ bl JKRHeap_NS_alloc
/* 80007DD8 00004D18 48 2C 66 9D */ bl alloc__7JKRHeapFUliP7JKRHeap
/* 80007DDC 00004D1C 7C 60 1B 78 */ mr r0, r3
/* 80007DE0 00004D20 7C 1E 03 79 */ or. r30, r0, r0
/* 80007DE4 00004D24 40 82 00 0C */ bne lbl_80007DF0
@@ -64,7 +64,7 @@ mDoGph_gInf_c_NS_create:
/* 80007E68 00004DA8 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13)
/* 80007E6C 00004DAC 90 03 00 18 */ stw r0, 0x18(r3)
/* 80007E70 00004DB0 38 60 00 28 */ li r3, 0x28
/* 80007E74 00004DB4 48 2C 6D D9 */ bl __nw
/* 80007E74 00004DB4 48 2C 6D D9 */ bl __nw__FUl
/* 80007E78 00004DB8 7C 60 1B 79 */ or. r0, r3, r3
/* 80007E7C 00004DBC 41 82 00 44 */ beq lbl_80007EC0
/* 80007E80 00004DC0 38 00 00 00 */ li r0, 0
@@ -1368,7 +1368,7 @@ cXyz_NS_dtor:
/* 80009198 000060D8 41 82 00 10 */ beq lbl_800091A8
/* 8000919C 000060DC 7C 80 07 35 */ extsh. r0, r4
/* 800091A0 000060E0 40 81 00 08 */ ble lbl_800091A8
/* 800091A4 000060E4 48 2C 5B 99 */ bl __dl
/* 800091A4 000060E4 48 2C 5B 99 */ bl __dl__FPv
lbl_800091A8:
/* 800091A8 000060E8 7F E3 FB 78 */ mr r3, r31
/* 800091AC 000060EC 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -1631,7 +1631,7 @@ mDoGph_gInf_c_NS_bloom_c_NS_create:
/* 80009584 000064C4 48 00 58 69 */ bl mDoExt_getArchiveHeap
/* 80009588 000064C8 7F E4 FB 78 */ mr r4, r31
/* 8000958C 000064CC 38 A0 FF E0 */ li r5, -32
/* 80009590 000064D0 48 2C 4F 45 */ bl JKRHeap_NS_alloc_X1_
/* 80009590 000064D0 48 2C 4F 45 */ bl alloc__7JKRHeapFUli
/* 80009594 000064D4 90 7E 00 10 */ stw r3, 0x10(r30)
/* 80009598 000064D8 38 00 00 00 */ li r0, 0
/* 8000959C 000064DC 98 1E 00 08 */ stb r0, 8(r30)
@@ -1672,7 +1672,7 @@ mDoGph_gInf_c_NS_bloom_c_NS_remove:
/* 80009618 00006558 41 82 00 18 */ beq lbl_80009630
/* 8000961C 0000655C 48 00 57 D1 */ bl mDoExt_getArchiveHeap
/* 80009620 00006560 7F E4 FB 78 */ mr r4, r31
/* 80009624 00006564 48 2C 4F 25 */ bl JKRHeap_NS_free_X1_
/* 80009624 00006564 48 2C 4F 25 */ bl free__7JKRHeapFPv
/* 80009628 00006568 38 00 00 00 */ li r0, 0
/* 8000962C 0000656C 90 1E 00 10 */ stw r0, 0x10(r30)
lbl_80009630:
@@ -3473,7 +3473,7 @@ lbl_8000B14C:
/* 8000B14C 0000808C 7C 80 07 35 */ extsh. r0, r4
/* 8000B150 00008090 40 81 00 0C */ ble lbl_8000B15C
/* 8000B154 00008094 7F E3 FB 78 */ mr r3, r31
/* 8000B158 00008098 48 2C 3B E5 */ bl __dl
/* 8000B158 00008098 48 2C 3B E5 */ bl __dl__FPv
lbl_8000B15C:
/* 8000B15C 0000809C 7F E3 FB 78 */ mr r3, r31
/* 8000B160 000080A0 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/m/Do/m_Do_lib.s
+1 -1
View File
@@ -321,7 +321,7 @@ J3DUClipper_NS_dtor:
/* 800155B0 000124F0 90 1F 00 00 */ stw r0, 0(r31)
/* 800155B4 000124F4 7C 80 07 35 */ extsh. r0, r4
/* 800155B8 000124F8 40 81 00 08 */ ble lbl_800155C0
/* 800155BC 000124FC 48 2B 97 81 */ bl __dl
/* 800155BC 000124FC 48 2B 97 81 */ bl __dl__FPv
lbl_800155C0:
/* 800155C0 00012500 7F E3 FB 78 */ mr r3, r31
/* 800155C4 00012504 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/m/Do/m_Do_machine.s
+6 -6
View File
@@ -195,7 +195,7 @@ lbl_8000B45C:
/* 8000B484 000083C4 4B FF FD 69 */ bl myGetHeapTypeByString
/* 8000B488 000083C8 7C 7D 1B 78 */ mr r29, r3
/* 8000B48C 000083CC 7F E3 FB 78 */ mr r3, r31
/* 8000B490 000083D0 48 2C 32 F5 */ bl JKRHeap_NS_getTotalFreeSize
/* 8000B490 000083D0 48 2C 32 F5 */ bl getTotalFreeSize__7JKRHeapFv
/* 8000B494 000083D4 7C 7E 1B 78 */ mr r30, r3
/* 8000B498 000083D8 7F E3 FB 78 */ mr r3, r31
/* 8000B49C 000083DC 48 2C 32 91 */ bl getFreeSize__7JKRHeapFv
@@ -947,13 +947,13 @@ lbl_8000BED4:
/* 8000BED4 00008E14 3C 60 80 01 */ lis r3, myMemoryErrorRoutine@ha
.global myMemoryErrorRoutine
/* 8000BED8 00008E18 38 63 B3 EC */ addi r3, r3, myMemoryErrorRoutine@l
/* 8000BEDC 00008E1C 48 2C 2C AD */ bl JKRHeap_NS_setErrorHandler
/* 8000BEDC 00008E1C 48 2C 2C AD */ bl setErrorHandler__7JKRHeapFPFPvUli_v
/* 8000BEE0 00008E20 80 6D 8D F8 */ lwz r3, lbl_80451378-_SDA_BASE_(r13)
/* 8000BEE4 00008E24 38 80 00 01 */ li r4, 1
/* 8000BEE8 00008E28 48 2C 2C 91 */ bl JKRHeap_NS_setErrorFlag
/* 8000BEE8 00008E28 48 2C 2C 91 */ bl setErrorFlag__7JKRHeapFb
/* 8000BEEC 00008E2C 80 6D 8C 24 */ lwz r3, lbl_804511A4-_SDA_BASE_(r13)
/* 8000BEF0 00008E30 38 80 00 01 */ li r4, 1
/* 8000BEF4 00008E34 48 2C 2C 85 */ bl JKRHeap_NS_setErrorFlag
/* 8000BEF4 00008E34 48 2C 2C 85 */ bl setErrorFlag__7JKRHeapFb
/* 8000BEF8 00008E38 83 CD 8D F8 */ lwz r30, lbl_80451378-_SDA_BASE_(r13)
/* 8000BEFC 00008E3C 38 60 10 00 */ li r3, 0x1000
/* 8000BF00 00008E40 7F C4 F3 78 */ mr r4, r30
@@ -1012,7 +1012,7 @@ lbl_8000BED4:
/* 8000BFD4 00008F14 7F C5 F3 78 */ mr r5, r30
/* 8000BFD8 00008F18 4B FF FD 21 */ bl my_SysPrintHeap
/* 8000BFDC 00008F1C 7F E3 FB 78 */ mr r3, r31
/* 8000BFE0 00008F20 48 2C 24 59 */ bl JKRHeap_NS_becomeCurrentHeap
/* 8000BFE0 00008F20 48 2C 24 59 */ bl becomeCurrentHeap__7JKRHeapFv
/* 8000BFE4 00008F24 38 60 00 00 */ li r3, 0
/* 8000BFE8 00008F28 38 80 20 00 */ li r4, 0x2000
/* 8000BFEC 00008F2C 80 AD 8D F0 */ lwz r5, lbl_80451370-_SDA_BASE_(r13)
@@ -1020,7 +1020,7 @@ lbl_8000BED4:
/* 8000BFF4 00008F34 38 60 00 00 */ li r3, 0
/* 8000BFF8 00008F38 48 2C 5A 1D */ bl JKRThreadSwitch_NS_createManager
/* 8000BFFC 00008F3C 38 60 00 7C */ li r3, 0x7c
/* 8000C000 00008F40 48 2C 2C 4D */ bl __nw
/* 8000C000 00008F40 48 2C 2C 4D */ bl __nw__FUl
/* 8000C004 00008F44 7C 7F 1B 79 */ or. r31, r3, r3
/* 8000C008 00008F48 41 82 00 18 */ beq lbl_8000C020
/* 8000C00C 00008F4C 48 33 4C 79 */ bl OSGetCurrentThread
asm/m/Do/m_Do_main.s
+2 -2
View File
@@ -18,7 +18,7 @@ HeapCheck_NS_heapDisplay:
/* 800058F0 00002830 48 2C A4 75 */ bl getTotalUsedSize__10JKRExpHeapCFv
/* 800058F4 00002834 7C 7E 1B 78 */ mr r30, r3
/* 800058F8 00002838 80 7D 00 08 */ lwz r3, 8(r29)
/* 800058FC 0000283C 48 2C 8E 89 */ bl JKRHeap_NS_getTotalFreeSize
/* 800058FC 0000283C 48 2C 8E 89 */ bl getTotalFreeSize__7JKRHeapFv
/* 80005900 00002840 7C 7B 1B 78 */ mr r27, r3
/* 80005904 00002844 80 7D 00 08 */ lwz r3, 8(r29)
/* 80005908 00002848 48 2C 8E 25 */ bl getFreeSize__7JKRHeapFv
@@ -247,7 +247,7 @@ lbl_80005C60:
/* 80005C68 00002BA8 48 00 00 48 */ b lbl_80005CB0
lbl_80005C6C:
/* 80005C6C 00002BAC 7F 03 C3 78 */ mr r3, r24
/* 80005C70 00002BB0 48 2C 8B 15 */ bl JKRHeap_NS_getTotalFreeSize
/* 80005C70 00002BB0 48 2C 8B 15 */ bl getTotalFreeSize__7JKRHeapFv
/* 80005C74 00002BB4 7C 7E 1B 78 */ mr r30, r3
/* 80005C78 00002BB8 7F 03 C3 78 */ mr r3, r24
/* 80005C7C 00002BBC 48 2C 8A B1 */ bl getFreeSize__7JKRHeapFv
asm/m/Do/m_Do_mtx.s
+2 -2
View File
@@ -1109,7 +1109,7 @@ mDoMtx_quatStack_c_NS_dtor:
/* 8000D048 00009F88 41 82 00 10 */ beq lbl_8000D058
/* 8000D04C 00009F8C 7C 80 07 35 */ extsh. r0, r4
/* 8000D050 00009F90 40 81 00 08 */ ble lbl_8000D058
/* 8000D054 00009F94 48 2C 1C E9 */ bl __dl
/* 8000D054 00009F94 48 2C 1C E9 */ bl __dl__FPv
lbl_8000D058:
/* 8000D058 00009F98 7F E3 FB 78 */ mr r3, r31
/* 8000D05C 00009F9C 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -1127,7 +1127,7 @@ mDoMtx_stack_c_NS_dtor:
/* 8000D084 00009FC4 41 82 00 10 */ beq lbl_8000D094
/* 8000D088 00009FC8 7C 80 07 35 */ extsh. r0, r4
/* 8000D08C 00009FCC 40 81 00 08 */ ble lbl_8000D094
/* 8000D090 00009FD0 48 2C 1C AD */ bl __dl
/* 8000D090 00009FD0 48 2C 1C AD */ bl __dl__FPv
lbl_8000D094:
/* 8000D094 00009FD4 7F E3 FB 78 */ mr r3, r31
/* 8000D098 00009FD8 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/m/Do/machine/m_Do_machine_exception.s
+3 -3
View File
@@ -75,13 +75,13 @@ dispHeapInfo:
/* 80017E6C 00014DAC 48 2B 68 C1 */ bl getFreeSize__7JKRHeapFv
/* 80017E70 00014DB0 7C 79 1B 78 */ mr r25, r3
/* 80017E74 00014DB4 7F E3 FB 78 */ mr r3, r31
/* 80017E78 00014DB8 48 2B 69 0D */ bl JKRHeap_NS_getTotalFreeSize
/* 80017E78 00014DB8 48 2B 69 0D */ bl getTotalFreeSize__7JKRHeapFv
/* 80017E7C 00014DBC 7C 7A 1B 78 */ mr r26, r3
/* 80017E80 00014DC0 7F C3 F3 78 */ mr r3, r30
/* 80017E84 00014DC4 48 2B 69 01 */ bl JKRHeap_NS_getTotalFreeSize
/* 80017E84 00014DC4 48 2B 69 01 */ bl getTotalFreeSize__7JKRHeapFv
/* 80017E88 00014DC8 7C 7B 1B 78 */ mr r27, r3
/* 80017E8C 00014DCC 7F A3 EB 78 */ mr r3, r29
/* 80017E90 00014DD0 48 2B 68 F5 */ bl JKRHeap_NS_getTotalFreeSize
/* 80017E90 00014DD0 48 2B 68 F5 */ bl getTotalFreeSize__7JKRHeapFv
/* 80017E94 00014DD4 7C 7C 1B 78 */ mr r28, r3
/* 80017E98 00014DD8 3C 60 80 37 */ lis r3, lbl_80374460@ha
/* 80017E9C 00014DDC 38 63 44 60 */ addi r3, r3, lbl_80374460@l