mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-14 21:39:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc matches (#2845)

Browse Source 
* Misc debug matches

* Fix d_map weak function order

* Remove old nonmatching comments

* d_menu_dmap and JASAudioThread OK, fix weak func order and rodata alignment

* More misc matches
This commit is contained in:
LagoLunatic
2025-11-21 18:52:16 -05:00
committed by GitHub
parent 3f6f4ae616
commit d161aec619
55 changed files with 341 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m_Do/m_Do_ext.cpp
+47 -8
View File
@@ -411,7 +411,7 @@ static void dummy2() {
J3DTevSwapModeTable tevSwapModeTable;
J3DIndTexOrder indTexOrder;
J3DTevStage* tevStage_p;
J3DTevStage* tevStage_p = NULL;
J3DTevStageInfo tevStageInfo;
tevStage_p->setTevStageInfo(tevStageInfo);
J3DTevStage tevStage;
@@ -452,7 +452,7 @@ static void dummy2() {
peBlock->setBlend(blend);
J3DZMode zMode;
peBlock->setZMode(zMode);
u8 compLoc;
u8 compLoc = 0;
peBlock->setZCompLoc(compLoc);
colorBlock->getColorChanNum();
@@ -770,29 +770,68 @@ JKRExpHeap* mDoExt_getHostIOHeap() {
return HostIOHeap;
}
#ifdef DEBUG
extern u8 lbl_8074C3B9[1];
#endif
/* 8000EE40-8000EED8 009780 0098+00 3/3 0/0 0/0 .text mDoExt_createSolidHeap__FUlP7JKRHeapUl */
static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_alignment) {
if (i_heap == NULL) {
i_heap = JKRHeap::getCurrentHeap();
i_heap = JKRGetCurrentHeap();
}
JKRSolidHeap* createdHeap;
if (i_size == 0 || i_size == 0xFFFFFFFF) {
createdHeap = JKRSolidHeap::create(0xFFFFFFFF, i_heap, false);
if (i_size == 0 || i_size == -1) {
#ifdef DEBUG
if (lbl_8074C3B9[0] != 0) {
OS_REPORT("\x1b[44mmDoExt_createSolidHeap サイズ未設定\n\x1b[m");
OS_REPORT("最大空き容量確保します %08x\n\x1b[m", i_heap->getFreeSize());
}
#endif
createdHeap = JKRCreateSolidHeap(-1, i_heap, false);
} else {
u32 solidHeapSize = ALIGN_NEXT(sizeof(JKRSolidHeap), 0x10);
i_size = ALIGN_NEXT(i_size, 0x10);
i_size += 0x80;
i_size += solidHeapSize;
if (0x10 < i_alignment) {
i_size = (i_alignment - 0x10 + i_size);
}
createdHeap = JKRSolidHeap::create(i_size, i_heap, false);
createdHeap = JKRCreateSolidHeap(i_size, i_heap, false);
}
if (createdHeap != NULL) {
createdHeap->setErrorFlag(true);
JKRSetErrorFlag(createdHeap, true);
#ifdef DEBUG
if (lbl_8074C3B9[0] != 0) {
u32 heapSize = createdHeap->getHeapSize();
OS_REPORT(
"JKRCreateSolidHeap %08x i_size=%08x solidHeapSize=%08x\n",
createdHeap,
i_size,
heapSize
);
}
#endif
}
#ifdef DEBUG
if (createdHeap == NULL) {
OS_WARNING(
"mDoExt_createMaxSolidHeap : ソリッドヒープ%fKの確保に失敗 連続空き容量=%fK 残り空き容量=%f\n",
i_size / 1024.0f,
i_heap->getFreeSize() / 1024.0f,
i_heap->getTotalFreeSize() / 1024.0f
);
static BOOL dumped = FALSE;
if (dumped == FALSE) {
dumped = TRUE;
i_heap->dump_sort();
}
return createdHeap;
}
#endif
return createdHeap;
}