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

Merge branch 'master' of https://github.com/zeldaret/tp

Browse Source
This commit is contained in:
Pheenoh
2021-01-02 17:49:20 -05:00
parent 458be4d8cb ad62061cfc
commit e375712d23
1240 changed files with 142288 additions and 95730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JKernel/JKRAramBlock/JKRAramBlock.h
+3 -3
View File
@@ -10,8 +10,8 @@ public:
JKRAramBlock(u32, u32, u32, u8, bool);
virtual ~JKRAramBlock();
void allocHead(u32, u8, JKRAramHeap*);
void allocTail(u32, u8, JKRAramHeap*);
JKRAramBlock* allocHead(u32, u8, JKRAramHeap*);
JKRAramBlock* allocTail(u32, u8, JKRAramHeap*);
void* getAddress() { return (void*)this->mAddress; }
@@ -25,7 +25,7 @@ public:
JSULink<JKRAramBlock> mBlockLink;
u32 mAddress;
u32 mSize;
u32 field_;
u32 mFreeSize;
u8 mGroupId;
u8 mIsTempMemory;
u8 padding[2];
include/JSystem/JKernel/JKRAramBlock/asm/func_802D3304.s
-31
View File
@@ -1,31 +0,0 @@
/* __ct__12JKRAramBlockFUlUlUlUcb __ct__12JKRAramBlockFUlUlUlUcb::__ct(unsigned long, unsigned long, unsigned long, unsigned char, bool) */
/* JKRAramBlock */
/* 802D3304 002D0244 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802D3308 002D0248 7C 08 02 A6 */ mflr r0
/* 802D330C 002D024C 90 01 00 24 */ stw r0, 0x24(r1)
/* 802D3310 002D0250 39 61 00 20 */ addi r11, r1, 0x20
/* 802D3314 002D0254 48 08 EE BD */ bl _savegpr_26
/* 802D3318 002D0258 7C 7A 1B 78 */ mr r26, r3
/* 802D331C 002D025C 7C 9B 23 78 */ mr r27, r4
/* 802D3320 002D0260 7C BC 2B 78 */ mr r28, r5
/* 802D3324 002D0264 7C DD 33 78 */ mr r29, r6
/* 802D3328 002D0268 7C FE 3B 78 */ mr r30, r7
/* 802D332C 002D026C 7D 1F 43 78 */ mr r31, r8
/* 802D3330 002D0270 3C 60 80 3D */ lis r3, lbl_803CC178@ha
/* 802D3334 002D0274 38 03 C1 78 */ addi r0, r3, lbl_803CC178@l
/* 802D3338 002D0278 90 1A 00 00 */ stw r0, 0(r26)
/* 802D333C 002D027C 38 7A 00 04 */ addi r3, r26, 4
/* 802D3340 002D0280 7F 44 D3 78 */ mr r4, r26
/* 802D3344 002D0284 48 00 8A B9 */ bl __ct__10JSUPtrLinkFPv
/* 802D3348 002D0288 93 7A 00 14 */ stw r27, 0x14(r26)
/* 802D334C 002D028C 93 9A 00 18 */ stw r28, 0x18(r26)
/* 802D3350 002D0290 93 BA 00 1C */ stw r29, 0x1c(r26)
/* 802D3354 002D0294 9B DA 00 20 */ stb r30, 0x20(r26)
/* 802D3358 002D0298 9B FA 00 21 */ stb r31, 0x21(r26)
/* 802D335C 002D029C 7F 43 D3 78 */ mr r3, r26
/* 802D3360 002D02A0 39 61 00 20 */ addi r11, r1, 0x20
/* 802D3364 002D02A4 48 08 EE B9 */ bl _restgpr_26
/* 802D3368 002D02A8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 802D336C 002D02AC 7C 08 03 A6 */ mtlr r0
/* 802D3370 002D02B0 38 21 00 20 */ addi r1, r1, 0x20
/* 802D3374 002D02B4 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAramBlock/asm/func_802D3378.s
-53
View File
@@ -1,53 +0,0 @@
/* __dt__12JKRAramBlockFv __ct__12JKRAramBlockFUlUlUlUcb::__dt(void) */
/* missing reference */
/* 802D3378 002D02B8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802D337C 002D02BC 7C 08 02 A6 */ mflr r0
/* 802D3380 002D02C0 90 01 00 14 */ stw r0, 0x14(r1)
/* 802D3384 002D02C4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802D3388 002D02C8 93 C1 00 08 */ stw r30, 8(r1)
/* 802D338C 002D02CC 7C 7E 1B 79 */ or. r30, r3, r3
/* 802D3390 002D02D0 7C 9F 23 78 */ mr r31, r4
/* 802D3394 002D02D4 41 82 00 84 */ beq lbl_802D3418
/* 802D3398 002D02D8 3C 60 80 3D */ lis r3, lbl_803CC178@ha
/* 802D339C 002D02DC 38 03 C1 78 */ addi r0, r3, lbl_803CC178@l
/* 802D33A0 002D02E0 90 1E 00 00 */ stw r0, 0(r30)
/* 802D33A4 002D02E4 80 7E 00 08 */ lwz r3, 8(r30)
/* 802D33A8 002D02E8 80 9E 00 0C */ lwz r4, 0xc(r30)
/* 802D33AC 002D02EC 28 04 00 00 */ cmplwi r4, 0
/* 802D33B0 002D02F0 41 82 00 2C */ beq lbl_802D33DC
/* 802D33B4 002D02F4 80 C4 00 00 */ lwz r6, 0(r4)
/* 802D33B8 002D02F8 80 A6 00 1C */ lwz r5, 0x1c(r6)
/* 802D33BC 002D02FC 80 9E 00 18 */ lwz r4, 0x18(r30)
/* 802D33C0 002D0300 80 1E 00 1C */ lwz r0, 0x1c(r30)
/* 802D33C4 002D0304 7C 00 2A 14 */ add r0, r0, r5
/* 802D33C8 002D0308 7C 04 02 14 */ add r0, r4, r0
/* 802D33CC 002D030C 90 06 00 1C */ stw r0, 0x1c(r6)
/* 802D33D0 002D0310 38 9E 00 04 */ addi r4, r30, 4
/* 802D33D4 002D0314 48 00 8D 89 */ bl remove__10JSUPtrListFP10JSUPtrLink
/* 802D33D8 002D0318 48 00 00 1C */ b lbl_802D33F4
lbl_802D33DC:
/* 802D33DC 002D031C 80 7E 00 1C */ lwz r3, 0x1c(r30)
/* 802D33E0 002D0320 80 1E 00 18 */ lwz r0, 0x18(r30)
/* 802D33E4 002D0324 7C 03 02 14 */ add r0, r3, r0
/* 802D33E8 002D0328 90 1E 00 1C */ stw r0, 0x1c(r30)
/* 802D33EC 002D032C 38 00 00 00 */ li r0, 0
/* 802D33F0 002D0330 90 1E 00 18 */ stw r0, 0x18(r30)
lbl_802D33F4:
/* 802D33F4 002D0334 34 1E 00 04 */ addic. r0, r30, 4
/* 802D33F8 002D0338 41 82 00 10 */ beq lbl_802D3408
/* 802D33FC 002D033C 38 7E 00 04 */ addi r3, r30, 4
/* 802D3400 002D0340 38 80 00 00 */ li r4, 0
/* 802D3404 002D0344 48 00 8A 11 */ bl __dt__10JSUPtrLinkFv
lbl_802D3408:
/* 802D3408 002D0348 7F E0 07 35 */ extsh. r0, r31
/* 802D340C 002D034C 40 81 00 0C */ ble lbl_802D3418
/* 802D3410 002D0350 7F C3 F3 78 */ mr r3, r30
/* 802D3414 002D0354 4B FF B9 29 */ bl __dl__FPv
lbl_802D3418:
/* 802D3418 002D0358 7F C3 F3 78 */ mr r3, r30
/* 802D341C 002D035C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802D3420 002D0360 83 C1 00 08 */ lwz r30, 8(r1)
/* 802D3424 002D0364 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802D3428 002D0368 7C 08 03 A6 */ mtlr r0
/* 802D342C 002D036C 38 21 00 10 */ addi r1, r1, 0x10
/* 802D3430 002D0370 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAramBlock/asm/func_802D3434.s
-42
View File
@@ -1,42 +0,0 @@
/* allocHead__12JKRAramBlockFUlUcP11JKRAramHeap __ct__12JKRAramBlockFUlUlUlUcb::allocHead(unsigned long, unsigned char, JKRAramHeap *) */
/* JKRAramBlock_NS_allocHead */
/* 802D3434 002D0374 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802D3438 002D0378 7C 08 02 A6 */ mflr r0
/* 802D343C 002D037C 90 01 00 24 */ stw r0, 0x24(r1)
/* 802D3440 002D0380 39 61 00 20 */ addi r11, r1, 0x20
/* 802D3444 002D0384 48 08 ED 8D */ bl _savegpr_26
/* 802D3448 002D0388 7C 7A 1B 78 */ mr r26, r3
/* 802D344C 002D038C 7C 9B 23 78 */ mr r27, r4
/* 802D3450 002D0390 7C BC 2B 78 */ mr r28, r5
/* 802D3454 002D0394 80 63 00 14 */ lwz r3, 0x14(r3)
/* 802D3458 002D0398 80 1A 00 18 */ lwz r0, 0x18(r26)
/* 802D345C 002D039C 7F C3 02 14 */ add r30, r3, r0
/* 802D3460 002D03A0 80 1A 00 1C */ lwz r0, 0x1c(r26)
/* 802D3464 002D03A4 7F BB 00 50 */ subf r29, r27, r0
/* 802D3468 002D03A8 38 60 00 24 */ li r3, 0x24
/* 802D346C 002D03AC 80 86 00 30 */ lwz r4, 0x30(r6)
/* 802D3470 002D03B0 38 A0 00 00 */ li r5, 0
/* 802D3474 002D03B4 4B FF B8 25 */ bl __nw__FUlP7JKRHeapi
/* 802D3478 002D03B8 7C 7F 1B 79 */ or. r31, r3, r3
/* 802D347C 002D03BC 41 82 00 20 */ beq lbl_802D349C
/* 802D3480 002D03C0 7F C4 F3 78 */ mr r4, r30
/* 802D3484 002D03C4 7F 65 DB 78 */ mr r5, r27
/* 802D3488 002D03C8 7F A6 EB 78 */ mr r6, r29
/* 802D348C 002D03CC 7F 87 E3 78 */ mr r7, r28
/* 802D3490 002D03D0 39 00 00 00 */ li r8, 0
/* 802D3494 002D03D4 4B FF FE 71 */ bl __ct__12JKRAramBlockFUlUlUlUcb
/* 802D3498 002D03D8 7C 7F 1B 78 */ mr r31, r3
lbl_802D349C:
/* 802D349C 002D03DC 38 00 00 00 */ li r0, 0
/* 802D34A0 002D03E0 90 1A 00 1C */ stw r0, 0x1c(r26)
/* 802D34A4 002D03E4 80 9A 00 10 */ lwz r4, 0x10(r26)
/* 802D34A8 002D03E8 80 7A 00 08 */ lwz r3, 8(r26)
/* 802D34AC 002D03EC 38 BF 00 04 */ addi r5, r31, 4
/* 802D34B0 002D03F0 48 00 8B E5 */ bl insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink
/* 802D34B4 002D03F4 7F E3 FB 78 */ mr r3, r31
/* 802D34B8 002D03F8 39 61 00 20 */ addi r11, r1, 0x20
/* 802D34BC 002D03FC 48 08 ED 61 */ bl _restgpr_26
/* 802D34C0 002D0400 80 01 00 24 */ lwz r0, 0x24(r1)
/* 802D34C4 002D0404 7C 08 03 A6 */ mtlr r0
/* 802D34C8 002D0408 38 21 00 20 */ addi r1, r1, 0x20
/* 802D34CC 002D040C 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAramBlock/asm/func_802D34D0.s
-44
View File
@@ -1,44 +0,0 @@
/* allocTail__12JKRAramBlockFUlUcP11JKRAramHeap __ct__12JKRAramBlockFUlUlUlUcb::allocTail(unsigned long, unsigned char, JKRAramHeap *) */
/* JKRAramBlock_NS_allocTail */
/* 802D34D0 002D0410 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802D34D4 002D0414 7C 08 02 A6 */ mflr r0
/* 802D34D8 002D0418 90 01 00 24 */ stw r0, 0x24(r1)
/* 802D34DC 002D041C 39 61 00 20 */ addi r11, r1, 0x20
/* 802D34E0 002D0420 48 08 EC F5 */ bl _savegpr_27
/* 802D34E4 002D0424 7C 7B 1B 78 */ mr r27, r3
/* 802D34E8 002D0428 7C 9C 23 78 */ mr r28, r4
/* 802D34EC 002D042C 7C BD 2B 78 */ mr r29, r5
/* 802D34F0 002D0430 80 83 00 1C */ lwz r4, 0x1c(r3)
/* 802D34F4 002D0434 80 63 00 14 */ lwz r3, 0x14(r3)
/* 802D34F8 002D0438 80 1B 00 18 */ lwz r0, 0x18(r27)
/* 802D34FC 002D043C 7C 00 22 14 */ add r0, r0, r4
/* 802D3500 002D0440 7C 03 02 14 */ add r0, r3, r0
/* 802D3504 002D0444 7F DC 00 50 */ subf r30, r28, r0
/* 802D3508 002D0448 38 60 00 24 */ li r3, 0x24
/* 802D350C 002D044C 80 86 00 30 */ lwz r4, 0x30(r6)
/* 802D3510 002D0450 38 A0 00 00 */ li r5, 0
/* 802D3514 002D0454 4B FF B7 85 */ bl __nw__FUlP7JKRHeapi
/* 802D3518 002D0458 7C 7F 1B 79 */ or. r31, r3, r3
/* 802D351C 002D045C 41 82 00 20 */ beq lbl_802D353C
/* 802D3520 002D0460 7F C4 F3 78 */ mr r4, r30
/* 802D3524 002D0464 7F 85 E3 78 */ mr r5, r28
/* 802D3528 002D0468 38 C0 00 00 */ li r6, 0
/* 802D352C 002D046C 7F A7 EB 78 */ mr r7, r29
/* 802D3530 002D0470 39 00 00 01 */ li r8, 1
/* 802D3534 002D0474 4B FF FD D1 */ bl __ct__12JKRAramBlockFUlUlUlUcb
/* 802D3538 002D0478 7C 7F 1B 78 */ mr r31, r3
lbl_802D353C:
/* 802D353C 002D047C 80 1B 00 1C */ lwz r0, 0x1c(r27)
/* 802D3540 002D0480 7C 1C 00 50 */ subf r0, r28, r0
/* 802D3544 002D0484 90 1B 00 1C */ stw r0, 0x1c(r27)
/* 802D3548 002D0488 80 9B 00 10 */ lwz r4, 0x10(r27)
/* 802D354C 002D048C 80 7B 00 08 */ lwz r3, 8(r27)
/* 802D3550 002D0490 38 BF 00 04 */ addi r5, r31, 4
/* 802D3554 002D0494 48 00 8B 41 */ bl insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink
/* 802D3558 002D0498 7F E3 FB 78 */ mr r3, r31
/* 802D355C 002D049C 39 61 00 20 */ addi r11, r1, 0x20
/* 802D3560 002D04A0 48 08 EC C1 */ bl _restgpr_27
/* 802D3564 002D04A4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 802D3568 002D04A8 7C 08 03 A6 */ mtlr r0
/* 802D356C 002D04AC 38 21 00 20 */ addi r1, r1, 0x20
/* 802D3570 002D04B0 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h
+3 -3
View File
@@ -12,8 +12,8 @@ protected:
public:
/* vt[04] */ virtual u32 getHeapType(void); /* override */
/* vt[05] */ virtual bool check(void); /* override */
/* vt[06] */ virtual bool dump(void); /* override */
/* vt[07] */ virtual void dump_sort(void); /* override */
/* vt[06] */ virtual bool dump_sort(void); /* override */
/* vt[07] */ virtual bool dump(void); /* override */
/* vt[08] */ virtual void do_destroy(void); /* override */
/* vt[09] */ virtual void* do_alloc(u32, int); /* override */
/* vt[10] */ virtual void do_free(void*); /* override */
@@ -29,7 +29,7 @@ public:
/* vt[20] */ virtual u8 do_getCurrentGroupId(void); /* override */
public:
static void create(JKRHeap*);
static JKRAssertHeap* create(JKRHeap*);
};
#endif
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D12C4.s
-17
View File
@@ -1,17 +0,0 @@
/* __ct__13JKRAssertHeapFPvUlP7JKRHeapb __ct__13JKRAssertHeapFPvUlP7JKRHeapb::__ct(void *, unsigned long, JKRHeap *, bool) */
/* JKRAssertHeap */
/* 802D12C4 002CE204 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802D12C8 002CE208 7C 08 02 A6 */ mflr r0
/* 802D12CC 002CE20C 90 01 00 14 */ stw r0, 0x14(r1)
/* 802D12D0 002CE210 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802D12D4 002CE214 7C 7F 1B 78 */ mr r31, r3
/* 802D12D8 002CE218 4B FF CE 61 */ bl __ct__7JKRHeapFPvUlP7JKRHeapb
/* 802D12DC 002CE21C 3C 60 80 3D */ lis r3, lbl_803CC090@ha
/* 802D12E0 002CE220 38 03 C0 90 */ addi r0, r3, lbl_803CC090@l
/* 802D12E4 002CE224 90 1F 00 00 */ stw r0, 0(r31)
/* 802D12E8 002CE228 7F E3 FB 78 */ mr r3, r31
/* 802D12EC 002CE22C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802D12F0 002CE230 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802D12F4 002CE234 7C 08 03 A6 */ mtlr r0
/* 802D12F8 002CE238 38 21 00 10 */ addi r1, r1, 0x10
/* 802D12FC 002CE23C 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1300.s
-29
View File
@@ -1,29 +0,0 @@
/* __dt__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::__dt(void) */
/* missing reference */
/* 802D1300 002CE240 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802D1304 002CE244 7C 08 02 A6 */ mflr r0
/* 802D1308 002CE248 90 01 00 14 */ stw r0, 0x14(r1)
/* 802D130C 002CE24C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802D1310 002CE250 93 C1 00 08 */ stw r30, 8(r1)
/* 802D1314 002CE254 7C 7E 1B 79 */ or. r30, r3, r3
/* 802D1318 002CE258 7C 9F 23 78 */ mr r31, r4
/* 802D131C 002CE25C 41 82 00 30 */ beq lbl_802D134C
/* 802D1320 002CE260 3C 80 80 3D */ lis r4, lbl_803CC090@ha
/* 802D1324 002CE264 38 04 C0 90 */ addi r0, r4, lbl_803CC090@l
/* 802D1328 002CE268 90 1E 00 00 */ stw r0, 0(r30)
/* 802D132C 002CE26C 4B FF D7 95 */ bl dispose__7JKRHeapFv
/* 802D1330 002CE270 7F C3 F3 78 */ mr r3, r30
/* 802D1334 002CE274 38 80 00 00 */ li r4, 0
/* 802D1338 002CE278 4B FF CF 2D */ bl __dt__7JKRHeapFv
/* 802D133C 002CE27C 7F E0 07 35 */ extsh. r0, r31
/* 802D1340 002CE280 40 81 00 0C */ ble lbl_802D134C
/* 802D1344 002CE284 7F C3 F3 78 */ mr r3, r30
/* 802D1348 002CE288 4B FF D9 F5 */ bl __dl__FPv
lbl_802D134C:
/* 802D134C 002CE28C 7F C3 F3 78 */ mr r3, r30
/* 802D1350 002CE290 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802D1354 002CE294 83 C1 00 08 */ lwz r30, 8(r1)
/* 802D1358 002CE298 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802D135C 002CE29C 7C 08 03 A6 */ mtlr r0
/* 802D1360 002CE2A0 38 21 00 10 */ addi r1, r1, 0x10
/* 802D1364 002CE2A4 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1368.s
-34
View File
@@ -1,34 +0,0 @@
/* create__13JKRAssertHeapFP7JKRHeap __ct__13JKRAssertHeapFPvUlP7JKRHeapb::create(JKRHeap *) */
/* JKRAssertHeap_NS_create */
/* 802D1368 002CE2A8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802D136C 002CE2AC 7C 08 02 A6 */ mflr r0
/* 802D1370 002CE2B0 90 01 00 14 */ stw r0, 0x14(r1)
/* 802D1374 002CE2B4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802D1378 002CE2B8 7C 7F 1B 79 */ or. r31, r3, r3
/* 802D137C 002CE2BC 40 82 00 08 */ bne lbl_802D1384
/* 802D1380 002CE2C0 83 ED 8D F8 */ lwz r31, lbl_80451378-_SDA_BASE_(r13)
lbl_802D1384:
/* 802D1384 002CE2C4 38 60 00 70 */ li r3, 0x70
/* 802D1388 002CE2C8 38 80 00 10 */ li r4, 0x10
/* 802D138C 002CE2CC 7F E5 FB 78 */ mr r5, r31
/* 802D1390 002CE2D0 4B FF D0 E5 */ bl alloc__7JKRHeapFUliP7JKRHeap
/* 802D1394 002CE2D4 7C 60 1B 79 */ or. r0, r3, r3
/* 802D1398 002CE2D8 40 82 00 0C */ bne lbl_802D13A4
/* 802D139C 002CE2DC 38 60 00 00 */ li r3, 0
/* 802D13A0 002CE2E0 48 00 00 24 */ b lbl_802D13C4
lbl_802D13A4:
/* 802D13A4 002CE2E4 41 82 00 1C */ beq lbl_802D13C0
/* 802D13A8 002CE2E8 38 80 00 00 */ li r4, 0
/* 802D13AC 002CE2EC 38 A0 00 00 */ li r5, 0
/* 802D13B0 002CE2F0 7F E6 FB 78 */ mr r6, r31
/* 802D13B4 002CE2F4 38 E0 00 00 */ li r7, 0
/* 802D13B8 002CE2F8 4B FF FF 0D */ bl __ct__13JKRAssertHeapFPvUlP7JKRHeapb
/* 802D13BC 002CE2FC 7C 60 1B 78 */ mr r0, r3
lbl_802D13C0:
/* 802D13C0 002CE300 7C 03 03 78 */ mr r3, r0
lbl_802D13C4:
/* 802D13C4 002CE304 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802D13C8 002CE308 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802D13CC 002CE30C 7C 08 03 A6 */ mtlr r0
/* 802D13D0 002CE310 38 21 00 10 */ addi r1, r1, 0x10
/* 802D13D4 002CE314 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D13D8.s
-14
View File
@@ -1,14 +0,0 @@
/* do_destroy__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_destroy(void) */
/* missing reference */
/* 802D13D8 002CE318 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802D13DC 002CE31C 7C 08 02 A6 */ mflr r0
/* 802D13E0 002CE320 90 01 00 14 */ stw r0, 0x14(r1)
/* 802D13E4 002CE324 38 80 FF FF */ li r4, -1
/* 802D13E8 002CE328 81 83 00 00 */ lwz r12, 0(r3)
/* 802D13EC 002CE32C 81 8C 00 08 */ lwz r12, 8(r12)
/* 802D13F0 002CE330 7D 89 03 A6 */ mtctr r12
/* 802D13F4 002CE334 4E 80 04 21 */ bctrl
/* 802D13F8 002CE338 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802D13FC 002CE33C 7C 08 03 A6 */ mtlr r0
/* 802D1400 002CE340 38 21 00 10 */ addi r1, r1, 0x10
/* 802D1404 002CE344 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1408.s
-5
View File
@@ -1,5 +0,0 @@
/* getHeapType__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::getHeapType(void) */
/* missing reference */
/* 802D1408 002CE348 3C 60 41 53 */ lis r3, 0x41535448@ha
/* 802D140C 002CE34C 38 63 54 48 */ addi r3, r3, 0x41535448@l
/* 802D1410 002CE350 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1414.s
-4
View File
@@ -1,4 +0,0 @@
/* check__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::check(void) */
/* missing reference */
/* 802D1414 002CE354 38 60 00 01 */ li r3, 1
/* 802D1418 002CE358 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D141C.s
-4
View File
@@ -1,4 +0,0 @@
/* dump__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::dump(void) */
/* missing reference */
/* 802D141C 002CE35C 38 60 00 01 */ li r3, 1
/* 802D1420 002CE360 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1424.s
-4
View File
@@ -1,4 +0,0 @@
/* dump_sort__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::dump_sort(void) */
/* missing reference */
/* 802D1424 002CE364 38 60 00 01 */ li r3, 1
/* 802D1428 002CE368 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D142C.s
-4
View File
@@ -1,4 +0,0 @@
/* do_changeGroupID__13JKRAssertHeapFUc __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_changeGroupID(unsigned char) */
/* missing reference */
/* 802D142C 002CE36C 38 60 00 00 */ li r3, 0
/* 802D1430 002CE370 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1434.s
-4
View File
@@ -1,4 +0,0 @@
/* do_getCurrentGroupId__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_getCurrentGroupId(void) */
/* missing reference */
/* 802D1434 002CE374 38 60 00 00 */ li r3, 0
/* 802D1438 002CE378 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D143C.s
-4
View File
@@ -1,4 +0,0 @@
/* do_alloc__13JKRAssertHeapFUli __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_alloc(unsigned long, int) */
/* missing reference */
/* 802D143C 002CE37C 38 60 00 00 */ li r3, 0
/* 802D1440 002CE380 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1444.s
-3
View File
@@ -1,3 +0,0 @@
/* do_free__13JKRAssertHeapFPv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_free(void *) */
/* missing reference */
/* 802D1444 002CE384 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1448.s
-3
View File
@@ -1,3 +0,0 @@
/* do_freeAll__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_freeAll(void) */
/* missing reference */
/* 802D1448 002CE388 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D144C.s
-3
View File
@@ -1,3 +0,0 @@
/* do_freeTail__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_freeTail(void) */
/* missing reference */
/* 802D144C 002CE38C 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1450.s
-3
View File
@@ -1,3 +0,0 @@
/* do_fillFreeArea__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_fillFreeArea(void) */
/* missing reference */
/* 802D1450 002CE390 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1454.s
-4
View File
@@ -1,4 +0,0 @@
/* do_resize__13JKRAssertHeapFPvUl __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_resize(void *, unsigned long) */
/* missing reference */
/* 802D1454 002CE394 38 60 00 00 */ li r3, 0
/* 802D1458 002CE398 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D145C.s
-4
View File
@@ -1,4 +0,0 @@
/* do_getSize__13JKRAssertHeapFPv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_getSize(void *) */
/* missing reference */
/* 802D145C 002CE39C 38 60 00 00 */ li r3, 0
/* 802D1460 002CE3A0 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1464.s
-4
View File
@@ -1,4 +0,0 @@
/* do_getFreeSize__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_getFreeSize(void) */
/* missing reference */
/* 802D1464 002CE3A4 38 60 00 00 */ li r3, 0
/* 802D1468 002CE3A8 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D146C.s
-4
View File
@@ -1,4 +0,0 @@
/* do_getMaxFreeBlock__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_getMaxFreeBlock(void) */
/* missing reference */
/* 802D146C 002CE3AC 38 60 00 00 */ li r3, 0
/* 802D1470 002CE3B0 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1474.s
-4
View File
@@ -1,4 +0,0 @@
/* do_getTotalFreeSize__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_getTotalFreeSize(void) */
/* missing reference */
/* 802D1474 002CE3B4 38 60 00 00 */ li r3, 0
/* 802D1478 002CE3B8 4E 80 00 20 */ blr
include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h
+2 -2
View File
@@ -59,7 +59,7 @@ public:
public:
/* vt[04] */ virtual u32 getHeapType(); /* override */
/* vt[05] */ virtual bool check(); /* override */
/* vt[06] */ virtual void dump_sort(); /* override */
/* vt[06] */ virtual bool dump_sort(); /* override */
/* vt[07] */ virtual bool dump(); /* override */
/* vt[08] */ virtual void do_destroy(); /* override */
/* vt[09] */ virtual void* do_alloc(u32 size, int alignment); /* override */
@@ -72,7 +72,7 @@ public:
/* vt[16] */ virtual s32 do_getFreeSize(); /* override */
/* vt[17] */ virtual void* do_getMaxFreeBlock(); /* override */
/* vt[18] */ virtual s32 do_getTotalFreeSize(); /* override */
/* vt[19] */ virtual u8 do_changeGroupID(u8 param_1); /* override */
/* vt[19] */ virtual u8 do_changeGroupID(u8 newGroupID); /* override */
/* vt[20] */ virtual u8 do_getCurrentGroupId(); /* override */
/* vt[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */
/* vt[22] */ virtual bool state_compare(JKRHeap::TState const&,
include/JSystem/JKernel/JKRHeap/JKRHeap.h
+7 -3
View File
@@ -38,13 +38,13 @@ public:
void dispose(void* begin, void* end);
void dispose();
bool setErrorFlag(bool param_1);
bool setErrorFlag(bool errorFlag);
bool isSubHeap(JKRHeap* heap) const;
/* vt[03] */ virtual void callAllDisposer();
/* vt[04] */ virtual u32 getHeapType() = 0;
/* vt[05] */ virtual bool check() = 0;
/* vt[06] */ virtual void dump_sort();
/* vt[06] */ virtual bool dump_sort();
/* vt[07] */ virtual bool dump() = 0;
/* vt[08] */ virtual void do_destroy() = 0;
/* vt[09] */ virtual void* do_alloc(u32 size, int alignment) = 0;
@@ -57,7 +57,7 @@ public:
/* vt[16] */ virtual s32 do_getFreeSize() = 0;
/* vt[17] */ virtual void* do_getMaxFreeBlock() = 0;
/* vt[18] */ virtual s32 do_getTotalFreeSize() = 0;
/* vt[19] */ virtual u8 do_changeGroupID(u8 param_1);
/* vt[19] */ virtual u8 do_changeGroupID(u8 newGroupID);
/* vt[20] */ virtual u8 do_getCurrentGroupId();
/* vt[21] */ virtual void state_register(JKRHeap::TState*, unsigned long) const;
/* vt[22] */ virtual bool state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const;
@@ -146,4 +146,8 @@ void* operator new[](u32 size, JKRHeap* heap, int alignment);
void operator delete(void* ptr);
void operator delete[](void* ptr);
inline void* operator new(u32 size, void* ptr) {
return ptr;
}
#endif
include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h
+1 -1
View File
@@ -7,7 +7,7 @@
class JKRSolidHeap : public JKRHeap {
protected:
JKRSolidHeap(void*, u32, JKRHeap*, bool);
virtual ~JKRSolidHeap(void);
virtual ~JKRSolidHeap();
void adjustSize(void);
void allocFromHead(u32, int);
include/JSystem/JSupport/JSUList/JSUList.h
+5
View File
@@ -3,6 +3,9 @@
#include "dolphin/types.h"
template <typename T>
class JSUList;
//
// Link
//
@@ -35,6 +38,8 @@ public:
T* getObject() const { return (T*)getObjectPtr(); }
JSUList<T>* getSupervisor() const { return (JSUList<T>*)this->getList(); }
JSULink<T>* getNext() const { return (JSULink<T>*)this->JSUPtrLink::getNext(); }
JSULink<T>* getPrev() const { return (JSULink<T>*)this->JSUPtrLink::getPrev(); }
include/JSystem/JUtility/JUTGamePad/JUTGamePad.h
+7 -6
View File
@@ -7,13 +7,14 @@
#include "os/OS.h"
#include "pad/pad.h"
typedef u32 EPadPort;
typedef u32 EStickMode;
typedef u32 EWhichStick;
class JUTGamePad : public JKRDisposer {
struct JUTGamePad : public JKRDisposer {
public:
JUTGamePad(EPadPort port);
// typedef u32 EPadPort;
enum EPadPort { Port_1 = 0, Port_2 = 0, Port_3 = 0, Port_4 = 0 };
JUTGamePad(JUTGamePad::EPadPort port);
virtual ~JUTGamePad();
void initList();
@@ -23,9 +24,10 @@ public:
void assign();
void checkResetCallback(OSTime unk); // todo: weird arg
void update();
void stopPatternedRumble() { this->rumble.stopPatternedRumble(this->pad_port); }
static void checkResetSwitch();
static void clearForReset();
static JUTGamePad* getGamePad(s32 pad_index);
static JUTGamePad* getGamePad(int pad_index);
static bool recalibrate(PADMask pad_mask);
struct CButton {
@@ -90,7 +92,6 @@ public:
u8* field_0x10;
};
private:
CButton buttons;
CStick control_stick;
CStick c_stick;
@@ -134,7 +135,7 @@ extern float lbl_80456028; // JUTGamePad::CStick::clear() init to
extern bool lbl_804514E4[4]; // JUTGamePad::CRumble::mStatus (static?)
extern PADMask lbl_804514E8; // JUTGamePad::CRumble::mEnabled (static?)
extern PADMask lbl_803CC5F0[4]; // JUTGamePad::CRumble::sChannelMask
extern s32 lbl_804514DC; // JUTGamePad::sAnalogMode
extern s32 sAnalogMode; // JUTGamePad::sAnalogMode
extern bool lbl_804514D0; // JUTGamePad::mIsPadListInitialized
extern JSUList<JUTGamePad> lbl_804343E4; // JUTGamePad::mPadList
// extern JSUPtrList lbl_804343E4; // JUTGamePad::mPadList