mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-07 22:22:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

JFramework mostly ok

Browse Source
This commit is contained in:
TakaRikka
2022-01-09 17:33:14 -08:00
parent 035a24092e
commit 37146dfed1
17 changed files with 878 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/JFramework/JFWDisplay.cpp
+505 -410
View File
File diff suppressed because it is too large Load Diff
libs/JSystem/JFramework/JFWSystem.cpp
+87 -80
View File
@@ -4,6 +4,12 @@
//
#include "JSystem/JFramework/JFWSystem.h"
#include "JSystem/JKernel/JKRAram.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JUtility/JUTDirectPrint.h"
#include "JSystem/JUtility/JUTException.h"
#include "JSystem/JUtility/JUTGamePad.h"
#include "JSystem/JUtility/JUTVideo.h"
#include "dol2asm.h"
#include "dolphin/types.h"
@@ -11,57 +17,10 @@
// Types:
//
struct OSThread {};
struct JUTVideo {
/* 802E4C54 */ void createManager(_GXRenderModeObj const*);
};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
};
struct JUTResFont {
/* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*);
};
struct JUTGraphFifo {
/* 802DEB58 */ JUTGraphFifo(u32);
};
struct JUTGamePad {
/* 802E0898 */ void init();
};
struct JUTDirectPrint {
/* 802E4240 */ void start();
};
struct JUTException {
/* 802E1E40 */ void create(JUTDirectPrint*);
/* 802E3FEC */ void createConsole(void*, u32);
};
struct JUTDbPrint {
/* 802E0190 */ void start(JUTFont*, JKRHeap*);
/* 802E0204 */ void changeFont(JUTFont*);
};
struct JUTAssertion {
/* 802E495C */ void create();
};
struct JKRThread {
/* 802D16B8 */ JKRThread(OSThread*, int);
};
struct JKRExpHeap {
/* 802CEDB4 */ void createRoot(int, bool);
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct JKRAram {
/* 802D1FA4 */ void create(u32, u32, s32, s32, s32);
u8 field_0x0[0x1C];
};
//
@@ -111,10 +70,7 @@ extern "C" void create__12JUTAssertionFv();
extern "C" void createManager__8JUTVideoFPC16_GXRenderModeObj();
extern "C" void create__10JUTConsoleFUiUiP7JKRHeap();
extern "C" void createManager__17JUTConsoleManagerFP7JKRHeap();
extern "C" void JUTSetReportConsole();
extern "C" void JUTSetWarningConsole();
extern "C" void OSInit();
extern "C" void OSGetCurrentThread();
extern "C" void DVDInit();
extern "C" extern u8 const JUTResFONT_Ascfont_fix12[16736];
extern "C" extern u8 GXNtsc480IntDf[60];
@@ -125,82 +81,78 @@ extern "C" extern u8 GXNtsc480IntDf[60];
/* ############################################################################################## */
/* 80450770-80450774 0001F0 0004+00 1/1 1/1 0/0 .sdata maxStdHeaps__Q29JFWSystem11CSetUpParam */
SECTION_SDATA u32 JFWSystem::CSetUpParam::maxStdHeaps = 0x00000002;
SECTION_SDATA 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 = 0x00400000;
SECTION_SDATA u32 JFWSystem::CSetUpParam::sysHeapSize = 0x400000;
/* 804511A0-804511A4 0006A0 0004+00 2/2 0/0 0/0 .sbss rootHeap__9JFWSystem */
u8 JFWSystem::rootHeap[4];
JKRExpHeap* JFWSystem::rootHeap;
/* 804511A4-804511A8 0006A4 0004+00 2/2 1/1 0/0 .sbss systemHeap__9JFWSystem */
u8 JFWSystem::systemHeap[4];
JKRExpHeap* JFWSystem::systemHeap;
/* 80271CD0-80271D18 26C610 0048+00 1/1 1/1 0/0 .text firstInit__9JFWSystemFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JFWSystem::firstInit() {
nofralloc
#include "asm/JSystem/JFramework/JFWSystem/firstInit__9JFWSystemFv.s"
void JFWSystem::firstInit() {
OSInit();
DVDInit();
rootHeap = JKRExpHeap::createRoot(CSetUpParam::maxStdHeaps, false);
systemHeap = JKRExpHeap::create(CSetUpParam::sysHeapSize, rootHeap, false);
}
#pragma pop
/* ############################################################################################## */
/* 80450778-8045077C 0001F8 0004+00 1/1 1/1 0/0 .sdata fifoBufSize__Q29JFWSystem11CSetUpParam */
SECTION_SDATA u32 JFWSystem::CSetUpParam::fifoBufSize = 0x00040000;
SECTION_SDATA 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 = 0x00800000;
SECTION_SDATA 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 = 0x00600000;
SECTION_SDATA 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 = 0x00000008;
SECTION_SDATA 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 = 0x00000007;
SECTION_SDATA 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 = 0x00000006;
SECTION_SDATA u32 JFWSystem::CSetUpParam::aPiecePriority = 6;
/* 80450790-80450794 -00001 0004+00 1/1 0/0 0/0 .sdata systemFontRes__Q29JFWSystem11CSetUpParam */
SECTION_SDATA void* JFWSystem::CSetUpParam::systemFontRes = (void*)&JUTResFONT_Ascfont_fix12;
SECTION_SDATA ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)&JUTResFONT_Ascfont_fix12;
/* 80450794-80450798 -00001 0004+00 1/1 1/1 0/0 .sdata renderMode__Q29JFWSystem11CSetUpParam */
SECTION_SDATA void* JFWSystem::CSetUpParam::renderMode = (void*)&GXNtsc480IntDf;
SECTION_SDATA GXRenderModeObj* JFWSystem::CSetUpParam::renderMode =
(GXRenderModeObj*)&GXNtsc480IntDf;
/* 80450798-804507A0 000218 0004+04 1/1 0/0 0/0 .sdata
* exConsoleBufferSize__Q29JFWSystem11CSetUpParam */
SECTION_SDATA u32 JFWSystem::CSetUpParam::exConsoleBufferSize[1 + 1 /* padding */] = {
0x000024FC,
/* padding */
0x00000000,
};
SECTION_SDATA u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24FC;
/* 804511A8-804511AC 0006A8 0004+00 1/1 0/0 0/0 .sbss mainThread__9JFWSystem */
u8 JFWSystem::mainThread[4];
JKRThread* JFWSystem::mainThread;
/* 804511AC-804511B0 0006AC 0004+00 1/1 0/0 0/0 .sbss debugPrint__9JFWSystem */
u8 JFWSystem::debugPrint[4];
JUTDbPrint* JFWSystem::debugPrint;
/* 804511B0-804511B4 0006B0 0004+00 1/1 0/0 0/0 .sbss systemFont__9JFWSystem */
u8 JFWSystem::systemFont[4];
JUTResFont* JFWSystem::systemFont;
/* 804511B4-804511B8 0006B4 0004+00 1/1 0/0 0/0 .sbss systemConsoleManager__9JFWSystem */
u8 JFWSystem::systemConsoleManager[4];
JUTConsoleManager* JFWSystem::systemConsoleManager;
/* 804511B8-804511BC 0006B8 0004+00 1/1 7/7 0/0 .sbss systemConsole__9JFWSystem */
JUTConsole* JFWSystem::systemConsole;
/* 804511BC-804511C0 0006BC 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_804511BC[4];
static u8 data_804511BC;
// static bool sInitCalled
/* 80455240-80455244 003840 0004+00 1/1 0/0 0/0 .sdata2 @2242 */
SECTION_SDATA2 static f32 lit_2242 = 0.5f;
@@ -212,6 +164,60 @@ SECTION_SDATA2 static f32 lit_2243 = 17.0f / 20.0f;
SECTION_SDATA2 static f64 lit_2245 = 4503601774854144.0 /* cast s32 to float */;
/* 80271D18-80272040 26C658 0328+00 0/0 1/1 0/0 .text init__9JFWSystemFv */
// just regalloc in the beginning
#ifdef NONMATCHING
void JFWSystem::init() {
if (rootHeap == NULL) {
firstInit();
}
sInitCalled = true;
JKRAram::create(CSetUpParam::aramAudioBufSize, CSetUpParam::aramGraphBufSize,
CSetUpParam::streamPriority, CSetUpParam::decompPriority,
CSetUpParam::aPiecePriority);
mainThread = new JKRThread(OSGetCurrentThread(), 4);
JUTVideo::createManager(CSetUpParam::renderMode);
u32 fifoSize = CSetUpParam::fifoBufSize;
JUTGraphFifo* fifo = new JUTGraphFifo(fifoSize);
JUTGamePad::init();
JUTDirectPrint* dbPrint = JUTDirectPrint::start();
JUTAssertion::create();
JUTException::create(dbPrint);
systemFont = new JUTResFont(CSetUpParam::systemFontRes, NULL);
debugPrint = JUTDbPrint::start(NULL, NULL);
debugPrint->changeFont(systemFont);
systemConsoleManager = JUTConsoleManager::createManager(NULL);
systemConsole = JUTConsole::create(60, 200, NULL);
systemConsole->setFont(systemFont);
if (CSetUpParam::renderMode->efb_height < 300) {
systemConsole->setFontSize(systemFont->getWidth() * 0.85f, systemFont->getHeight() * 0.5f);
systemConsole->setPosition(20, 25);
} else {
systemConsole->setFontSize(systemFont->getWidth(), systemFont->getHeight());
systemConsole->setPosition(20, 50);
}
systemConsole->setHeight(25);
systemConsole->setVisible(false);
systemConsole->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE);
JUTSetReportConsole(systemConsole);
JUTSetWarningConsole(systemConsole);
void* buffer = systemHeap->alloc(CSetUpParam::exConsoleBufferSize, 4);
JUTException::createConsole(buffer, CSetUpParam::exConsoleBufferSize);
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -220,3 +226,4 @@ asm void JFWSystem::init() {
#include "asm/JSystem/JFramework/JFWSystem/init__9JFWSystemFv.s"
}
#pragma pop
#endif
libs/JSystem/JParticle/JPAResource.cpp
+1 -1
View File
@@ -180,7 +180,7 @@ JPAResource::JPAResource() {
/* ############################################################################################## */
/* 803C40C0-803C4220 0211E0 0144+1C 2/2 0/0 0/0 .data jpa_pos */
SECTION_DATA static u8 jpa_pos[324 + 28 /* padding */] = {
SECTION_DATA static u8 jpa_pos[324 + 28 /* padding */] ALIGN_DECL(32) = {
0x00,
0x00,
0x00,
libs/JSystem/JUtility/JUTException.cpp
+1 -1
View File
@@ -1126,7 +1126,7 @@ void JUTException::createConsole(void* console_buffer, u32 console_buffer_size)
sConsole->setPosition(15, 26);
sConsole->setHeight(23);
sConsole->setVisible(true);
sConsole->setOutput(3);
sConsole->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE);
}
}
libs/JSystem/JUtility/JUTProcBar.cpp
+1 -39
View File
@@ -11,47 +11,10 @@
// Types:
//
struct JUtility {
struct TColor {};
};
struct JUTVideo {
static u8 sManager[4];
};
struct JUTProcBar {
struct CTime {
/* 802E7340 */ CTime();
};
/* 802E5888 */ JUTProcBar();
/* 802E599C */ ~JUTProcBar();
/* 802E59E0 */ void create();
/* 802E5A28 */ void destroy();
/* 802E5A60 */ void clear();
/* 802E5B30 */ void bar_subroutine(int, int, int, int, int, int, int, JUtility::TColor,
JUtility::TColor);
/* 802E5CC4 */ void adjustMeterLength(u32, f32*, f32, f32, int*);
/* 802E5E08 */ void draw();
/* 802E5E3C */ void drawProcessBar();
/* 802E6FA0 */ void drawHeapBar();
static u8 sManager[4];
};
struct JKRHeap {
/* 802CE784 */ void getTotalFreeSize();
static u8 sSystemHeap[4];
static u8 sCurrentHeap[4];
static u8 sRootHeap[4];
static u8 mCodeStart[4];
static u8 mCodeEnd[4];
static u8 mUserRamStart[4];
static u8 mUserRamEnd[4];
static u8 mMemorySize[4];
};
//
// Forward References:
//
@@ -82,7 +45,6 @@ extern "C" void __dl__FPv();
extern "C" void J2DDrawLine__FffffQ28JUtility6TColori();
extern "C" void J2DFillBox__FffffQ28JUtility6TColor();
extern "C" void J2DDrawFrame__FffffQ28JUtility6TColorUc();
extern "C" void OSGetTick();
extern "C" void __construct_array();
extern "C" void _savegpr_21();
extern "C" void _savegpr_25();
@@ -118,7 +80,7 @@ asm JUTProcBar::JUTProcBar() {
/* ############################################################################################## */
/* 80451558-8045155C 000A58 0004+00 4/4 6/6 0/0 .sbss sManager__10JUTProcBar */
u8 JUTProcBar::sManager[4];
JUTProcBar* JUTProcBar::sManager;
/* 802E599C-802E59E0 2E02DC 0044+00 1/1 0/0 0/0 .text __dt__10JUTProcBarFv */
#pragma push
libs/JSystem/JUtility/JUTVideo.cpp
+1 -2
View File
@@ -15,7 +15,6 @@
//
extern "C" void GXSetDrawDone();
extern "C" void GXCopyDisp(void*, BOOL);
//
// Declarations:
@@ -156,7 +155,7 @@ void JUTVideo::preRetraceProc(u32 retrace_count) {
s16 index = xfb->getDrawnXfbIndex();
if (index >= 0) {
xfb->setDisplayingXfbIndex(index);
GXCopyDisp(xfb->getDisplayingXfb(), 1);
GXCopyDisp(xfb->getDisplayingXfb(), GX_TRUE);
GXFlush();
xfb->setSDrawingFlag(2);
frameBuffer = xfb->getDisplayingXfb();