encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

JKRSolidHeap (#69)

Browse Source 
* JKRSolidHeap progress

* JKRSolidHeap, added const to virtual functions, and JKRHeap::TState

* fixed braces

* fix function overload

* clang-format

Co-authored-by: Julgodis <>
Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
Jonathan Wase
2021-01-06 20:33:03 -05:00
committed by GitHub
co-authored by Julgodis <> Pheenoh
parent 0cf65151b3
commit 88fca194f8
65 changed files with 525 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/J3DGraphLoader/J3DModelLoader.s
+1 -1
View File
@@ -110,7 +110,7 @@ J3DModelLoader_NS_load:
/* 803347F8 00331738 7C 99 23 78 */ mr r25, r4
/* 803347FC 0033173C 7C BA 2B 78 */ mr r26, r5
/* 80334800 00331740 80 6D 8D F4 */ lwz r3, lbl_80451374-_SDA_BASE_(r13)
/* 80334804 00331744 4B F9 9F 81 */ bl getTotalFreeSize__7JKRHeapFv
/* 80334804 00331744 4B F9 9F 81 */ bl getTotalFreeSize__7JKRHeapCFv
/* 80334808 00331748 38 60 00 E4 */ li r3, 0xe4
/* 8033480C 0033174C 4B F9 A4 41 */ bl __nw__FUl
/* 80334810 00331750 7C 60 1B 79 */ or. r0, r3, r3
asm/JAudio2/JASBNKParser.s
+2 -2
View File
@@ -27,7 +27,7 @@ JASBNKParser_NS_createBasicBank:
/* 80299578 002964B8 83 AD 8C 90 */ lwz r29, lbl_80451210-_SDA_BASE_(r13)
lbl_8029957C:
/* 8029957C 002964BC 7F A3 EB 78 */ mr r3, r29
/* 80299580 002964C0 48 03 51 AD */ bl getFreeSize__7JKRHeapFv
/* 80299580 002964C0 48 03 51 AD */ bl getFreeSize__7JKRHeapCFv
/* 80299584 002964C4 7C 7F 1B 78 */ mr r31, r3
/* 80299588 002964C8 3B C0 00 00 */ li r30, 0
/* 8029958C 002964CC 80 1C 00 0C */ lwz r0, 0xc(r28)
@@ -50,7 +50,7 @@ lbl_802995BC:
/* 802995C8 00296508 7C 7E 1B 78 */ mr r30, r3
lbl_802995CC:
/* 802995CC 0029650C 7F A3 EB 78 */ mr r3, r29
/* 802995D0 00296510 48 03 51 5D */ bl getFreeSize__7JKRHeapFv
/* 802995D0 00296510 48 03 51 5D */ bl getFreeSize__7JKRHeapCFv
/* 802995D4 00296514 7C 63 F8 50 */ subf r3, r3, r31
/* 802995D8 00296518 80 0D 8D 08 */ lwz r0, lbl_80451288-_SDA_BASE_(r13)
/* 802995DC 0029651C 7C 00 1A 14 */ add r0, r0, r3
asm/JAudio2/JASWSParser.s
+4 -4
View File
@@ -57,7 +57,7 @@ JASWSParser_NS_createBasicWaveBank:
/* 80299054 00295F94 82 CD 8C 90 */ lwz r22, lbl_80451210-_SDA_BASE_(r13)
lbl_80299058:
/* 80299058 00295F98 7E C3 B3 78 */ mr r3, r22
/* 8029905C 00295F9C 48 03 56 D1 */ bl getFreeSize__7JKRHeapFv
/* 8029905C 00295F9C 48 03 56 D1 */ bl getFreeSize__7JKRHeapCFv
/* 80299060 00295FA0 7C 7D 1B 78 */ mr r29, r3
/* 80299064 00295FA4 7E 9A A3 78 */ mr r26, r20
/* 80299068 00295FA8 38 60 00 28 */ li r3, 0x28
@@ -181,7 +181,7 @@ lbl_80299224:
/* 80299228 00296168 7C 19 00 40 */ cmplw r25, r0
/* 8029922C 0029616C 41 80 FE A8 */ blt lbl_802990D4
/* 80299230 00296170 7E C3 B3 78 */ mr r3, r22
/* 80299234 00296174 48 03 54 F9 */ bl getFreeSize__7JKRHeapFv
/* 80299234 00296174 48 03 54 F9 */ bl getFreeSize__7JKRHeapCFv
/* 80299238 00296178 7C 63 E8 50 */ subf r3, r3, r29
/* 8029923C 0029617C 80 0D 8D 00 */ lwz r0, lbl_80451280-_SDA_BASE_(r13)
/* 80299240 00296180 7C 00 1A 14 */ add r0, r0, r3
@@ -208,7 +208,7 @@ JASWSParser_NS_createSimpleWaveBank:
/* 80299284 002961C4 83 2D 8C 90 */ lwz r25, lbl_80451210-_SDA_BASE_(r13)
lbl_80299288:
/* 80299288 002961C8 7F 23 CB 78 */ mr r3, r25
/* 8029928C 002961CC 48 03 54 A1 */ bl getFreeSize__7JKRHeapFv
/* 8029928C 002961CC 48 03 54 A1 */ bl getFreeSize__7JKRHeapCFv
/* 80299290 002961D0 7C 7E 1B 78 */ mr r30, r3
/* 80299294 002961D4 7E FB BB 78 */ mr r27, r23
/* 80299298 002961D8 7E E3 BB 78 */ mr r3, r23
@@ -333,7 +333,7 @@ lbl_80299444:
/* 80299454 00296394 7F 84 E3 78 */ mr r4, r28
/* 80299458 00296398 48 00 12 B5 */ bl JASWaveArc_NS_setFileName
/* 8029945C 0029639C 7F 23 CB 78 */ mr r3, r25
/* 80299460 002963A0 48 03 52 CD */ bl getFreeSize__7JKRHeapFv
/* 80299460 002963A0 48 03 52 CD */ bl getFreeSize__7JKRHeapCFv
/* 80299464 002963A4 7C 63 F0 50 */ subf r3, r3, r30
/* 80299468 002963A8 80 0D 8D 00 */ lwz r0, lbl_80451280-_SDA_BASE_(r13)
/* 8029946C 002963AC 7C 00 1A 14 */ add r0, r0, r3
asm/JAudio2/JAUInitializer.s
+2 -2
View File
@@ -203,7 +203,7 @@ JAU_JAIInitializer_NS_initJAInterface:
/* 802A4D78 002A1CB8 3C 60 80 43 */ lis r3, lbl_80434110@ha
/* 802A4D7C 002A1CBC 3B E3 41 10 */ addi r31, r3, lbl_80434110@l
/* 802A4D80 002A1CC0 80 6D 8C 90 */ lwz r3, lbl_80451210-_SDA_BASE_(r13)
/* 802A4D84 002A1CC4 48 02 99 A9 */ bl getFreeSize__7JKRHeapFv
/* 802A4D84 002A1CC4 48 02 99 A9 */ bl getFreeSize__7JKRHeapCFv
/* 802A4D88 002A1CC8 83 BE 00 08 */ lwz r29, 8(r30)
/* 802A4D8C 002A1CCC 88 0D 8D A8 */ lbz r0, lbl_80451328-_SDA_BASE_(r13)
/* 802A4D90 002A1CD0 7C 00 07 75 */ extsb. r0, r0
@@ -297,7 +297,7 @@ lbl_802A4EB4:
/* 802A4EC0 002A1E00 7F A5 EB 78 */ mr r5, r29
/* 802A4EC4 002A1E04 4B FE BA 05 */ bl JASGenericMemPool_NS_newMemPool
/* 802A4EC8 002A1E08 80 6D 8C 90 */ lwz r3, lbl_80451210-_SDA_BASE_(r13)
/* 802A4ECC 002A1E0C 48 02 98 61 */ bl getFreeSize__7JKRHeapFv
/* 802A4ECC 002A1E0C 48 02 98 61 */ bl getFreeSize__7JKRHeapCFv
/* 802A4ED0 002A1E10 39 61 00 20 */ addi r11, r1, 0x20
/* 802A4ED4 002A1E14 48 0B D3 55 */ bl _restgpr_29
/* 802A4ED8 002A1E18 80 01 00 24 */ lwz r0, 0x24(r1)
asm/JAudio2/JAUSectionHeap.s
+7 -7
View File
@@ -166,7 +166,7 @@ JAUSection_NS_finishBuild:
/* 802A511C 002A205C 48 02 93 1D */ bl becomeCurrentHeap__7JKRHeapFv
/* 802A5120 002A2060 80 7F 00 30 */ lwz r3, 0x30(r31)
/* 802A5124 002A2064 80 63 00 E0 */ lwz r3, 0xe0(r3)
/* 802A5128 002A2068 48 02 96 05 */ bl getFreeSize__7JKRHeapFv
/* 802A5128 002A2068 48 02 96 05 */ bl getFreeSize__7JKRHeapCFv
/* 802A512C 002A206C 80 1F 00 D0 */ lwz r0, 0xd0(r31)
/* 802A5130 002A2070 7C 03 00 50 */ subf r0, r3, r0
/* 802A5134 002A2074 90 1F 00 D0 */ stw r0, 0xd0(r31)
@@ -698,7 +698,7 @@ JAUSection_NS_newWaveBank:
/* 802A5880 002A27C0 90 61 00 08 */ stw r3, 8(r1)
/* 802A5884 002A27C4 80 7F 00 30 */ lwz r3, 0x30(r31)
/* 802A5888 002A27C8 80 63 00 E0 */ lwz r3, 0xe0(r3)
/* 802A588C 002A27CC 48 02 8E A1 */ bl getFreeSize__7JKRHeapFv
/* 802A588C 002A27CC 48 02 8E A1 */ bl getFreeSize__7JKRHeapCFv
/* 802A5890 002A27D0 7C 7E 1B 78 */ mr r30, r3
/* 802A5894 002A27D4 7F A3 EB 78 */ mr r3, r29
/* 802A5898 002A27D8 80 9F 00 30 */ lwz r4, 0x30(r31)
@@ -728,7 +728,7 @@ lbl_802A58E8:
/* 802A58F4 002A2834 48 00 0C E1 */ bl set__Q23std16__bitset_base
/* 802A58F8 002A2838 80 7F 00 30 */ lwz r3, 0x30(r31)
/* 802A58FC 002A283C 80 63 00 E0 */ lwz r3, 0xe0(r3)
/* 802A5900 002A2840 48 02 8E 2D */ bl getFreeSize__7JKRHeapFv
/* 802A5900 002A2840 48 02 8E 2D */ bl getFreeSize__7JKRHeapCFv
/* 802A5904 002A2844 7C 63 F0 50 */ subf r3, r3, r30
/* 802A5908 002A2848 80 1F 00 D8 */ lwz r0, 0xd8(r31)
/* 802A590C 002A284C 7C 00 1A 14 */ add r0, r0, r3
@@ -852,7 +852,7 @@ lbl_802A5A90:
/* 802A5A9C 002A29DC 83 7F 00 08 */ lwz r27, 8(r31)
/* 802A5AA0 002A29E0 80 7E 00 30 */ lwz r3, 0x30(r30)
/* 802A5AA4 002A29E4 80 63 00 E0 */ lwz r3, 0xe0(r3)
/* 802A5AA8 002A29E8 48 02 8C 85 */ bl getFreeSize__7JKRHeapFv
/* 802A5AA8 002A29E8 48 02 8C 85 */ bl getFreeSize__7JKRHeapCFv
/* 802A5AAC 002A29EC 7C 7D 1B 78 */ mr r29, r3
/* 802A5AB0 002A29F0 7F E3 FB 78 */ mr r3, r31
/* 802A5AB4 002A29F4 80 9E 00 30 */ lwz r4, 0x30(r30)
@@ -892,7 +892,7 @@ lbl_802A5B30:
/* 802A5B30 002A2A70 93 9F 00 04 */ stw r28, 4(r31)
/* 802A5B34 002A2A74 80 7E 00 30 */ lwz r3, 0x30(r30)
/* 802A5B38 002A2A78 80 63 00 E0 */ lwz r3, 0xe0(r3)
/* 802A5B3C 002A2A7C 48 02 8B F1 */ bl getFreeSize__7JKRHeapFv
/* 802A5B3C 002A2A7C 48 02 8B F1 */ bl getFreeSize__7JKRHeapCFv
/* 802A5B40 002A2A80 7C 63 E8 50 */ subf r3, r3, r29
/* 802A5B44 002A2A84 80 1E 00 D4 */ lwz r0, 0xd4(r30)
/* 802A5B48 002A2A88 7C 00 1A 14 */ add r0, r0, r3
@@ -1192,7 +1192,7 @@ JAUNewSectionHeap:
/* 802A5F40 002A2E80 48 02 84 F9 */ bl becomeCurrentHeap__7JKRHeapFv
/* 802A5F44 002A2E84 90 61 00 08 */ stw r3, 8(r1)
/* 802A5F48 002A2E88 7F 83 E3 78 */ mr r3, r28
/* 802A5F4C 002A2E8C 48 02 87 E1 */ bl getFreeSize__7JKRHeapFv
/* 802A5F4C 002A2E8C 48 02 87 E1 */ bl getFreeSize__7JKRHeapCFv
/* 802A5F50 002A2E90 7C 7E 1B 78 */ mr r30, r3
/* 802A5F54 002A2E94 38 60 05 34 */ li r3, 0x534
/* 802A5F58 002A2E98 48 02 8C F5 */ bl __nw__FUl
@@ -1222,7 +1222,7 @@ JAUNewSectionHeap_X1_:
/* 802A5FA8 002A2EE8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802A5FAC 002A2EEC 7C 7F 1B 78 */ mr r31, r3
/* 802A5FB0 002A2EF0 80 6D 8C 90 */ lwz r3, lbl_80451210-_SDA_BASE_(r13)
/* 802A5FB4 002A2EF4 48 02 87 79 */ bl getFreeSize__7JKRHeapFv
/* 802A5FB4 002A2EF4 48 02 87 79 */ bl getFreeSize__7JKRHeapCFv
/* 802A5FB8 002A2EF8 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13)
/* 802A5FBC 002A2EFC 38 A0 00 01 */ li r5, 1
/* 802A5FC0 002A2F00 48 02 AA 65 */ bl create__12JKRSolidHeapFUlP7JKRHeapb
asm/JKernel/JKRExpHeap.s
+2 -2
View File
@@ -55,7 +55,7 @@ lbl_802CEE50:
/* 802CEE58 002CBD98 40 82 00 10 */ bne lbl_802CEE68
/* 802CEE5C 002CBD9C 7F 83 E3 78 */ mr r3, r28
/* 802CEE60 002CBDA0 38 80 00 10 */ li r4, 0x10
/* 802CEE64 002CBDA4 4B FF F9 79 */ bl getMaxAllocatableSize__7JKRHeapFi
/* 802CEE64 002CBDA4 4B FF F9 79 */ bl getMaxAllocatableSize__7JKRHeapCFi
lbl_802CEE68:
/* 802CEE68 002CBDA8 54 7F 00 36 */ rlwinm r31, r3, 0, 0, 0x1b
/* 802CEE6C 002CBDAC 28 1F 00 A0 */ cmplwi r31, 0xa0
@@ -1999,7 +1999,7 @@ lbl_802D0930:
/* 802D096C 002CD8AC 90 7E 00 00 */ stw r3, 0(r30)
/* 802D0970 002CD8B0 48 00 00 14 */ b lbl_802D0984
lbl_802D0974:
/* 802D0974 002CD8B4 4B FF DE 11 */ bl getTotalFreeSize__7JKRHeapFv
/* 802D0974 002CD8B4 4B FF DE 11 */ bl getTotalFreeSize__7JKRHeapCFv
/* 802D0978 002CD8B8 80 1D 00 38 */ lwz r0, 0x38(r29)
/* 802D097C 002CD8BC 7C 03 00 50 */ subf r0, r3, r0
/* 802D0980 002CD8C0 90 1E 00 00 */ stw r0, 0(r30)
asm/JKernel/JKRHeap.s
-30
View File
@@ -1,30 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 802CED84
.global JKRHeap_state_register
JKRHeap_state_register:
/* 802CED84 002CBCC4 4E 80 00 20 */ blr
.global JKRHeap_state_compare
JKRHeap_state_compare:
/* 802CED88 002CBCC8 80 64 00 04 */ lwz r3, 4(r4)
/* 802CED8C 002CBCCC 80 05 00 04 */ lwz r0, 4(r5)
/* 802CED90 002CBCD0 7C 03 00 50 */ subf r0, r3, r0
/* 802CED94 002CBCD4 7C 00 00 34 */ cntlzw r0, r0
/* 802CED98 002CBCD8 54 03 D9 7E */ srwi r3, r0, 5
/* 802CED9C 002CBCDC 4E 80 00 20 */ blr
.global JKRHeap_state_dump
JKRHeap_state_dump:
/* 802CEDA0 002CBCE0 4E 80 00 20 */ blr
.global JKRHeap_do_changeGroupID
JKRHeap_do_changeGroupID:
/* 802CEDA4 002CBCE4 38 60 00 00 */ li r3, 0
/* 802CEDA8 002CBCE8 4E 80 00 20 */ blr
.global JKRHeap_do_getCurrentGroupId
JKRHeap_do_getCurrentGroupId:
/* 802CEDAC 002CBCEC 38 60 00 00 */ li r3, 0
/* 802CEDB0 002CBCF0 4E 80 00 20 */ blr
asm/JUtility/JUTProcBar.s
+2 -2
View File
@@ -1486,7 +1486,7 @@ heapBar:
/* 802E6E4C 002E3D8C 4B FF FE F1 */ bl addrToXPos
/* 802E6E50 002E3D90 7F 7B 1A 14 */ add r27, r27, r3
/* 802E6E54 002E3D94 7F E3 FB 78 */ mr r3, r31
/* 802E6E58 002E3D98 4B FE 79 2D */ bl getTotalFreeSize__7JKRHeapFv
/* 802E6E58 002E3D98 4B FE 79 2D */ bl getTotalFreeSize__7JKRHeapCFv
/* 802E6E5C 002E3D9C 7F C4 F3 78 */ mr r4, r30
/* 802E6E60 002E3DA0 4B FF FF 45 */ bl byteToXLen
/* 802E6E64 002E3DA4 7C 7F 1B 78 */ mr r31, r3
@@ -1742,7 +1742,7 @@ JUTProcBar_NS_drawHeapBar:
/* 802E7240 002E4180 38 61 00 14 */ addi r3, r1, 0x14
/* 802E7244 002E4184 48 00 28 81 */ bl J2DFillBox
/* 802E7248 002E4188 80 6D 8D F8 */ lwz r3, lbl_80451378-_SDA_BASE_(r13)
/* 802E724C 002E418C 4B FE 75 39 */ bl getTotalFreeSize__7JKRHeapFv
/* 802E724C 002E418C 4B FE 75 39 */ bl getTotalFreeSize__7JKRHeapCFv
/* 802E7250 002E4190 7F 44 D3 78 */ mr r4, r26
/* 802E7254 002E4194 4B FF FB 51 */ bl byteToXLen
/* 802E7258 002E4198 38 00 00 00 */ li r0, 0
asm/d/com/inf/d_com_inf_game.s
+1 -1
View File
@@ -3470,7 +3470,7 @@ dComIfGp_createSubExpHeap2D:
/* 8002E240 0002B180 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002E244 0002B184 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l
/* 8002E248 0002B188 80 7D 5E BC */ lwz r3, 0x5ebc(r29)
/* 8002E24C 0002B18C 48 2A 05 39 */ bl getTotalFreeSize__7JKRHeapFv
/* 8002E24C 0002B18C 48 2A 05 39 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8002E250 0002B190 C8 22 83 10 */ lfd f1, lbl_80451D10-_SDA2_BASE_(r2)
/* 8002E254 0002B194 6C 60 80 00 */ xoris r0, r3, 0x8000
/* 8002E258 0002B198 90 01 00 0C */ stw r0, 0xc(r1)
asm/d/d_gameover.s
+1 -1
View File
@@ -294,7 +294,7 @@ lbl_8019B110:
/* 8019B150 00198090 4B E7 40 7D */ bl mDoExt_setCurrentHeap
/* 8019B154 00198094 7C 7E 1B 78 */ mr r30, r3
/* 8019B158 00198098 80 7D 01 10 */ lwz r3, 0x110(r29)
/* 8019B15C 0019809C 48 13 36 29 */ bl getTotalFreeSize__7JKRHeapFv
/* 8019B15C 0019809C 48 13 36 29 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8019B160 001980A0 38 60 00 18 */ li r3, 0x18
/* 8019B164 001980A4 48 13 3A E9 */ bl __nw__FUl
/* 8019B168 001980A8 7C 60 1B 79 */ or. r0, r3, r3
asm/d/d_meter2.s
+9 -9
View File
@@ -39,7 +39,7 @@ lbl_8021EA84:
/* 8021EA88 0021B9C8 4B DF 07 45 */ bl mDoExt_setCurrentHeap
/* 8021EA8C 0021B9CC 7C 7E 1B 78 */ mr r30, r3
/* 8021EA90 0021B9D0 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 8021EA94 0021B9D4 48 0A FC F1 */ bl getTotalFreeSize__7JKRHeapFv
/* 8021EA94 0021B9D4 48 0A FC F1 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021EA98 0021B9D8 38 7B 4E 00 */ addi r3, r27, 0x4e00
/* 8021EA9C 0021B9DC 3C 80 80 3A */ lis r4, lbl_80399338@ha
/* 8021EAA0 0021B9E0 38 84 93 38 */ addi r4, r4, lbl_80399338@l
@@ -330,7 +330,7 @@ lbl_8021EEE0:
/* 8021EEE8 0021BE28 4B FF 6E C1 */ bl dMeter2Draw_c_NS_getNowLightDropRateCalc
/* 8021EEEC 0021BE2C D0 3F 01 30 */ stfs f1, 0x130(r31)
/* 8021EEF0 0021BE30 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 8021EEF4 0021BE34 48 0A F8 91 */ bl getTotalFreeSize__7JKRHeapFv
/* 8021EEF4 0021BE34 48 0A F8 91 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021EEF8 0021BE38 3B 20 00 00 */ li r25, 0
/* 8021EEFC 0021BE3C 3B 80 00 00 */ li r28, 0
lbl_8021EF00:
@@ -461,7 +461,7 @@ lbl_8021F0B8:
/* 8021F0C0 0021C000 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021F0C4 0021C004 90 03 00 20 */ stw r0, 0x20(r3)
/* 8021F0C8 0021C008 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 8021F0CC 0021C00C 48 0A F6 B9 */ bl getTotalFreeSize__7JKRHeapFv
/* 8021F0CC 0021C00C 48 0A F6 B9 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021F0D0 0021C010 38 60 50 00 */ li r3, 0x5000
/* 8021F0D4 0021C014 80 9F 01 00 */ lwz r4, 0x100(r31)
/* 8021F0D8 0021C018 4B E0 12 C5 */ bl fopMsgM_createExpHeap
@@ -472,7 +472,7 @@ lbl_8021F0B8:
/* 8021F0EC 0021C02C 90 1F 01 14 */ stw r0, 0x114(r31)
/* 8021F0F0 0021C030 90 1F 01 18 */ stw r0, 0x118(r31)
/* 8021F0F4 0021C034 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 8021F0F8 0021C038 48 0A F6 8D */ bl getTotalFreeSize__7JKRHeapFv
/* 8021F0F8 0021C038 48 0A F6 8D */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021F0FC 0021C03C 38 00 00 00 */ li r0, 0
/* 8021F100 0021C040 90 1F 01 1C */ stw r0, 0x11c(r31)
/* 8021F104 0021C044 7F C3 F3 78 */ mr r3, r30
@@ -733,7 +733,7 @@ dMeter2_c_NS__delete:
/* 8021F4AC 0021C3EC 93 C1 00 18 */ stw r30, 0x18(r1)
/* 8021F4B0 0021C3F0 7C 7E 1B 78 */ mr r30, r3
/* 8021F4B4 0021C3F4 80 63 01 00 */ lwz r3, 0x100(r3)
/* 8021F4B8 0021C3F8 48 0A F2 CD */ bl getTotalFreeSize__7JKRHeapFv
/* 8021F4B8 0021C3F8 48 0A F2 CD */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021F4BC 0021C3FC 80 7E 01 00 */ lwz r3, 0x100(r30)
/* 8021F4C0 0021C400 4B DE FD 0D */ bl mDoExt_setCurrentHeap
/* 8021F4C4 0021C404 7C 7F 1B 78 */ mr r31, r3
@@ -802,7 +802,7 @@ lbl_8021F574:
/* 8021F5B4 0021C4F4 48 08 C3 D1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
lbl_8021F5B8:
/* 8021F5B8 0021C4F8 80 7E 01 00 */ lwz r3, 0x100(r30)
/* 8021F5BC 0021C4FC 48 0A F1 C9 */ bl getTotalFreeSize__7JKRHeapFv
/* 8021F5BC 0021C4FC 48 0A F1 C9 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021F5C0 0021C500 80 7E 01 20 */ lwz r3, 0x120(r30)
/* 8021F5C4 0021C504 28 03 00 00 */ cmplwi r3, 0
/* 8021F5C8 0021C508 41 82 00 24 */ beq lbl_8021F5EC
@@ -817,7 +817,7 @@ lbl_8021F5E4:
/* 8021F5E8 0021C528 90 1E 01 20 */ stw r0, 0x120(r30)
lbl_8021F5EC:
/* 8021F5EC 0021C52C 80 7E 01 00 */ lwz r3, 0x100(r30)
/* 8021F5F0 0021C530 48 0A F1 95 */ bl getTotalFreeSize__7JKRHeapFv
/* 8021F5F0 0021C530 48 0A F1 95 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021F5F4 0021C534 80 7E 01 04 */ lwz r3, 0x104(r30)
/* 8021F5F8 0021C538 4B DE FB D5 */ bl mDoExt_setCurrentHeap
/* 8021F5FC 0021C53C 80 7E 01 10 */ lwz r3, 0x110(r30)
@@ -847,7 +847,7 @@ lbl_8021F64C:
/* 8021F650 0021C590 90 1E 01 14 */ stw r0, 0x114(r30)
lbl_8021F654:
/* 8021F654 0021C594 80 7E 01 00 */ lwz r3, 0x100(r30)
/* 8021F658 0021C598 48 0A F1 2D */ bl getTotalFreeSize__7JKRHeapFv
/* 8021F658 0021C598 48 0A F1 2D */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021F65C 0021C59C 80 7E 01 1C */ lwz r3, 0x11c(r30)
/* 8021F660 0021C5A0 28 03 00 00 */ cmplwi r3, 0
/* 8021F664 0021C5A4 41 82 00 24 */ beq lbl_8021F688
@@ -5519,7 +5519,7 @@ lbl_80223890:
/* 802238A0 002207E0 28 00 00 00 */ cmplwi r0, 0
/* 802238A4 002207E4 40 82 03 08 */ bne lbl_80223BAC
/* 802238A8 002207E8 80 7F 01 04 */ lwz r3, 0x104(r31)
/* 802238AC 002207EC 48 0A AE D9 */ bl getTotalFreeSize__7JKRHeapFv
/* 802238AC 002207EC 48 0A AE D9 */ bl getTotalFreeSize__7JKRHeapCFv
/* 802238B0 002207F0 38 60 01 18 */ li r3, 0x118
/* 802238B4 002207F4 48 0A B3 99 */ bl __nw__FUl
/* 802238B8 002207F8 7C 60 1B 79 */ or. r0, r3, r3
asm/d/d_timer.s
+2 -2
View File
@@ -48,7 +48,7 @@ lbl_8025CA54:
/* 8025CAA8 002599E8 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 8025CAAC 002599EC 28 03 00 00 */ cmplwi r3, 0
/* 8025CAB0 002599F0 41 82 00 70 */ beq lbl_8025CB20
/* 8025CAB4 002599F4 48 07 1C D1 */ bl getTotalFreeSize__7JKRHeapFv
/* 8025CAB4 002599F4 48 07 1C D1 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8025CAB8 002599F8 38 60 03 E4 */ li r3, 0x3e4
/* 8025CABC 002599FC 48 07 21 91 */ bl __nw__FUl
/* 8025CAC0 00259A00 7C 60 1B 79 */ or. r0, r3, r3
@@ -695,7 +695,7 @@ dTimer_c_NS__delete:
/* 8025D3E0 0025A320 4B DB 1D ED */ bl mDoExt_setCurrentHeap
/* 8025D3E4 0025A324 7C 7E 1B 78 */ mr r30, r3
/* 8025D3E8 0025A328 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 8025D3EC 0025A32C 48 07 13 99 */ bl getTotalFreeSize__7JKRHeapFv
/* 8025D3EC 0025A32C 48 07 13 99 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8025D3F0 0025A330 80 7F 00 FC */ lwz r3, 0xfc(r31)
/* 8025D3F4 0025A334 48 00 18 69 */ bl dDlst_TimerScrnDraw_c_NS_deleteScreen
/* 8025D3F8 0025A338 80 7F 00 FC */ lwz r3, 0xfc(r31)
asm/d/menu/d_menu_collect.s
+3 -3
View File
@@ -105,7 +105,7 @@ dMenu_Collect2D_c_NS__create:
/* 801AFEB4 001ACDF4 93 C1 00 18 */ stw r30, 0x18(r1)
/* 801AFEB8 001ACDF8 7C 7F 1B 78 */ mr r31, r3
/* 801AFEBC 001ACDFC 80 63 00 04 */ lwz r3, 4(r3)
/* 801AFEC0 001ACE00 48 11 E8 C5 */ bl getTotalFreeSize__7JKRHeapFv
/* 801AFEC0 001ACE00 48 11 E8 C5 */ bl getTotalFreeSize__7JKRHeapCFv
/* 801AFEC4 001ACE04 38 60 01 18 */ li r3, 0x118
/* 801AFEC8 001ACE08 48 11 ED 85 */ bl __nw__FUl
/* 801AFECC 001ACE0C 7C 60 1B 79 */ or. r0, r3, r3
@@ -266,7 +266,7 @@ dMenu_Collect2D_c_NS__delete:
/* 801B0110 001AD050 48 1B 20 B9 */ bl _savegpr_24
/* 801B0114 001AD054 7C 7F 1B 78 */ mr r31, r3
/* 801B0118 001AD058 80 63 00 04 */ lwz r3, 4(r3)
/* 801B011C 001AD05C 48 11 E6 69 */ bl getTotalFreeSize__7JKRHeapFv
/* 801B011C 001AD05C 48 11 E6 69 */ bl getTotalFreeSize__7JKRHeapCFv
/* 801B0120 001AD060 88 9F 02 58 */ lbz r4, 0x258(r31)
/* 801B0124 001AD064 88 1F 02 57 */ lbz r0, 0x257(r31)
/* 801B0128 001AD068 3C 60 80 43 */ lis r3, lbl_80430188@ha
@@ -7193,7 +7193,7 @@ dMenu_Collect3D_c_NS__create:
/* 801B65B4 001B34F4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B65B8 001B34F8 7C 7F 1B 78 */ mr r31, r3
/* 801B65BC 001B34FC 80 63 00 04 */ lwz r3, 4(r3)
/* 801B65C0 001B3500 48 11 81 C5 */ bl getTotalFreeSize__7JKRHeapFv
/* 801B65C0 001B3500 48 11 81 C5 */ bl getTotalFreeSize__7JKRHeapCFv
/* 801B65C4 001B3504 3C 60 00 02 */ lis r3, 0x00025800@ha
/* 801B65C8 001B3508 38 63 58 00 */ addi r3, r3, 0x00025800@l
/* 801B65CC 001B350C 80 9F 00 04 */ lwz r4, 4(r31)
asm/d/menu/d_menu_dmap.s
+6 -6
View File
@@ -5355,9 +5355,9 @@ lbl_801BCDC4:
/* 801BCE18 001B9D58 38 03 CB 10 */ addi r0, r3, lbl_803BCB10@l
/* 801BCE1C 001B9D5C 90 1F 00 00 */ stw r0, 0(r31)
/* 801BCE20 001B9D60 80 7F 00 E8 */ lwz r3, 0xe8(r31)
/* 801BCE24 001B9D64 48 11 19 61 */ bl getTotalFreeSize__7JKRHeapFv
/* 801BCE24 001B9D64 48 11 19 61 */ bl getTotalFreeSize__7JKRHeapCFv
/* 801BCE28 001B9D68 80 7F 00 E8 */ lwz r3, 0xe8(r31)
/* 801BCE2C 001B9D6C 48 11 19 59 */ bl getTotalFreeSize__7JKRHeapFv
/* 801BCE2C 001B9D6C 48 11 19 59 */ bl getTotalFreeSize__7JKRHeapCFv
/* 801BCE30 001B9D70 80 7F 00 08 */ lwz r3, 8(r31)
/* 801BCE34 001B9D74 28 03 00 00 */ cmplwi r3, 0
/* 801BCE38 001B9D78 41 82 00 24 */ beq lbl_801BCE5C
@@ -6055,10 +6055,10 @@ dMenu_Dmap_c_NS__create:
/* 801BD7D0 001BA710 48 1A 4A 09 */ bl _savegpr_28
/* 801BD7D4 001BA714 7C 7F 1B 78 */ mr r31, r3
/* 801BD7D8 001BA718 80 63 00 E8 */ lwz r3, 0xe8(r3)
/* 801BD7DC 001BA71C 48 11 0F A9 */ bl getTotalFreeSize__7JKRHeapFv
/* 801BD7DC 001BA71C 48 11 0F A9 */ bl getTotalFreeSize__7JKRHeapCFv
/* 801BD7E0 001BA720 83 BF 00 E8 */ lwz r29, 0xe8(r31)
/* 801BD7E4 001BA724 7F A3 EB 78 */ mr r3, r29
/* 801BD7E8 001BA728 48 11 0F 45 */ bl getFreeSize__7JKRHeapFv
/* 801BD7E8 001BA728 48 11 0F 45 */ bl getFreeSize__7JKRHeapCFv
/* 801BD7EC 001BA72C 38 63 FF F0 */ addi r3, r3, -16
/* 801BD7F0 001BA730 7F A4 EB 78 */ mr r4, r29
/* 801BD7F4 001BA734 38 A0 00 00 */ li r5, 0
@@ -6068,7 +6068,7 @@ dMenu_Dmap_c_NS__create:
/* 801BD804 001BA744 4B E5 19 C9 */ bl mDoExt_setCurrentHeap
/* 801BD808 001BA748 7C 7E 1B 78 */ mr r30, r3
/* 801BD80C 001BA74C 80 7F 00 EC */ lwz r3, 0xec(r31)
/* 801BD810 001BA750 48 11 0F 75 */ bl getTotalFreeSize__7JKRHeapFv
/* 801BD810 001BA750 48 11 0F 75 */ bl getTotalFreeSize__7JKRHeapCFv
/* 801BD814 001BA754 38 60 00 FC */ li r3, 0xfc
/* 801BD818 001BA758 48 11 14 35 */ bl __nw__FUl
/* 801BD81C 001BA75C 7C 7D 1B 79 */ or. r29, r3, r3
@@ -6173,7 +6173,7 @@ lbl_801BD984:
/* 801BD98C 001BA8CC 80 7F 00 F0 */ lwz r3, 0xf0(r31)
/* 801BD990 001BA8D0 B0 03 00 28 */ sth r0, 0x28(r3)
/* 801BD994 001BA8D4 80 7F 00 E8 */ lwz r3, 0xe8(r31)
/* 801BD998 001BA8D8 48 11 0D ED */ bl getTotalFreeSize__7JKRHeapFv
/* 801BD998 001BA8D8 48 11 0D ED */ bl getTotalFreeSize__7JKRHeapCFv
/* 801BD99C 001BA8DC 38 60 0D DC */ li r3, 0xddc
/* 801BD9A0 001BA8E0 48 11 12 AD */ bl __nw__FUl
/* 801BD9A4 001BA8E4 7C 60 1B 79 */ or. r0, r3, r3
asm/d/menu/d_menu_fmap.s
+2 -2
View File
@@ -353,7 +353,7 @@ lbl_801C6A70:
/* 801C6AEC 001C3A2C 38 03 D6 64 */ addi r0, r3, lbl_803BD664@l
/* 801C6AF0 001C3A30 90 1E 00 00 */ stw r0, 0(r30)
/* 801C6AF4 001C3A34 80 7E 00 04 */ lwz r3, 4(r30)
/* 801C6AF8 001C3A38 48 10 7C 8D */ bl getTotalFreeSize__7JKRHeapFv
/* 801C6AF8 001C3A38 48 10 7C 8D */ bl getTotalFreeSize__7JKRHeapCFv
/* 801C6AFC 001C3A3C 80 9E 00 8C */ lwz r4, 0x8c(r30)
/* 801C6B00 001C3A40 28 04 00 00 */ cmplwi r4, 0
/* 801C6B04 001C3A44 41 82 00 14 */ beq lbl_801C6B18
@@ -537,7 +537,7 @@ dMenu_Fmap_c_NS__create:
/* 801C6D74 001C3CB4 93 C1 00 28 */ stw r30, 0x28(r1)
/* 801C6D78 001C3CB8 7C 7F 1B 78 */ mr r31, r3
/* 801C6D7C 001C3CBC 80 63 00 04 */ lwz r3, 4(r3)
/* 801C6D80 001C3CC0 48 10 7A 05 */ bl getTotalFreeSize__7JKRHeapFv
/* 801C6D80 001C3CC0 48 10 7A 05 */ bl getTotalFreeSize__7JKRHeapCFv
/* 801C6D84 001C3CC4 38 60 12 48 */ li r3, 0x1248
/* 801C6D88 001C3CC8 48 10 7E C5 */ bl __nw__FUl
/* 801C6D8C 001C3CCC 7C 60 1B 79 */ or. r0, r3, r3
asm/d/menu/d_menu_ring.s
+4 -4
View File
@@ -31,7 +31,7 @@ dMenu_Ring_c:
/* 801E9174 001E60B4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801E9178 001E60B8 98 03 00 E8 */ stb r0, 0xe8(r3)
/* 801E917C 001E60BC 80 7F 00 04 */ lwz r3, 4(r31)
/* 801E9180 001E60C0 48 0E 56 05 */ bl getTotalFreeSize__7JKRHeapFv
/* 801E9180 001E60C0 48 0E 56 05 */ bl getTotalFreeSize__7JKRHeapCFv
/* 801E9184 001E60C4 C0 02 A9 88 */ lfs f0, lbl_80454388-_SDA2_BASE_(r2)
/* 801E9188 001E60C8 D0 1F 05 70 */ stfs f0, 0x570(r31)
/* 801E918C 001E60CC 88 1F 06 BC */ lbz r0, 0x6bc(r31)
@@ -1163,7 +1163,7 @@ lbl_801EA170:
/* 801EA234 001E7174 3A D6 00 08 */ addi r22, r22, 8
/* 801EA238 001E7178 41 80 FF 38 */ blt lbl_801EA170
/* 801EA23C 001E717C 80 7F 00 04 */ lwz r3, 4(r31)
/* 801EA240 001E7180 48 0E 45 45 */ bl getTotalFreeSize__7JKRHeapFv
/* 801EA240 001E7180 48 0E 45 45 */ bl getTotalFreeSize__7JKRHeapCFv
/* 801EA244 001E7184 80 7B 5D 30 */ lwz r3, 0x5d30(r27)
/* 801EA248 001E7188 3C 80 54 49 */ lis r4, 0x54494D47@ha
/* 801EA24C 001E718C 38 84 4D 47 */ addi r4, r4, 0x54494D47@l
@@ -1493,7 +1493,7 @@ lbl_801EA6E4:
/* 801EA72C 001E766C 38 03 DF 5C */ addi r0, r3, lbl_803BDF5C@l
/* 801EA730 001E7670 90 1F 00 00 */ stw r0, 0(r31)
/* 801EA734 001E7674 80 7F 00 04 */ lwz r3, 4(r31)
/* 801EA738 001E7678 48 0E 40 4D */ bl getTotalFreeSize__7JKRHeapFv
/* 801EA738 001E7678 48 0E 40 4D */ bl getTotalFreeSize__7JKRHeapCFv
/* 801EA73C 001E767C 38 00 00 00 */ li r0, 0
/* 801EA740 001E7680 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801EA744 001E7684 38 63 01 88 */ addi r3, r3, lbl_80430188@l
@@ -1663,7 +1663,7 @@ lbl_801EA95C:
/* 801EA988 001E78C8 38 00 00 00 */ li r0, 0
/* 801EA98C 001E78CC 90 1F 00 14 */ stw r0, 0x14(r31)
/* 801EA990 001E78D0 80 7F 00 04 */ lwz r3, 4(r31)
/* 801EA994 001E78D4 48 0E 3D F1 */ bl getTotalFreeSize__7JKRHeapFv
/* 801EA994 001E78D4 48 0E 3D F1 */ bl getTotalFreeSize__7JKRHeapCFv
/* 801EA998 001E78D8 80 7F 01 B8 */ lwz r3, 0x1b8(r31)
/* 801EA99C 001E78DC 28 03 00 00 */ cmplwi r3, 0
/* 801EA9A0 001E78E0 41 82 00 18 */ beq lbl_801EA9B8
asm/d/menu/d_menu_window.s
+2 -2
View File
@@ -3491,7 +3491,7 @@ dMw_c_NS_markMemSize:
/* 801FD0AC 001F9FEC 2C 00 00 00 */ cmpwi r0, 0
/* 801FD0B0 001F9FF0 40 82 00 10 */ bne lbl_801FD0C0
/* 801FD0B4 001F9FF4 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 801FD0B8 001F9FF8 48 0D 16 CD */ bl getTotalFreeSize__7JKRHeapFv
/* 801FD0B8 001F9FF8 48 0D 16 CD */ bl getTotalFreeSize__7JKRHeapCFv
/* 801FD0BC 001F9FFC 90 7F 01 38 */ stw r3, 0x138(r31)
lbl_801FD0C0:
/* 801FD0C0 001FA000 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -3511,7 +3511,7 @@ dMw_c_NS_checkMemSize:
/* 801FD0EC 001FA02C 2C 00 00 00 */ cmpwi r0, 0
/* 801FD0F0 001FA030 40 81 00 3C */ ble lbl_801FD12C
/* 801FD0F4 001FA034 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 801FD0F8 001FA038 48 0D 16 8D */ bl getTotalFreeSize__7JKRHeapFv
/* 801FD0F8 001FA038 48 0D 16 8D */ bl getTotalFreeSize__7JKRHeapCFv
/* 801FD0FC 001FA03C 80 1F 01 38 */ lwz r0, 0x138(r31)
/* 801FD100 001FA040 7C 00 18 51 */ subf. r0, r0, r3
/* 801FD104 001FA044 40 80 00 08 */ bge lbl_801FD10C
asm/d/menu/item/d_menu_item_explain.s
+1 -1
View File
@@ -38,7 +38,7 @@ dMenu_ItemExplain_c:
/* 801DA7CC 001D770C 90 1F 00 08 */ stw r0, 8(r31)
/* 801DA7D0 001D7710 93 DF 00 B8 */ stw r30, 0xb8(r31)
/* 801DA7D4 001D7714 80 7F 00 04 */ lwz r3, 4(r31)
/* 801DA7D8 001D7718 48 0F 3F AD */ bl getTotalFreeSize__7JKRHeapFv
/* 801DA7D8 001D7718 48 0F 3F AD */ bl getTotalFreeSize__7JKRHeapCFv
/* 801DA7DC 001D771C 38 00 00 00 */ li r0, 0
/* 801DA7E0 001D7720 90 1F 00 C8 */ stw r0, 0xc8(r31)
/* 801DA7E4 001D7724 90 1F 00 CC */ stw r0, 0xcc(r31)
asm/d/msg/d_msg_object.s
+2 -2
View File
@@ -3872,7 +3872,7 @@ lbl_802361F4:
/* 80236208 00233148 90 7F 01 44 */ stw r3, 0x144(r31)
lbl_8023620C:
/* 8023620C 0023314C 80 7F 01 44 */ lwz r3, 0x144(r31)
/* 80236210 00233150 48 09 85 75 */ bl getTotalFreeSize__7JKRHeapFv
/* 80236210 00233150 48 09 85 75 */ bl getTotalFreeSize__7JKRHeapCFv
/* 80236214 00233154 3B C0 00 00 */ li r30, 0
/* 80236218 00233158 80 1F 01 0C */ lwz r0, 0x10c(r31)
/* 8023621C 0023315C 28 00 00 00 */ cmplwi r0, 0
@@ -6104,7 +6104,7 @@ dMsgObject_c_NS_setTalkActorLocal:
/* 80237FA8 00234EE8 4B DD 72 25 */ bl mDoExt_setCurrentHeap
/* 80237FAC 00234EEC 7C 7D 1B 78 */ mr r29, r3
/* 80237FB0 00234EF0 80 7F 5E C8 */ lwz r3, 0x5ec8(r31)
/* 80237FB4 00234EF4 48 09 67 D1 */ bl getTotalFreeSize__7JKRHeapFv
/* 80237FB4 00234EF4 48 09 67 D1 */ bl getTotalFreeSize__7JKRHeapCFv
/* 80237FB8 00234EF8 7F C3 F3 78 */ mr r3, r30
/* 80237FBC 00234EFC 4B DE 79 F9 */ bl fopMsgM_setStageLayer
/* 80237FC0 00234F00 38 00 00 00 */ li r0, 0
asm/d/msg/scrn/d_msg_scrn_kanban.s
+1 -1
View File
@@ -28,7 +28,7 @@ lbl_80244E7C:
/* 80244E84 00241DC4 90 7F 00 D4 */ stw r3, 0xd4(r31)
lbl_80244E88:
/* 80244E88 00241DC8 80 7F 00 D4 */ lwz r3, 0xd4(r31)
/* 80244E8C 00241DCC 48 08 98 F9 */ bl getTotalFreeSize__7JKRHeapFv
/* 80244E8C 00241DCC 48 08 98 F9 */ bl getTotalFreeSize__7JKRHeapCFv
/* 80244E90 00241DD0 7F E3 FB 78 */ mr r3, r31
/* 80244E94 00241DD4 4B FF 72 D9 */ bl dMsgScrnBase_c_NS_init
/* 80244E98 00241DD8 38 60 01 18 */ li r3, 0x118

Some files were not shown because too many files have changed in this diff Show More