From 3df5c7bb42c1b886024b254fec28e5f98310b630 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Sun, 13 Apr 2025 21:55:52 +0300 Subject: Various alignments to debug + matching TUs (#2391) --- src/JSystem/JFramework/JFWSystem.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/JSystem/JFramework/JFWSystem.cpp') diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp index 9e54602fe9..a2e0c225af 100644 --- a/src/JSystem/JFramework/JFWSystem.cpp +++ b/src/JSystem/JFramework/JFWSystem.cpp @@ -28,14 +28,6 @@ JKRExpHeap* JFWSystem::rootHeap; /* 804511A4-804511A8 0006A4 0004+00 2/2 1/1 0/0 .sbss systemHeap__9JFWSystem */ JKRExpHeap* JFWSystem::systemHeap; -/* 80271CD0-80271D18 26C610 0048+00 1/1 1/1 0/0 .text firstInit__9JFWSystemFv */ -void JFWSystem::firstInit() { - JUT_ASSERT(80, rootHeap == 0); - OSInit(); - DVDInit(); - rootHeap = JKRExpHeap::createRoot(CSetUpParam::maxStdHeaps, false); - systemHeap = JKRExpHeap::create(CSetUpParam::sysHeapSize, rootHeap, false); -} /* 80450778-8045077C 0001F8 0004+00 1/1 1/1 0/0 .sdata fifoBufSize__Q29JFWSystem11CSetUpParam */ u32 JFWSystem::CSetUpParam::fifoBufSize = 0x40000; @@ -70,6 +62,15 @@ GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = &GXNtsc480IntDf; * exConsoleBufferSize__Q29JFWSystem11CSetUpParam */ u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24FC; +/* 80271CD0-80271D18 26C610 0048+00 1/1 1/1 0/0 .text firstInit__9JFWSystemFv */ +void JFWSystem::firstInit() { + JUT_ASSERT(80, rootHeap == 0); + OSInit(); + DVDInit(); + rootHeap = JKRExpHeap::createRoot(CSetUpParam::maxStdHeaps, false); + systemHeap = JKRExpHeap::create(CSetUpParam::sysHeapSize, rootHeap, false); +} + /* 804511A8-804511AC 0006A8 0004+00 1/1 0/0 0/0 .sbss mainThread__9JFWSystem */ JKRThread* JFWSystem::mainThread; -- cgit v1.2.3