diff options
Diffstat (limited to 'libs/JSystem/JFramework/JFWSystem.cpp')
| -rw-r--r-- | libs/JSystem/JFramework/JFWSystem.cpp | 79 |
1 files changed, 58 insertions, 21 deletions
diff --git a/libs/JSystem/JFramework/JFWSystem.cpp b/libs/JSystem/JFramework/JFWSystem.cpp index 19bf2c0234..dad2e433e3 100644 --- a/libs/JSystem/JFramework/JFWSystem.cpp +++ b/libs/JSystem/JFramework/JFWSystem.cpp @@ -79,8 +79,30 @@ struct JKRAram { }; struct JFWSystem { + struct CSetUpParam { + static u32 maxStdHeaps; + static u32 sysHeapSize; + static u32 fifoBufSize; + static u32 aramAudioBufSize; + static u32 aramGraphBufSize; + static u32 streamPriority; + static u32 decompPriority; + static u32 aPiecePriority; + static void* systemFontRes; + static void* renderMode; + static u32 exConsoleBufferSize[1 + 1 /* padding */]; + }; + /* 80271CD0 */ void firstInit(); /* 80271D18 */ void init(); + + static u8 rootHeap[4]; + static u8 systemHeap[4]; + static u8 mainThread[4]; + static u8 debugPrint[4]; + static u8 systemFont[4]; + static u8 systemConsoleManager[4]; + static u8 systemConsole[4]; }; // @@ -89,6 +111,24 @@ struct JFWSystem { 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: @@ -126,17 +166,16 @@ extern "C" extern u8 GXNtsc480IntDf[60]; /* ############################################################################################## */ /* 80450770-80450774 0001F0 0004+00 1/1 1/1 0/0 .sdata maxStdHeaps__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA extern u32 maxStdHeaps__Q29JFWSystem11CSetUpParam = 0x00000002; +SECTION_SDATA u32 JFWSystem::CSetUpParam::maxStdHeaps = 0x00000002; /* 80450774-80450778 0001F4 0004+00 1/1 1/1 0/0 .sdata sysHeapSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA extern u32 sysHeapSize__Q29JFWSystem11CSetUpParam = 0x00400000; +SECTION_SDATA u32 JFWSystem::CSetUpParam::sysHeapSize = 0x00400000; /* 804511A0-804511A4 0006A0 0004+00 2/2 0/0 0/0 .sbss rootHeap__9JFWSystem */ -static u8 rootHeap__9JFWSystem[4]; +u8 JFWSystem::rootHeap[4]; /* 804511A4-804511A8 0006A4 0004+00 2/2 1/1 0/0 .sbss systemHeap__9JFWSystem */ -extern u8 systemHeap__9JFWSystem[4]; -u8 systemHeap__9JFWSystem[4]; +u8 JFWSystem::systemHeap[4]; /* 80271CD0-80271D18 26C610 0048+00 1/1 1/1 0/0 .text firstInit__9JFWSystemFv */ #pragma push @@ -150,58 +189,56 @@ asm void JFWSystem::firstInit() { /* ############################################################################################## */ /* 80450778-8045077C 0001F8 0004+00 1/1 1/1 0/0 .sdata fifoBufSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA extern u32 fifoBufSize__Q29JFWSystem11CSetUpParam = 0x00040000; +SECTION_SDATA u32 JFWSystem::CSetUpParam::fifoBufSize = 0x00040000; /* 8045077C-80450780 0001FC 0004+00 1/1 1/1 0/0 .sdata aramAudioBufSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA extern u32 aramAudioBufSize__Q29JFWSystem11CSetUpParam = 0x00800000; +SECTION_SDATA u32 JFWSystem::CSetUpParam::aramAudioBufSize = 0x00800000; /* 80450780-80450784 000200 0004+00 1/1 1/1 0/0 .sdata aramGraphBufSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA extern u32 aramGraphBufSize__Q29JFWSystem11CSetUpParam = 0x00600000; +SECTION_SDATA u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x00600000; /* 80450784-80450788 000204 0004+00 1/1 0/0 0/0 .sdata streamPriority__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA static u32 streamPriority__Q29JFWSystem11CSetUpParam = 0x00000008; +SECTION_SDATA u32 JFWSystem::CSetUpParam::streamPriority = 0x00000008; /* 80450788-8045078C 000208 0004+00 1/1 0/0 0/0 .sdata decompPriority__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA static u32 decompPriority__Q29JFWSystem11CSetUpParam = 0x00000007; +SECTION_SDATA u32 JFWSystem::CSetUpParam::decompPriority = 0x00000007; /* 8045078C-80450790 00020C 0004+00 1/1 0/0 0/0 .sdata aPiecePriority__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA static u32 aPiecePriority__Q29JFWSystem11CSetUpParam = 0x00000006; +SECTION_SDATA u32 JFWSystem::CSetUpParam::aPiecePriority = 0x00000006; /* 80450790-80450794 -00001 0004+00 1/1 0/0 0/0 .sdata systemFontRes__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA static void* systemFontRes__Q29JFWSystem11CSetUpParam = - (void*)&JUTResFONT_Ascfont_fix12; +SECTION_SDATA void* JFWSystem::CSetUpParam::systemFontRes = (void*)&JUTResFONT_Ascfont_fix12; /* 80450794-80450798 -00001 0004+00 1/1 1/1 0/0 .sdata renderMode__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA extern void* renderMode__Q29JFWSystem11CSetUpParam = (void*)&GXNtsc480IntDf; +SECTION_SDATA void* JFWSystem::CSetUpParam::renderMode = (void*)&GXNtsc480IntDf; /* 80450798-804507A0 000218 0004+04 1/1 0/0 0/0 .sdata * exConsoleBufferSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA static u32 exConsoleBufferSize__Q29JFWSystem11CSetUpParam[1 + 1 /* padding */] = { +SECTION_SDATA u32 JFWSystem::CSetUpParam::exConsoleBufferSize[1 + 1 /* padding */] = { 0x000024FC, /* padding */ 0x00000000, }; /* 804511A8-804511AC 0006A8 0004+00 1/1 0/0 0/0 .sbss mainThread__9JFWSystem */ -static u8 mainThread__9JFWSystem[4]; +u8 JFWSystem::mainThread[4]; /* 804511AC-804511B0 0006AC 0004+00 1/1 0/0 0/0 .sbss debugPrint__9JFWSystem */ -static u8 debugPrint__9JFWSystem[4]; +u8 JFWSystem::debugPrint[4]; /* 804511B0-804511B4 0006B0 0004+00 1/1 0/0 0/0 .sbss systemFont__9JFWSystem */ -static u8 systemFont__9JFWSystem[4]; +u8 JFWSystem::systemFont[4]; /* 804511B4-804511B8 0006B4 0004+00 1/1 0/0 0/0 .sbss systemConsoleManager__9JFWSystem */ -static u8 systemConsoleManager__9JFWSystem[4]; +u8 JFWSystem::systemConsoleManager[4]; /* 804511B8-804511BC 0006B8 0004+00 1/1 7/7 0/0 .sbss systemConsole__9JFWSystem */ -extern u8 systemConsole__9JFWSystem[4]; -u8 systemConsole__9JFWSystem[4]; +u8 JFWSystem::systemConsole[4]; /* 804511BC-804511C0 0006BC 0004+00 1/1 0/0 0/0 .sbss None */ static u8 data_804511BC[4]; |