mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
j2d / map_path work, d_drawlist / d_attention cleanup (#208)
* work on fop actor / actor mng, daalink, d_a_obj_item * d_a_title mostly decompiled * daalink / d_event / JMessage / dmsg_out_font work * msg_scrn_base / msg_scrn_boss * some work on mDo machine, d_menu_save, d_tresure, and various * remove asm * progress * finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data * rename more data * remove asm / progress * match all of d_pane_class * fixes / some dKankyo doc * bunch of j2d work. d_drawlist / d_attention cleanup * progress / asm * cleanup wip * decompile JStage * setup some more JStudio structs * set up d_demo classes * some d_demo work * cleanup dolphin os stuff * some initial dEvent documentation * some At collision documentation * match JUTConsole::doDraw * dbgs work / split up some of d_a_alink into .inc files * d_a_alink_spinner work
This commit is contained in:
@@ -205,7 +205,7 @@ bool JKRAramArchive::open(s32 entryNum) {
|
||||
mExpandedSize =
|
||||
(s32*)JKRAllocFromHeap(mHeap, mArcInfoBlock->num_file_entries * 4, abs(align));
|
||||
if (mExpandedSize == NULL) {
|
||||
JKRFree(mArcInfoBlock);
|
||||
i_JKRFree(mArcInfoBlock);
|
||||
mMountMode = UNKNOWN_MOUNT_MODE;
|
||||
goto end;
|
||||
} else {
|
||||
@@ -218,10 +218,10 @@ bool JKRAramArchive::open(s32 entryNum) {
|
||||
mMountDirection == MOUNT_DIRECTION_HEAD ? JKRAramHeap::HEAD : JKRAramHeap::TAIL));
|
||||
if (mBlock == NULL) {
|
||||
if (mArcInfoBlock != NULL) {
|
||||
JKRFree(mArcInfoBlock);
|
||||
i_JKRFree(mArcInfoBlock);
|
||||
}
|
||||
if (mExpandedSize != NULL) {
|
||||
JKRFree(mExpandedSize);
|
||||
i_JKRFree(mExpandedSize);
|
||||
}
|
||||
mMountMode = UNKNOWN_MOUNT_MODE;
|
||||
} else {
|
||||
|
||||
@@ -200,7 +200,7 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) {
|
||||
}
|
||||
|
||||
if (command->mAllocatedTransferBuffer) {
|
||||
JKRFree(buffer);
|
||||
i_JKRFree(buffer);
|
||||
command->mAllocatedTransferBuffer = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ JKRDvdArchive::~JKRDvdArchive() {
|
||||
}
|
||||
|
||||
if (mExpandedSize) {
|
||||
JKRFree(mExpandedSize);
|
||||
i_JKRFree(mExpandedSize);
|
||||
mExpandedSize = NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -97,12 +97,12 @@ extern "C" u8 mErrorHandler__7JKRHeap[4];
|
||||
//
|
||||
|
||||
/* 802CEDB4-802CEE2C 2C96F4 0078+00 0/0 1/1 0/0 .text createRoot__10JKRExpHeapFib */
|
||||
JKRExpHeap* JKRExpHeap::createRoot(int param_0, bool errorFlag) {
|
||||
JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) {
|
||||
JKRExpHeap* heap = NULL;
|
||||
if (!sRootHeap) {
|
||||
void* memory;
|
||||
u32 memorySize;
|
||||
initArena((char**)&memory, &memorySize, param_0);
|
||||
initArena((char**)&memory, &memorySize, maxHeaps);
|
||||
u8* start = (u8*)memory + ALIGN_NEXT(sizeof(JKRExpHeap), 0x10);
|
||||
u32 alignedSize = memorySize - ALIGN_NEXT(sizeof(JKRExpHeap), 0x10);
|
||||
heap = new (memory) JKRExpHeap(start, alignedSize, NULL, errorFlag);
|
||||
|
||||
@@ -204,27 +204,27 @@ void* JKRHeap::mUserRamEnd;
|
||||
u32 JKRHeap::mMemorySize;
|
||||
|
||||
/* 802CE378-802CE428 2C8CB8 00B0+00 0/0 1/1 0/0 .text initArena__7JKRHeapFPPcPUli */
|
||||
bool JKRHeap::initArena(char** memory, u32* size, int param_3) {
|
||||
bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) {
|
||||
u32 ram_start;
|
||||
u32 ram_end;
|
||||
u32 ram;
|
||||
void* ram;
|
||||
|
||||
u32 low = OSGetArenaLo();
|
||||
u32 high = OSGetArenaHi();
|
||||
void* low = OSGetArenaLo();
|
||||
void* high = OSGetArenaHi();
|
||||
if (low == high)
|
||||
return false;
|
||||
|
||||
ram = OSInitAlloc(low, high, param_3);
|
||||
ram_start = ALIGN_NEXT(ram, 0x20);
|
||||
ram_end = ALIGN_PREV(high, 0x20);
|
||||
ram = OSInitAlloc(low, high, maxHeaps);
|
||||
ram_start = ALIGN_NEXT((u32)ram, 0x20);
|
||||
ram_end = ALIGN_PREV((u32)high, 0x20);
|
||||
GLOBAL_MEMORY* globalMemory = (GLOBAL_MEMORY*)OSPhysicalToCached(0);
|
||||
mCodeStart = globalMemory;
|
||||
mCodeEnd = (void*)ram_start;
|
||||
mUserRamStart = (void*)ram_start;
|
||||
mUserRamEnd = (void*)ram_end;
|
||||
mMemorySize = globalMemory->memory_size;
|
||||
OSSetArenaLo(ram_end);
|
||||
OSSetArenaHi(ram_end);
|
||||
OSSetArenaLo((void*)ram_end);
|
||||
OSSetArenaHi((void*)ram_end);
|
||||
*memory = (char*)ram_start;
|
||||
*size = ram_end - ram_start;
|
||||
return true;
|
||||
|
||||
@@ -134,7 +134,6 @@ extern "C" void orderSync__9JKRDecompFPUcPUcUlUl();
|
||||
extern "C" void prepend__10JSUPtrListFP10JSUPtrLink();
|
||||
extern "C" void remove__10JSUPtrListFP10JSUPtrLink();
|
||||
extern "C" void panic_f__12JUTExceptionFPCciPCce();
|
||||
extern "C" void DCInvalidateRange();
|
||||
extern "C" void _savegpr_28();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_28();
|
||||
|
||||
@@ -97,7 +97,7 @@ JKRThread::~JKRThread() {
|
||||
JKRFreeToHeap(mHeap, mStackMemory);
|
||||
JKRFreeToHeap(mHeap, mThreadRecord);
|
||||
}
|
||||
JKRFree(mMessages);
|
||||
i_JKRFree(mMessages);
|
||||
}
|
||||
|
||||
/* 802D1830-802D18A4 2CC170 0074+00 3/3 0/0 0/0 .text setCommon_mesgQueue__9JKRThreadFP7JKRHeapi
|
||||
|
||||
Reference in New Issue
Block a user