Merge pull request #21 from TakaRikka/26-02-25-jsystem-debug

Make the rest of JSystem compiled in DEBUG

files.cmake

@@ -445,9 +445,6 @@ set(JSYSTEM_DEBUG_FILES
         src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
         src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
         src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
-)
-
-set(JSYSTEM_FILES
         src/JSystem/JStudio/JStudio/ctb.cpp
         src/JSystem/JStudio/JStudio/ctb-data.cpp
         src/JSystem/JStudio/JStudio/functionvalue.cpp
@@ -547,6 +544,7 @@ set(JSYSTEM_FILES
         src/JSystem/JMessage/resource.cpp
         src/JSystem/JMessage/locale.cpp
         src/JSystem/JGadget/binary.cpp
+        src/JSystem/JGadget/define.cpp
         src/JSystem/JGadget/linklist.cpp
         src/JSystem/JGadget/std-vector.cpp
         src/JSystem/JHostIO/JORHostInfo.cpp
@@ -556,6 +554,9 @@ set(JSYSTEM_FILES
         src/JSystem/JHostIO/JHIMccBuf.cpp
 )
 
+set(JSYSTEM_FILES
+)
+
 set(REL_FILES
         src/f_pc/f_pc_profile_lst.cpp
         src/d/actor/d_a_andsw.cpp

include/JSystem/JHostIO/JORReflexible.h

@@ -48,7 +48,13 @@ class JORReflexible : public JOREventListener {
 public:
 #if DEBUG
     JORReflexible() {}
+#if TARGET_PC
+    static JORServer* getJORServer() {
+        OSPanic(__FILE__, __LINE__, "getJORServer is unimplemented");
+    }
+#else
     static JORServer* getJORServer();
+#endif
     
     virtual void listenPropertyEvent(const JORPropertyEvent*);
     virtual void listen(u32, const JOREvent*);

include/dolphin/os.h

@@ -209,8 +209,8 @@ void OSSetSoundMode(u32 mode);
 
 DECL_WEAK void OSReport(const char* msg, ...);
 DECL_WEAK void OSVReport(const char* msg, va_list list);
-DECL_WEAK void OSPanic(const char* file, int line, const char* msg, ...);
-void OSFatal(GXColor fg, GXColor bg, const char* msg);
+DECL_WEAK void OSPanic NORETURN(const char* file, int line, const char* msg, ...);
+void OSFatal NORETURN(GXColor fg, GXColor bg, const char* msg);
 
 // do these belong here?
 DECL_WEAK void OSAttention(const char* msg, ...);

include/dolphin/types.h

@@ -106,5 +106,11 @@ typedef unsigned int uint;
 #include <stddef.h>
 #endif
 
+#if TARGET_PC && __cplusplus
+#define NORETURN [[noreturn]]
+#else
+#define NORETURN
+#endif
+
 #endif
 #endif

src/JSystem/JAudio2/JAISe.cpp

@@ -158,7 +158,11 @@ bool JAISe::prepare_getSeqData_() {
 
     switch (inner_.seMgr->getSeqDataMgr()->getSeqData(getID(), &inner_.mSeqData)) {
     case 0:
+#if TARGET_PC
+        OS_REPORT("Failed In Loading Sequence Data:SE(0x%08x)\n", (u32)getID());
+#else
         OS_REPORT("Failed In Loading Sequence Data:SE(0x%08x)\n", *(u32*)&getID());
+#endif
         status_.state.unk = 2;
         return false;
     case 1:

src/JSystem/JGadget/define.cpp

@@ -70,3 +70,12 @@ JGadget_outMessage& JGadget_outMessage::operator<<(const void* data) {
 void JGadget_outMessage::warning(const char* file, int line, const char* message) {
     JUTAssertion::setWarningMessage(3, (char*)file, line, message);
 }
+
+#if TARGET_PC
+JGadget_outMessage& JGadget_outMessage::operator<<(u16 value) {
+    char sz[64];
+    snprintf(sz, sizeof(sz), "%uh", value);
+
+    return *this << sz;
+}
+#endif