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/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