Implement & link famicom.cpp

include/JSystem/JUtility/JUTAssertion.h

@@ -46,7 +46,7 @@ namespace JUTAssertion
 #define JUT_MAX_ASSERT(...)
 #define JUT_LOG_F(...)
 
-#ifndef DEBUG
+#if defined(DEBUG) || 1
 #define JUT_ASSERT(...)
 #define JUT_ASSERT_F(...)
 #else

include/JSystem/JUtility/JUTDbPrint.h

@@ -4,6 +4,6 @@
 void* JC_JUTDbPrint_getManager(void);    
 void JC_JUTDbPrint_setVisible(void*, int);  // I know these are C++ but these were used to match a c function so I'll fix these when I need them or fix zurumode update.
 
-
+void JUTReport(int x, int y, int show_count, const char* fmt, ...);
 
 #endif

include/JSystem/JUtility/JUTGamePad.h

@@ -126,10 +126,12 @@ public:
         return JUTGamePad::sClampMode;
     }
 
-    static s8 getPortStatus(EPadPort port) {
+    /* @HACK - This gets inlined when defined -- JSystem might have precompiled headers */
+    static s8 getPortStatus(EPadPort port);
+    /*{
         JUT_ASSERT(0 <= port && port < 4);
         return mPadStatus[port].err;
-    }
+    }*/
 
     bool isPushing3ButtonReset() const {
         bool pushing = false;

include/JSystem/JUtility/JUTProcBar.h

@@ -0,0 +1,156 @@
+#ifndef _JUTPROCBAR_H
+#define _JUTPROCBAR_H
+
+#include "dolphin/os.h"
+#include "dolphin/os/OSTime.h"
+#include "JSystem/JUtility/TColor.h"
+#include "JSystem/JKernel/JKRHeap.h"
+
+#include "types.h"
+
+class JUTProcBar
+{
+public:
+    struct CTime
+    {
+        CTime() { clear(); }
+
+        void clear()
+        {
+            mCost = 0;
+            _08 = 0;
+            _0C = 0;
+        }
+
+        void start(u8 red, u8 green, u8 blue)
+        {
+            mR = red;
+            mG = green;
+            mB = blue;
+            mStartTick = OSGetTick();
+        }
+
+        void end()
+        {
+            mCost = OSTicksToMicroseconds(OSDiffTick(OSGetTick(), mStartTick));
+            if (mCost == 0)
+                mCost = 1;
+        }
+
+        void accumePeek()
+        {
+            //u32 prev = ++_0C;
+            if (++_0C >= 0x10 || mCost >= _08)
+            {
+                _08 = mCost;
+                _0C = 0;
+            }
+        }
+
+        int calcBarSize(int p1, int p2) { return mCost * p1 / p2; }
+
+        u32 mStartTick; // _00
+        u32 mCost;      // _04
+        u32 _08;        // _08
+        u32 _0C;        // _0C
+        u8 mR;          // _10
+        u8 mG;          // _11
+        u8 mB;          // _12
+    };
+
+    struct CParamSet  {
+        void setBarWidth(int w) { mBarWidth = w; };
+        void setWidth(int w) { mWidth = w; }
+        void setUserPosition(int pos) { mUserPosition = pos; }
+        void setPosition(int x, int y)
+        {
+            mPosX = x;
+            mPosY = y;
+        }
+
+        /* 0x00 */ int mBarWidth;
+        /* 0x04 */ int mPosX;
+        /* 0x08 */ int mPosY;
+        /* 0x0C */ int mWidth;
+        /* 0x10 */ int mUserPosition;
+    };
+
+    JUTProcBar(); // unused / inlined
+    ~JUTProcBar(); // unused / inlined
+
+    static JUTProcBar* create();
+    static void destroy();
+    static void clear();
+
+    void draw();
+    void drawProcessBar();
+    void drawHeapBar();
+
+    // Unused Functions / Inlines
+    void bar_subroutine(int, int, int, int, int, int, int, JUtility::TColor, JUtility::TColor);
+    void adjustMeterLength(u32, f32 *, f32, f32, int *);
+    void getUnuseUserBar();
+
+    u32 getGpCost() const {
+        return mGp.mCost;
+    }
+
+    u32 getCpuCost() const {
+        return mCpu.mCost;
+    }
+
+    u32 getUserCost(int idx) {
+        return sManager->mUsers[idx].mCost;
+    }
+
+    static JUTProcBar* getManager() {
+        return sManager;
+    }
+
+    void idleStart() { mIdle.start(255, 129, 30); }
+    void idleEnd() { mIdle.end(); }
+    void gpStart() { mGp.start(255, 129, 30); }
+    void gpEnd() { mGp.end(); }
+    void cpuStart() { mCpu.start(255, 129, 30); }
+    void cpuEnd() { mCpu.end(); }
+    void gpWaitStart() { mGpWait.start(255, 129, 30); }
+    void gpWaitEnd() { mGpWait.end(); }
+    void wholeLoopStart() { mWholeLoop.start(255, 129, 30); }
+    void wholeLoopEnd() { mWholeLoop.end(); }
+
+    void setCostFrame(int frame) { mCostFrame = frame; }
+    void setVisible(bool visible) { mVisible = visible; }
+    bool isVisible() { return mVisible; }
+    void setHeapBarVisible(bool visible) { mHeapBarVisible = visible; }
+    void userStart(int idx, u8 p2, u8 p3, u8 p4) {
+        sManager->mUsers[idx].start(p2, p3, p4);
+        sManager->_108 |= 1 << idx;
+    }
+
+    inline u32 calcGPUTime() { // fabricated
+        return mGp.mCost - mGpWait.mCost;
+    }
+
+    int calcBarHeight() { // fabricated
+        return mParams.mBarWidth * 2;
+    }
+
+    static JUTProcBar* sManager;    // might be private too
+private:
+    CTime mIdle;            // _00
+    CTime mGp;              // _14
+    CTime mCpu;             // _28
+    CTime mGpWait;          // _3C
+    CTime mWholeLoop;       // _50
+    CTime mUsers[8];        // _64
+    int mCostFrame;         // _104
+    u32 _108;               // _108, active users?
+    bool mVisible;          // _10C
+    int _110;               // _110
+    CParamSet mParams;      // _114
+    int _128;               // _128
+    JKRHeap* mWatchHeap;    // _12C
+    bool mHeapBarVisible;   // _130
+}; // 0x134 size
+
+#endif