m_Do_main / f_ap_game / f_op_actor debug work and misc (#2744)

* m_Do_main / f_ap_game debug stuff

* revolution sdk compatibility

* f_op_actor debug work

* rename fopAcM_SetupActor to fopAcM_ct

* fix build

* fix jp/pal splits

include/m_Do/m_Do_MemCard.h

@@ -163,4 +163,8 @@ inline void mDoMemCd_setCardStatus(s32 fileNo, CARDStat* stat) {
     g_mDoMemCd_control.setCardStatus(fileNo, stat);
 }
 
+inline void mDoMemCd_UpDate() {
+    g_mDoMemCd_control.update();
+}
+
 #endif /* M_DO_M_DO_MEMCARD_H */

include/m_Do/m_Do_Reset.h

@@ -6,9 +6,6 @@
 void mDoRst_reset(int, u32, int);
 void mDoRst_resetCallBack(int, void*);
 
-extern bool SyncWidthSound;
-extern u8 sDefaultDirection;
-
 struct mDoRstData {
     /* 0x00 */ int mReset;
     /* 0x04 */ int mResetPrepare;

include/m_Do/m_Do_dvd_thread.h

@@ -120,6 +120,11 @@ struct mDoDvdThd {
     static OSThread l_thread;
     static mDoDvdThdStack l_threadStack;
     static mDoDvdThd_param_c l_param;
+
+    static u8 verbose;
+    static u8 DVDLogoMode;
+    static bool SyncWidthSound;
+    static u8 Report_DVDRead;
 };
 
 #endif /* M_DO_M_DO_DVD_THREAD_H */

include/m_Do/m_Do_ext.h

@@ -859,7 +859,12 @@ void mDoExt_modelUpdateDL(J3DModel* i_model);
 J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag,
                                   u32 i_differedDlistFlag);
 
+extern u32 aram_cache_size;
 void mDoExt_setAraCacheSize(u32 size);
+inline u32 mDoExt_getAraCacheSize() {
+    return aram_cache_size;
+}
+
 int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id);
 void mDoExt_modelEntryDL(J3DModel* i_model);
 void mDoExt_brkAnmRemove(J3DModelData* i_modelData);

include/m_Do/m_Do_ext2.h

@@ -0,0 +1,30 @@
+#ifndef M_DO_EXT2_H
+#define M_DO_EXT2_H
+
+#include "JSystem/JKernel/JKRHeap.h"
+
+class FixedMemoryCheck {
+public:
+    FixedMemoryCheck(u32*, u32, JKRHeap*);
+
+    void alloc();
+    void save();
+    void check();
+    void diff();
+
+    static void easyCreate(void*, s32);
+    static void easyCreate(void*, u32);
+    static void checkAll();
+    static void diffAll();
+    static void saveAll();
+
+    /* 0x00 */ u32* field_0x00;
+    /* 0x04 */ u32 field_0x04;
+    /* 0x08 */ u32* field_0x08;
+    /* 0x0C */ JKRHeap* mpHeap;
+    /* 0x10 */ int field_0x10;
+    /* 0x14 */ u8 field_0x14;
+    /* 0x18 */ FixedMemoryCheck* field_0x18;
+};
+
+#endif

include/m_Do/m_Do_graphic.h

@@ -27,6 +27,7 @@ public:
         void setBlendColor(GXColor i_color) { mBlendColor = i_color; }
         void setMonoColor(GXColor i_color) { mMonoColor = i_color; }
         void setMode(u8 i_mode) { mMode = i_mode; }
+        void* getBuffer() { return m_buffer; }
 
         /* 0x00 */ GXColor mBlendColor;
         /* 0x04 */ GXColor mMonoColor;
@@ -147,6 +148,15 @@ public:
     static void setWideZoomLightProjection(Mtx m) {}
     static void setFrameRate(u16 i_rate) { JFWDisplay::getManager()->setFrameRate(i_rate); }
 
+    static int getFrameBufferSize() {
+        #define RoundUp16b(x)   (u16)(((u16)(x) + 16 - 1) & ~(16 - 1))
+        return RoundUp16b(JFWDisplay::getManager()->getEfbWidth()) * JFWDisplay::getManager()->getEfbHeight() * 2;
+    }
+
+    static void* getFrameBufferMemory() {
+        return JFWDisplay::getManager()->getXfbManager()->getDisplayingXfb();
+    }
+
     // NONMATCHING - Need to define all mDoGph_gInf_c shieldD members
     static u8 isWide() {
         #if PLATFORM_WII || PLATFORM_SHIELD
@@ -183,6 +193,11 @@ public:
     static bool mAutoForcus;
 
     #if PLATFORM_WII || PLATFORM_SHIELD
+    static JKRHeap* getHeap() {
+        return m_heap;
+    }
+
+    static JKRHeap* m_heap;
     static cXyz m_nowEffPos;
     static cXyz m_oldEffPos;
     static cXyz m_oldOldEffPos;

include/m_Do/m_Do_machine.h

@@ -13,6 +13,7 @@ void exceptionRestart();
 void myExceptionCallback(u16, OSContext*, u32, u32);
 void my_SysPrintHeap(char const*, void*, u32);
 void mDoMch_HeapCheckAll();
+void mDoMch_HeapFreeFillAll();
 int mDoMch_Create();
 
 extern GXRenderModeObj g_ntscZeldaProg;
@@ -29,4 +30,17 @@ public:
     static GXRenderModeObj* mRenderModeObj;
 };
 
+namespace mDoMch {
+    extern u8 mDebugFill;
+    extern u8 mDebugFillNotuse;
+    extern u8 mDebugFillNew;
+    extern u8 mDebugFillDelete;
+
+    extern u8 myHeapVerbose;
+    extern u8 myHeapCallbackCheck;
+    extern u8 FpscrEnableBits;
+    extern u8 GXWarningLevel;
+    extern u8 GXWarningExecuteFrame;
+};
+
 #endif /* M_DO_M_DO_MACHINE_H */

include/m_Do/m_Do_main.h

@@ -26,16 +26,23 @@ public:
     u32& getUsedCountRef() { return mUsedCount; }
     u32& getTotalUsedSizeRef() { return mTotalUsedSize; }
     JKRExpHeap* getHeap() { return mHeap; }
-    void setHeap(JKRExpHeap* i_heap) { mHeap = i_heap; }
     void setHeapSize(u32 i_size) { mTargetHeapSize = i_size; }
     s32 getMaxTotalUsedSize() const { return mMaxTotalUsedSize; }
     s32 getMaxTotalFreeSize() { return mMaxTotalFreeSize; }
     const char* getName() const { return mName; }
+    const char* getJName() const { return mJName; }
     void saveRelBase() {
         mUsedCount = getUsedCount();
         mTotalUsedSize = mHeap->getTotalUsedSize();
     }
 
+    void setHeap(JKRExpHeap* i_heap) {
+        mHeap = i_heap;
+        if (i_heap != NULL) {
+            mTargetHeapSize = i_heap->getHeapSize();
+        }
+    }
+
     u32 getTargetHeapSize() const { return mTargetHeapSize; }
 
     u32 getRelUsedCount() const { return getUsedCount() - mUsedCount; }

include/m_Do/m_Do_printf.h

@@ -9,4 +9,16 @@ void mDoPrintf_vprintf_Thread(char const*, va_list);
 void mDoPrintf_vprintf(const char*, va_list);
 extern "C" void mDoPrintf_VReport(const char*, va_list);
 
+extern u32 print_counts;
+extern u32 print_errors;
+extern u32 print_warings;
+extern u32 print_systems;
+extern u8 print_initialized;
+
+extern u8 print_mutex_initialized;
+extern u8 print_highPriority;
+extern u8 print_threadID;
+extern u8 print_callerPC;
+extern u8 print_callerPCLevel;
+
 #endif /* M_DO_M_DO_PRINTF_H */