diff options
Diffstat (limited to 'src/JSystem/JFramework/JFWSystem.cpp')
| -rw-r--r-- | src/JSystem/JFramework/JFWSystem.cpp | 90 |
1 files changed, 15 insertions, 75 deletions
diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp index 03c2f014d8..283804f3ac 100644 --- a/src/JSystem/JFramework/JFWSystem.cpp +++ b/src/JSystem/JFramework/JFWSystem.cpp @@ -15,70 +15,14 @@ #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTResFont.h" #include "JSystem/JUtility/JUTDbPrint.h" -#include "dol2asm.h" -#include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void firstInit__9JFWSystemFv(); -extern "C" void init__9JFWSystemFv(); -extern "C" u32 maxStdHeaps__Q29JFWSystem11CSetUpParam; -extern "C" u32 sysHeapSize__Q29JFWSystem11CSetUpParam; -extern "C" u32 fifoBufSize__Q29JFWSystem11CSetUpParam; -extern "C" u32 aramAudioBufSize__Q29JFWSystem11CSetUpParam; -extern "C" u32 aramGraphBufSize__Q29JFWSystem11CSetUpParam; -extern "C" u32 streamPriority__Q29JFWSystem11CSetUpParam; -extern "C" u32 decompPriority__Q29JFWSystem11CSetUpParam; -extern "C" u32 aPiecePriority__Q29JFWSystem11CSetUpParam; -extern "C" void* systemFontRes__Q29JFWSystem11CSetUpParam; -extern "C" void* renderMode__Q29JFWSystem11CSetUpParam; -extern "C" u32 exConsoleBufferSize__Q29JFWSystem11CSetUpParam[1 + 1 /* padding */]; -extern "C" u8 rootHeap__9JFWSystem[4]; -extern "C" u8 systemHeap__9JFWSystem[4]; -extern "C" u8 mainThread__9JFWSystem[4]; -extern "C" u8 debugPrint__9JFWSystem[4]; -extern "C" u8 systemFont__9JFWSystem[4]; -extern "C" u8 systemConsoleManager__9JFWSystem[4]; -extern "C" u8 systemConsole__9JFWSystem[4]; - -// -// External References: -// +extern u8 const JUTResFONT_Ascfont_fix12[16736]; -extern "C" void alloc__7JKRHeapFUli(); -extern "C" void* __nw__FUl(); -extern "C" void createRoot__10JKRExpHeapFib(); -extern "C" void create__10JKRExpHeapFUlP7JKRHeapb(); -extern "C" void __ct__9JKRThreadFP8OSThreadi(); -extern "C" void create__7JKRAramFUlUllll(); -extern "C" void __ct__12JUTGraphFifoFUl(); -extern "C" void __ct__10JUTResFontFPC7ResFONTP7JKRHeap(); -extern "C" void start__10JUTDbPrintFP7JUTFontP7JKRHeap(); -extern "C" void changeFont__10JUTDbPrintFP7JUTFont(); -extern "C" void init__10JUTGamePadFv(); -extern "C" void create__12JUTExceptionFP14JUTDirectPrint(); -extern "C" void createConsole__12JUTExceptionFPvUl(); -extern "C" void start__14JUTDirectPrintFv(); -extern "C" void create__12JUTAssertionFv(); -extern "C" void createManager__8JUTVideoFPC16_GXRenderModeObj(); -extern "C" void create__10JUTConsoleFUiUiP7JKRHeap(); -extern "C" void createManager__17JUTConsoleManagerFP7JKRHeap(); -extern "C" void OSInit(); -extern "C" void DVDInit(); -extern "C" extern u8 const JUTResFONT_Ascfont_fix12[16736]; - -// -// Declarations: -// - -/* ############################################################################################## */ /* 80450770-80450774 0001F0 0004+00 1/1 1/1 0/0 .sdata maxStdHeaps__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA s32 JFWSystem::CSetUpParam::maxStdHeaps = 2; +s32 JFWSystem::CSetUpParam::maxStdHeaps = 2; /* 80450774-80450778 0001F4 0004+00 1/1 1/1 0/0 .sdata sysHeapSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::sysHeapSize = 0x400000; +u32 JFWSystem::CSetUpParam::sysHeapSize = 0x400000; /* 804511A0-804511A4 0006A0 0004+00 2/2 0/0 0/0 .sbss rootHeap__9JFWSystem */ JKRExpHeap* JFWSystem::rootHeap; @@ -94,40 +38,38 @@ void JFWSystem::firstInit() { systemHeap = JKRExpHeap::create(CSetUpParam::sysHeapSize, rootHeap, false); } -/* ############################################################################################## */ /* 80450778-8045077C 0001F8 0004+00 1/1 1/1 0/0 .sdata fifoBufSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::fifoBufSize = 0x40000; +u32 JFWSystem::CSetUpParam::fifoBufSize = 0x40000; /* 8045077C-80450780 0001FC 0004+00 1/1 1/1 0/0 .sdata aramAudioBufSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::aramAudioBufSize = 0x800000; +u32 JFWSystem::CSetUpParam::aramAudioBufSize = 0x800000; /* 80450780-80450784 000200 0004+00 1/1 1/1 0/0 .sdata aramGraphBufSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x600000; +u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x600000; /* 80450784-80450788 000204 0004+00 1/1 0/0 0/0 .sdata streamPriority__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::streamPriority = 8; +u32 JFWSystem::CSetUpParam::streamPriority = 8; /* 80450788-8045078C 000208 0004+00 1/1 0/0 0/0 .sdata decompPriority__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::decompPriority = 7; +u32 JFWSystem::CSetUpParam::decompPriority = 7; /* 8045078C-80450790 00020C 0004+00 1/1 0/0 0/0 .sdata aPiecePriority__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::aPiecePriority = 6; +u32 JFWSystem::CSetUpParam::aPiecePriority = 6; /* 80450790-80450794 -00001 0004+00 1/1 0/0 0/0 .sdata systemFontRes__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)&JUTResFONT_Ascfont_fix12; +ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)&JUTResFONT_Ascfont_fix12; /* 80450794-80450798 -00001 0004+00 1/1 1/1 0/0 .sdata renderMode__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = - (GXRenderModeObj*)&GXNtsc480IntDf; +GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = &GXNtsc480IntDf; /* 80450798-804507A0 000218 0004+04 1/1 0/0 0/0 .sdata * exConsoleBufferSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24FC; +u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24FC; /* 804511A8-804511AC 0006A8 0004+00 1/1 0/0 0/0 .sbss mainThread__9JFWSystem */ JKRThread* JFWSystem::mainThread; @@ -148,7 +90,7 @@ JUTConsole* JFWSystem::systemConsole; static u8 sInitCalled; /* 80271D18-80272040 26C658 0328+00 0/0 1/1 0/0 .text init__9JFWSystemFv */ -// NONMATCHING - just regalloc in the beginning +// NONMATCHING - regalloc, equivalent void JFWSystem::init() { if (rootHeap == NULL) { firstInit(); @@ -161,9 +103,7 @@ void JFWSystem::init() { mainThread = new JKRThread(OSGetCurrentThread(), 4); JUTVideo::createManager(CSetUpParam::renderMode); - - u32 fifoSize = CSetUpParam::fifoBufSize; - JUTGraphFifo* fifo = new JUTGraphFifo(fifoSize); + JUTCreateFifo(CSetUpParam::fifoBufSize); JUTGamePad::init(); @@ -199,4 +139,4 @@ void JFWSystem::init() { void* buffer = systemHeap->alloc(CSetUpParam::exConsoleBufferSize, 4); JUTException::createConsole(buffer, CSetUpParam::exConsoleBufferSize); -}
\ No newline at end of file +} |