From 0e281cb97535523a3d1a4f668bc84321bc39fb46 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sun, 29 Dec 2024 07:53:54 -0800 Subject: various matches / cleanup (#2271) * cleanup various TUs * checkpoint * d_attention doc --- src/JSystem/JUtility/JUTConsole.cpp | 167 +++++++++--------------------------- 1 file changed, 42 insertions(+), 125 deletions(-) (limited to 'src/JSystem/JUtility/JUTConsole.cpp') diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp index 63cdf38f0a..27a941cc9b 100644 --- a/src/JSystem/JUtility/JUTConsole.cpp +++ b/src/JSystem/JUtility/JUTConsole.cpp @@ -1,118 +1,44 @@ -// -// Generated By: dol2asm -// Translation Unit: JUTConsole -// - #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTVideo.h" -#include "dol2asm.h" -#include "stdio.h" - -// -// Forward References: -// - -extern "C" void create__10JUTConsoleFUiUiP7JKRHeap(); -extern "C" void create__10JUTConsoleFUiPvUl(); -extern "C" void __ct__10JUTConsoleFUiUib(); -extern "C" void __dt__10JUTConsoleFv(); -extern "C" void getObjectSizeFromBufferSize__10JUTConsoleFUiUi(); -extern "C" void getLineFromObjectSize__10JUTConsoleFUlUi(); -extern "C" void clear__10JUTConsoleFv(); -extern "C" void doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType(); -extern "C" void print_f__10JUTConsoleFPCce(); -extern "C" void print__10JUTConsoleFPCc(); -extern "C" void dumpToTerminal__10JUTConsoleFUi(); -extern "C" void scroll__10JUTConsoleFi(); -extern "C" void getUsedLine__10JUTConsoleCFv(); -extern "C" void getLineOffset__10JUTConsoleCFv(); -extern "C" void __ct__17JUTConsoleManagerFv(); -extern "C" void createManager__17JUTConsoleManagerFP7JKRHeap(); -extern "C" void appendConsole__17JUTConsoleManagerFP10JUTConsole(); -extern "C" void removeConsole__17JUTConsoleManagerFP10JUTConsole(); -extern "C" void draw__17JUTConsoleManagerCFv(); -extern "C" void drawDirect__17JUTConsoleManagerCFb(); -extern "C" void setDirectConsole__17JUTConsoleManagerFP10JUTConsole(); -extern "C" void JUTReportConsole(const char* message); -extern "C" void JUTWarningConsole_f(const char* fmt, ...); -extern "C" void JUTWarningConsole(const char*); -extern "C" extern char const* const JUTConsole__stringBase0; -extern "C" u8 sManager__17JUTConsoleManager[4]; - -// -// External References: -// - -extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); -extern "C" void* __nw__FUlP7JKRHeapi(); -extern "C" void __dl__FPv(); -extern "C" void __ct__11JKRDisposerFv(); -extern "C" void __dt__11JKRDisposerFv(); -extern "C" void -Insert__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorPQ27JGadget13TLinkListNode(); -extern "C" void Remove__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode(); -extern "C" void setCharColor__7JUTFontFQ28JUtility6TColor(); -extern "C" void drawString_size_scale__7JUTFontFffffPCcUlb(); -extern "C" void erase__14JUTDirectPrintFiiii(); -extern "C" void drawString__14JUTDirectPrintFUsUsPc(); -extern "C" void setCharColor__14JUTDirectPrintFQ28JUtility6TColor(); -extern "C" void __ct__13J2DOrthoGraphFffffff(); -extern "C" void setPort__13J2DOrthoGraphFv(); -extern "C" void J2DFillBox__FffffQ28JUtility6TColor(); -extern "C" u32 VIGetRetraceCount(); -extern "C" void _savegpr_20(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_20(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__14J2DGrafContext[10]; -extern "C" extern void* __vt__13J2DOrthoGraph[10]; -extern "C" u8 sCurrentHeap__7JKRHeap[4]; -extern "C" u8 sDirectPrint__14JUTDirectPrint[4 + 4 /* padding */]; -extern "C" u8 sManager__8JUTVideo[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ +#include + /* 80451570-80451574 000A70 0004+00 4/4 7/7 0/0 .sbss sManager__17JUTConsoleManager */ JUTConsoleManager* JUTConsoleManager::sManager; /* 802E7354-802E73E4 2E1C94 0090+00 0/0 1/1 0/0 .text create__10JUTConsoleFUiUiP7JKRHeap */ -JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRHeap* p_heap) { - JUTConsoleManager* pManager = JUTConsoleManager::sManager; +JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRHeap* pHeap) { + JUTConsoleManager* pManager = JUTConsoleManager::getManager(); + JUT_ASSERT(33, pManager != 0); - void* buffer = JKRHeap::alloc(getObjectSizeFromBufferSize(param_0, maxLines), 0, p_heap); - u8* tmpBuf = (u8*)buffer; + u8* buffer = (u8*)JKRAllocFromHeap(pHeap, getObjectSizeFromBufferSize(param_0, maxLines), 0); - JUTConsole* newConsole = new (tmpBuf) JUTConsole(param_0, maxLines, true); - newConsole->mBuf = tmpBuf + sizeof(JUTConsole); - newConsole->clear(); + JUTConsole* console = new (buffer) JUTConsole(param_0, maxLines, true); + console->mBuf = buffer + sizeof(JUTConsole); + console->clear(); - pManager->appendConsole(newConsole); - return newConsole; + pManager->appendConsole(console); + return console; } /* 802E73E4-802E746C 2E1D24 0088+00 0/0 1/1 0/0 .text create__10JUTConsoleFUiPvUl */ JUTConsole* JUTConsole::create(unsigned int param_0, void* buffer, u32 bufferSize) { - JUTConsoleManager* pManager = JUTConsoleManager::sManager; + JUTConsoleManager* pManager = JUTConsoleManager::getManager(); + JUT_ASSERT(59, pManager != 0); + + JUT_ASSERT(62, ( (u32)buffer & 0x3 ) == 0); u32 maxLines = getLineFromObjectSize(bufferSize, param_0); - JUTConsole* newConsole = new (buffer) JUTConsole(param_0, maxLines, false); - newConsole->mBuf = (u8*)buffer + sizeof(JUTConsole); - newConsole->clear(); + JUTConsole* console = new (buffer) JUTConsole(param_0, maxLines, false); + console->mBuf = (u8*)buffer + sizeof(JUTConsole); + console->clear(); - pManager->appendConsole(newConsole); - return newConsole; + pManager->appendConsole(console); + return console; } /* 802E746C-802E755C 2E1DAC 00F0+00 2/2 0/0 0/0 .text __ct__10JUTConsoleFUiUib */ @@ -143,6 +69,7 @@ JUTConsole::JUTConsole(unsigned int param_0, unsigned int maxLines, bool param_2 /* 802E755C-802E75CC 2E1E9C 0070+00 1/0 0/0 0/0 .text __dt__10JUTConsoleFv */ JUTConsole::~JUTConsole() { + JUT_ASSERT(154, JUTConsoleManager::getManager()); JUTConsoleManager::getManager()->removeConsole(this); } @@ -167,6 +94,7 @@ void JUTConsole::clear() { for (u32 i = 0; i < mMaxLines; i++) { setLineAttr(i, 0); } + setLineAttr(0, -1); *getLinePtr(0) = 0; } @@ -330,6 +258,8 @@ void JUTConsole::print(char const* str) { /* 802E7F30-802E7F7C 2E2870 004C+00 1/1 1/1 0/0 .text JUTConsole_print_f_va_ */ extern "C" void JUTConsole_print_f_va_(JUTConsole* console, const char* fmt, va_list args) { + JUT_ASSERT(563, console!=0); + char buf[1024]; vsnprintf(buf, sizeof(buf), fmt, args); console->print(buf); @@ -427,8 +357,10 @@ JUTConsoleManager::JUTConsoleManager() { /* 802E81F4-802E8240 2E2B34 004C+00 0/0 1/1 0/0 .text createManager__17JUTConsoleManagerFP7JKRHeap */ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) { + JUT_ASSERT(0x39c, sManager == 0); + if (pHeap == NULL) { - pHeap = JKRHeap::sCurrentHeap; + pHeap = JKRGetCurrentHeap(); } JUTConsoleManager* manager = new (pHeap, 0) JUTConsoleManager(); @@ -440,6 +372,8 @@ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) { * appendConsole__17JUTConsoleManagerFP10JUTConsole */ void JUTConsoleManager::appendConsole(JUTConsole* console) { JUT_ASSERT(961, sManager != 0 && console != 0); + + JUT_ASSERT(964, soLink_.Find( console ) == soLink_.end()); soLink_.Push_back(console); if (mActiveConsole == NULL) { @@ -470,8 +404,6 @@ void JUTConsoleManager::removeConsole(JUTConsole* console) { } /* 802E8384-802E8450 2E2CC4 00CC+00 0/0 1/1 0/0 .text draw__17JUTConsoleManagerCFv */ -// missing stack var, different from tww/pik2 -#ifdef NONMATCHING void JUTConsoleManager::draw() const { ConsoleList::const_iterator iter = soLink_.begin(); ConsoleList::const_iterator end = soLink_.end(); @@ -485,11 +417,6 @@ void JUTConsoleManager::draw() const { if (mActiveConsole != NULL) mActiveConsole->doDraw(JUTConsole::CONSOLE_TYPE_0); } -#else -void JUTConsoleManager::draw() const { - // NONMATCHING -} -#endif /* 802E8450-802E84C4 2E2D90 0074+00 0/0 5/5 0/0 .text drawDirect__17JUTConsoleManagerCFb */ @@ -510,24 +437,23 @@ void JUTConsoleManager::drawDirect(bool waitRetrace) const { /* 802E84C4-802E8520 2E2E04 005C+00 0/0 2/2 0/0 .text * setDirectConsole__17JUTConsoleManagerFP10JUTConsole */ -void JUTConsoleManager::setDirectConsole(JUTConsole* p_console) { +void JUTConsoleManager::setDirectConsole(JUTConsole* console) { if (mDirectConsole != NULL) { appendConsole(mDirectConsole); } - if (p_console != NULL) { - removeConsole(p_console); + if (console != NULL) { + removeConsole(console); } - mDirectConsole = p_console; + mDirectConsole = console; } -/* ############################################################################################## */ /* 80451574-80451578 000A74 0004+00 2/1 0/0 0/0 .sbss sReportConsole */ static JUTConsole* sReportConsole; /* 802E8520-802E8528 2E2E60 0008+00 1/1 1/1 0/0 .text JUTSetReportConsole */ -extern "C" void JUTSetReportConsole(JUTConsole* p_console) { - sReportConsole = p_console; +extern "C" void JUTSetReportConsole(JUTConsole* console) { + sReportConsole = console; } /* 802E8528-802E8530 -00001 0008+00 0/0 0/0 0/0 .text JUTGetReportConsole */ @@ -535,13 +461,12 @@ extern "C" JUTConsole* JUTGetReportConsole() { return sReportConsole; } -/* ############################################################################################## */ /* 80451578-80451580 000A78 0004+04 2/1 0/0 0/0 .sbss sWarningConsole */ static JUTConsole* sWarningConsole; /* 802E8530-802E8538 2E2E70 0008+00 1/1 1/1 0/0 .text JUTSetWarningConsole */ -extern "C" void JUTSetWarningConsole(JUTConsole* p_console) { - sWarningConsole = p_console; +extern "C" void JUTSetWarningConsole(JUTConsole* console) { + sWarningConsole = console; } /* 802E8538-802E8540 -00001 0008+00 0/0 0/0 0/0 .text JUTGetWarningConsole */ @@ -571,18 +496,10 @@ extern "C" void JUTReportConsole_f(const char* fmt, ...) { va_end(args); } -/* ############################################################################################## */ -/* 8039D9A8-8039D9A8 02A008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039D9B7 = - "\n:::dump of console[%x]----------------\n"; -SECTION_DEAD static char const* const stringBase_8039D9E0 = - ":::dump of console[%x] END------------\n"; -SECTION_DEAD static char const* const stringBase_8039DA08 = "%s"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039DA0B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -#pragma pop +static void dummyString() { + DEAD_STRING("\n:::dump of console[%x]----------------\n"); + DEAD_STRING(":::dump of console[%x] END------------\n"); +} /* 802E8648-802E867C 2E2F88 0034+00 0/0 6/6 0/0 .text JUTReportConsole */ void JUTReportConsole(const char* message) { @@ -614,4 +531,4 @@ void JUTWarningConsole_f(const char* fmt, ...) { /* 802E86FC-802E8730 2E303C 0034+00 0/0 2/2 0/0 .text JUTWarningConsole */ void JUTWarningConsole(const char* message) { JUTReportConsole_f("%s", message); -} \ No newline at end of file +} -- cgit v1.2.3