m_Do_main debug (#2965)

src/JSystem/JUtility/JUTAssert.cpp

@@ -130,10 +130,6 @@ void showAssert_f(u32 device, const char* file, int line, const char* msg, ...)
     va_end(args);
 }
 
-void showAssert(u32 device, const char* file, int line, const char* msg) {
-    showAssert_f(device, file, line, "%s", msg);
-}
-
 void setWarningMessage_f_va(u32 device, const char* file, int line, const char* msg, va_list args) {
     u32 messageLife = sMessageLife;
     bool r26 = false;

src/d/actor/d_a_alink.cpp

@@ -10,6 +10,7 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
 #include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
+#include "JSystem/JHostIO/JORServer.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_item.h"

src/d/actor/d_a_balloon_2D.cpp

@@ -9,6 +9,7 @@
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
+#include "JSystem/JHostIO/JORServer.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"

src/d/d_debug_camera.cpp

@@ -5,6 +5,7 @@
 #include "d/d_debug_viewer.h"
 #include "d/d_com_inf_game.h"
 #include "f_ap/f_ap_game.h"
+#include "JSystem/JHostIO/JORServer.h"
 #include "JSystem/JUtility/JUTDbPrint.h"
 #include "JSystem/JUtility/JUTReport.h"
 

src/d/d_event_debug.cpp

@@ -2,8 +2,7 @@
 
 #include "d/d_event_debug.h"
 #include "JSystem/JHostIO/JORFile.h"
-#include "JSystem/JHostIO/JORMContext.h"
-#include "JSystem/JHostIO/JORReflexible.h"
+#include "JSystem/JHostIO/JORServer.h"
 #include "d/actor/d_a_player.h"
 #include "m_Do/m_Do_controller_pad.h"
 

src/d/d_kankyo.cpp

@@ -5,6 +5,7 @@
 #include <dolphin/gf/GFPixel.h>
 
 #include "JSystem/JHostIO/JORFile.h"
+#include "JSystem/JHostIO/JORServer.h"
 #include "SSystem/SComponent/c_counter.h"
 #include "SSystem/SComponent/c_math.h"
 #include "c/c_damagereaction.h"

src/d/d_meter_map.cpp

@@ -7,6 +7,7 @@
 
 #include "d/d_meter_map.h"
 #include "JSystem/J2DGraph/J2DGrafContext.h"
+#include "JSystem/JHostIO/JORServer.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_map.h"
 #include "d/d_menu_window.h"

src/f_op/f_op_actor_mng.cpp

@@ -6,6 +6,7 @@
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
+#include "JSystem/JHostIO/JORServer.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "SSystem/SComponent/c_malloc.h"

src/m_Do/m_Do_Reset.cpp

@@ -16,7 +16,7 @@
 static void my_OSCancelAlarmAll() {}
 
 static void destroyVideo() {
-    JUTVideo::destroyManager();
+    JUTDestroyVideoManager();
     GXSetDrawDoneCallback(NULL);
     VISetBlack(1);
     VIFlush();

src/m_Do/m_Do_hostIO.cpp

@@ -1,4 +1,5 @@
 #include "m_Do/m_Do_hostIO.h"
+#include "JSystem/JHostIO/JORServer.h"
 #include <dolphin/dolphin.h>
 
 #if DEBUG

src/m_Do/m_Do_machine.cpp

@@ -460,7 +460,7 @@ void myExceptionCallback(u16, OSContext*, u32, u32) {
         }
     }
     DVDChangeDir("/map/Final/Release");
-    JUTVideo::destroyManager();
+    JUTDestroyVideoManager();
     GXSetDrawDoneCallback(NULL);
     VISetBlack(0);
     VIFlush();

src/m_Do/m_Do_main.cpp

@@ -89,10 +89,6 @@ static HeapCheck* HeapCheckTable[8] = {
     &ArchiveHeapCheck, &J2dHeapCheck,    &HostioHeapCheck, &CommandHeapCheck,
 };
 
-#if DEBUG
-mDoMain_HIO_c mDoMain_HIO;
-#endif
-
 void printFrameLine() {
     OSCalendarTime calendar;
     OSTime time = OSGetTime();
@@ -217,6 +213,10 @@ static u8 mPrintFrameLine;
 /* 80450B1A 0002+00 data_80450B1A None */
 static u8 mCheckHeap;
 
+#if DEBUG
+mDoMain_HIO_c mDoMain_HIO;
+#endif
+
 void debugDisplay() {
     static const char* desc1[5] = {
         "", "TotalFree", "MaxUsed  ", "Used     ", "RelUsed  ",
@@ -726,7 +726,7 @@ void main01(void) {
     #else
     const int audioHeapSize = 0x14D800;
     #endif
-    g_mDoAud_audioHeap = JKRCreateSolidHeap(audioHeapSize, JKRHeap::getCurrentHeap(), false);
+    g_mDoAud_audioHeap = JKRCreateSolidHeap(audioHeapSize, JKRGetCurrentHeap(), false);
 
     do {
         static u32 frame;
@@ -779,6 +779,8 @@ void main01(void) {
 }
 
 #if DEBUG
+JHIComPortManager<JHICmnMem>* JHIComPortManager<JHICmnMem>:: instance;
+
 // DEBUG NONMATCHING
 void parse_args(int argc, const char* argv[]) {
     int i;
@@ -885,7 +887,7 @@ void main(int argc, const char* argv[]) {
         } while (true);
     }
 
-    if (!(OSGetResetCode() >> 0x1F)) {
+    if (!((OSGetResetCode() & 0x80000000) ? 1 : 0)) {
         mDoRst::offReset();
         mDoRst::offResetPrepare();
         mDoRst::off3ButtonReset();
@@ -922,16 +924,14 @@ void main(int argc, const char* argv[]) {
         if (disk_id->gameVersion > 0x90) {
             mDoMain::developmentMode = 1;
         } else if (disk_id->gameVersion > 0x80) {
-            u32 consoleType = OSGetConsoleType();
-            mDoMain::developmentMode = (consoleType >> 0x1C) & 1;
+            mDoMain::developmentMode = (OSGetConsoleType() & OS_CONSOLE_DEVELOPMENT) != 0;
         } else {
             mDoMain::developmentMode = 0;
         }
     }
 
     OS_REPORT("メインスレッドを作成します\n");
-    s32 priority = OSGetThreadPriority(current_thread);
-    OSCreateThread(&mainThread, (void*(*)(void*))main01, 0, stack + sizeof(mainThreadStack), sizeof(mainThreadStack), priority, 0);
+    OSCreateThread(&mainThread, (void*(*)(void*))main01, 0, stack + sizeof(mainThreadStack), sizeof(mainThreadStack), OSGetThreadPriority(current_thread), 0);
     OSResumeThread(&mainThread);
     OS_REPORT("メインスレッドを起動しました <%x>\n", &mainThread);
     OSSetThreadPriority(current_thread, 0x1F);