Move TP-specific OSReport functions elsewhere

include/d/d_stage.h

@@ -7,6 +7,7 @@
 #include "dusk/offset_ptr.h"
 #include "f_op/f_op_actor_mng.h"
 #include "global.h"
+#include "os_report.h"
 
 enum StageType {
     /* 0x0 */ ST_FIELD,

include/os_report.h

@@ -0,0 +1,34 @@
+#ifndef _OS_REPORT_H
+#define _OS_REPORT_H
+
+#include <dolphin/os.h>
+
+DECL_WEAK void OSAttention(const char* msg, ...);
+DECL_WEAK void OSReport_Error(const char* fmt, ...);
+DECL_WEAK void OSReport_FatalError(const char* fmt, ...);
+DECL_WEAK void OSReport_System(const char* fmt, ...);
+DECL_WEAK void OSReport_Warning(const char* fmt, ...);
+DECL_WEAK void OSReportDisable(void);
+DECL_WEAK void OSReportEnable(void);
+DECL_WEAK void OSReportForceEnableOff(void);
+DECL_WEAK void OSReportForceEnableOn(void);
+
+#if DEBUG
+#define OS_REPORT(...) OSReport(__VA_ARGS__)
+#define OS_WARNING(...) OSReport_Warning(__VA_ARGS__)
+#define OS_REPORT_ERROR(...) OSReport_Error(__VA_ARGS__)
+#define OS_PANIC(line, msg) OSPanic(__FILE__, line, msg)
+#else
+#define OS_REPORT(...)
+#define OS_WARNING(...)
+#define OS_REPORT_ERROR(...)
+#define OS_PANIC(...)
+#endif
+
+extern u8 __OSReport_disable;
+extern u8 __OSReport_Error_disable;
+extern u8 __OSReport_Warning_disable;
+extern u8 __OSReport_System_disable;
+extern u8 __OSReport_enable;
+
+#endif  // _OS_REPORT_H

libs/JSystem/include/JSystem/JSystem.h

@@ -7,4 +7,6 @@
 #include "JSystem/JSystem.pch" // IWYU pragma: export
 #endif
 
+#include "os_report.h"
+
 #endif // JSYSTEM_H

libs/JSystem/src/J2DGraph/J2DAnmLoader.cpp

@@ -6,6 +6,7 @@
 
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "JSystem/JSupport/JSupport.h"
+#include "os_report.h"
 
 J2DAnmBase* J2DAnmLoaderDataBase::load(void const* p_data) {
     const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)p_data;

libs/JSystem/src/J2DGraph/J2DMaterial.cpp

@@ -5,6 +5,7 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTPalette.h"
 #include "JSystem/JUtility/JUTTexture.h"
+#include "os_report.h"
 
 J2DMaterial::J2DMaterial() {
     field_0x4 = 0;

libs/JSystem/src/JAudio2/dspproc.cpp

@@ -3,6 +3,7 @@
 #include "JSystem/JAudio2/dspproc.h"
 #include "JSystem/JAudio2/dsptask.h"
 #include "JSystem/JAudio2/JASDSPInterface.h"
+#include "os_report.h"
 
 void DSPReleaseHalt2(u32 msg) {
     u32 msgs[2];

libs/JSystem/src/JAudio2/dsptask.cpp

@@ -3,6 +3,7 @@
 #include "JSystem/JAudio2/dsptask.h"
 #include "JSystem/JAudio2/osdsp.h"
 #include "global.h"
+#include "os_report.h"
 
 static void DspInitWork();
 static void DspHandShake(void* param_0);

libs/JSystem/src/JKernel/JKRAramArchive.cpp

@@ -9,6 +9,7 @@
 #include "JSystem/JUtility/JUTException.h"
 #include <cmath>
 #include <cstring>
+#include "os_report.h"
 
 JKRAramArchive::JKRAramArchive() {}
 

libs/JSystem/src/JKernel/JKRAramHeap.cpp

@@ -4,6 +4,7 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "global.h"
 #include <climits>
+#include "os_report.h"
 
 JSUList<JKRAramBlock> JKRAramHeap::sAramList;
 

libs/JSystem/src/JKernel/JKRDvdArchive.cpp

@@ -10,6 +10,7 @@
 #include <cstring>
 #include "global.h"
 #include <stdint.h>
+#include "os_report.h"
 
 JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
     : JKRArchive(entryNum, MOUNT_DVD) {

libs/JSystem/src/JKernel/JKRHeap.cpp

@@ -22,6 +22,7 @@
 #endif
 #include <cstring>
 #include <dolphin/os.h>
+#include "os_report.h"
 
 #if DEBUG
 u8 JKRValue_DEBUGFILL_NOTUSE = 0xFD;

libs/JSystem/src/JKernel/JKRMemArchive.cpp

@@ -8,6 +8,7 @@
 #include <cstring>
 #include "global.h"
 #include <stdint.h>
+#include "os_report.h"
 
 JKRMemArchive::JKRMemArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
     : JKRArchive(entryNum, MOUNT_MEM) {

libs/JSystem/src/JParticle/JPAResourceLoader.cpp

@@ -11,6 +11,7 @@
 #include "JSystem/JParticle/JPAKeyBlock.h"
 #include "JSystem/JParticle/JPAResource.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
+#include "os_report.h"
 
 static void dummy1() {
     JUT_WARN(0, "JPA : wrong version file %s\n");

libs/JSystem/src/JSupport/JSUInputStream.cpp

@@ -7,6 +7,7 @@
 #else
 #include <dolphin.h>
 #endif
+#include "os_report.h"
 
 JSUInputStream::~JSUInputStream() {
     if (!isGood()) {

libs/JSystem/src/JSupport/JSUOutputStream.cpp

@@ -8,6 +8,7 @@
 #include <dolphin.h>
 #endif
 #include <cstring>
+#include "os_report.h"
 
 JSUOutputStream::~JSUOutputStream() {
     if (!isGood()) {

libs/JSystem/src/JUtility/JUTGamePad.cpp

@@ -2,6 +2,7 @@
 
 #include "JSystem/JUtility/JUTGamePad.h"
 #include <cmath>
+#include "os_report.h"
 
 u32 JUTGamePad::CRumble::sChannelMask[4] = {
     PAD_CHAN0_BIT,

libs/JSystem/src/JUtility/JUTTexture.cpp

@@ -3,6 +3,7 @@
 #include "JSystem/JUtility/JUTTexture.h"
 #include "JSystem/JUtility/JUTPalette.h"
 #include <gx.h>
+#include "os_report.h"
 
 JUTTexture::~JUTTexture() {
     if (getCaptureFlag()) {

src/DynamicLink.cpp

@@ -11,6 +11,7 @@
 #include <cstdio>
 #include "m_Do/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_ext.h"
+#include "os_report.h"
 
 DynamicModuleControlBase* DynamicModuleControlBase::mFirst;
 

src/SSystem/SComponent/c_cc_s.cpp

@@ -6,6 +6,7 @@
 #include "SSystem/SComponent/c_cc_s.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include <cmath>
+#include "os_report.h"
 
 #define CHECK_FLOAT_CLASS(line, x) JUT_ASSERT(line, !std::isnan(x));
 #define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f);

src/SSystem/SComponent/c_m2d.cpp

@@ -7,6 +7,7 @@
 #include "SSystem/SComponent/c_m3d.h"
 #include "SSystem/SComponent/c_m3d_g_cir.h"
 #include "JSystem/JUtility/JUTAssert.h"
+#include "os_report.h"
 
 void cM2d_CrossCirLin(cM2dGCir& param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
                       f32* param_5, f32* param_6) {

src/Z2AudioLib/Z2Creature.cpp

@@ -2,6 +2,7 @@
 #include "Z2AudioLib/Z2Param.h"
 #include "Z2AudioLib/Z2Calc.h"
 #include "Z2AudioLib/Z2AudioMgr.h"
+#include "os_report.h"
 
 static void Z2_E_sw_modPitch(Z2SoundHandlePool*, u32);
 static void Z2_E_ms_modVol(Z2SoundHandlePool*, u32);

src/Z2AudioLib/Z2FxLineMgr.cpp

@@ -4,6 +4,7 @@
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JSupport/JSUMemoryStream.h"
+#include "os_report.h"
 
 Z2FxLineMgr::Z2FxLineMgr() : JASGlobalInstance<Z2FxLineMgr>(true) {
     mConfig = NULL;

src/Z2AudioLib/Z2SeqMgr.cpp

@@ -8,6 +8,7 @@
 #include "Z2AudioLib/Z2Calc.h"
 #include "JSystem/JAudio2/JAISoundChild.h"
 #include "JSystem/JAudio2/JAISeq.h"
+#include "os_report.h"
 
 static const char* sSpotName[] = {
     "F_SP00",

src/Z2AudioLib/Z2SoundObject.cpp

@@ -17,6 +17,7 @@
 #if PLATFORM_WII || PLATFORM_SHIELD
 #include "Z2AudioCS/Z2AudioCS.h"
 #endif
+#include "os_report.h"
 
 Z2SoundObjBase::Z2SoundObjBase()
 #if DEBUG

src/Z2AudioLib/Z2WolfHowlMgr.cpp

@@ -6,6 +6,7 @@
 #include "Z2AudioLib/Z2SoundMgr.h"
 #include "Z2AudioLib/Z2Audience.h"
 #include "d/d_demo.h"
+#include "os_report.h"
 
 static f32 cPitchDown = 0.8909f;
 

src/f_pc/f_pc_stdcreate_req.cpp

@@ -15,6 +15,7 @@
 #include <dolphin.h>
 #endif
 #include <cstdio>
+#include "os_report.h"
 
 typedef struct standard_create_request_class {
     /* 0x00 */ create_request base;

src/m_Do/m_Do_MemCard.cpp

@@ -9,6 +9,7 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_MemCardRWmng.h"
 #include "m_Do/m_Do_Reset.h"
+#include "os_report.h"
 
 #if PLATFORM_WII || PLATFORM_SHIELD
 #include <revolution/nand.h>

src/m_Do/m_Do_Reset.cpp

@@ -17,6 +17,7 @@
 #if !PLATFORM_GCN
 #include <revolution/os.h>
 #endif
+#include "os_report.h"
 
 static void my_OSCancelAlarmAll() {}
 

src/m_Do/m_Do_dvd_thread.cpp

@@ -13,6 +13,7 @@
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_ext.h"
+#include "os_report.h"
 
 s32 mDoDvdThd::main(void* param_0) {
     JKRThread(OSGetCurrentThread(), 0);

src/m_Do/m_Do_machine.cpp

@@ -27,6 +27,7 @@
 #include "m_Do/m_Do_machine_exception.h"
 #include "m_Do/m_Do_main.h"
 #include "DynamicLink.h"
+#include "os_report.h"
 
 #if !PLATFORM_GCN
 #include <revolution/sc.h>

src/m_Do/m_Do_mtx.cpp

@@ -10,6 +10,7 @@
 #include "SSystem/SComponent/c_m3d.h"
 #include "SSystem/SComponent/c_math.h"
 #include "global.h"
+#include "os_report.h"
 
 Mtx mDoMtx_stack_c::now;