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

HeapCheck::heapDisplay OK

Browse Source
This commit is contained in:
Pheenoh
2021-01-03 16:34:11 -05:00
parent 423fdadc32
commit f12c5050f3
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h
+2
View File
@@ -28,6 +28,8 @@ public:
CMemBlock* getNextBlock() { return this->mNext; } CMemBlock* getNextBlock() { return this->mNext; }
u32 getSize() { return this->size; }
private: private:
u16 mMagic; u16 mMagic;
u8 mFlags; // a|bbbbbbb a=temporary b=alignment u8 mFlags; // a|bbbbbbb a=temporary b=alignment
src/m_Do/m_Do_main.cpp
+4 -12
View File
@@ -75,15 +75,13 @@ s32 HeapCheck::getUsedCount(void) const {
return countUsed(this->heap); return countUsed(this->heap);
} }
// 1 instruction off
#ifdef NONMATCHING
void HeapCheck::heapDisplay(void) const { void HeapCheck::heapDisplay(void) const {
u32 heap_size1 = heap->heap_size; s32 heap_size1 = this->heap->getSize();
s32 heap_size2 = this->heap->heap_size - this->heap_size; s32 heap_size2 = heap_size1 - this->heap_size;
s32 heap_total_used_size = this->heap->getTotalUsedSize(); s32 heap_total_used_size = this->heap->getTotalUsedSize();
s32 heap_total_free_size = ((JKRHeap*)this->heap)->getTotalFreeSize(); s32 heap_total_free_size = this->heap->getTotalFreeSize();
s32 heap_free_size = ((JKRHeap*)this->heap)->getFreeSize(); s32 heap_free_size = this->heap->getFreeSize();
JUTReport__FiiPCce(0x64, 0xd4, lbl_803739A0 + 0x3C, this->names[0]); JUTReport__FiiPCce(0x64, 0xd4, lbl_803739A0 + 0x3C, this->names[0]);
JUTReport__FiiPCce(0x64, 0xe3, lbl_803739A0 + 0x45, heap_size1); JUTReport__FiiPCce(0x64, 0xe3, lbl_803739A0 + 0x45, heap_size1);
@@ -102,12 +100,6 @@ void HeapCheck::heapDisplay(void) const {
heap_size2 = countUsed(this->heap); heap_size2 = countUsed(this->heap);
JUTReport__FiiPCce(0x64, 0x165, lbl_803739A0 + 0x133, heap_size2); JUTReport__FiiPCce(0x64, 0x165, lbl_803739A0 + 0x133, heap_size2);
} }
#else
asm void HeapCheck::heapDisplay(void) const {
nofralloc
#include "m_Do\m_Do_main\asm\func_800058C4.s"
}
#endif
asm void debugDisplay(void) { asm void debugDisplay(void) {
nofralloc nofralloc