Changes to build on mac (#4)

mm/include/audio/load.h

@@ -132,7 +132,7 @@ s32 AudioLoad_SyncInitSeqPlayer(s32 playerIndex, s32 seqId, s32 arg2);
 s32 AudioLoad_SyncInitSeqPlayerSkipTicks(s32 playerIndex, s32 seqId, s32 skipTicks);
 void AudioLoad_ProcessLoads(s32 resetStatus);
 void AudioLoad_SetDmaHandler(DmaHandler callback);
-void AudioLoad_Init(void* heap, u32 heapSize);
+void AudioLoad_Init(void* heap, size_t heapSize);
 void AudioLoad_InitSlowLoads(void);
 s32 AudioLoad_SlowLoadSample(s32 fontId, s32 instId, s8* isDone);
 s32 AudioLoad_SlowLoadSeq(s32 seqId, u8* ramAddr, s8* isDone);

mm/include/functions.h

@@ -7,6 +7,7 @@ extern "C" {
 #endif
 
 #include "z64.h"
+#include "BenPort.h"
 
 void bootproc(void);
 void ViConfig_UpdateVi(u32 black);
@@ -40,10 +41,6 @@ void IrqMgr_HandleRetrace(IrqMgr* irqmgr);
 void IrqMgr_ThreadEntry(IrqMgr* irqmgr);
 void IrqMgr_Init(IrqMgr* irqmgr, void* stack, OSPri pri, u8 retraceCount);
 
-void osSyncPrintfUnused(const char* fmt, ...);
-
-void rmonPrintf(const char* fmt, ...);
-
 void RcpUtils_PrintRegisterStatus(void);
 void RcpUtils_Reset(void);
 
@@ -1324,6 +1321,41 @@ u8 AudioSeq_ResetReverb(void);
 void AudioSeq_ResetActiveSequences(void);
 void AudioSeq_ResetActiveSequencesAndVolume(void);
 
+// #region 2S2H [Port] Made Available via C++
+s32 osContInit(OSMesgQueue* mq, u8* controllerBits, OSContStatus* status);
+s32 osContStartReadData(OSMesgQueue* mesg);
+void osContGetReadData(OSContPad* pad);
+// #endregion
+// #region 2S2H [Port] Previously unavailable functions, made available for porting
+void PadMgr_ThreadEntry();
+void Heaps_Alloc(void);
+// #endregion
+// #region 2S2H [Port] Stubbed methods
+void osSetThreadPri(OSThread* thread, OSPri p);
+OSPri osGetThreadPri(OSThread* t);
+void osSyncPrintfUnused(const char* fmt, ...);
+void osSyncPrintf(const char* fmt, ...);
+void rmonPrintf(const char* fmt, ...);
+void osCreateThread(OSThread* thread, OSId id, void* entry, void* arg, void* sp, OSPri p);
+void osStartThread(OSThread* t);
+void osViSwapBuffer(void* frameBufPtr);
+void osViBlack(u8 active);
+void osDestroyThread(OSThread* t);
+void osViSetMode(OSViMode* modep);
+void osViSetSpecialFeatures(u32 func);
+s32 osContStartQuery(OSMesgQueue* mq);
+s32 osContSetCh(u8 ch);
+void osContGetQuery(OSContStatus* data);
+void osSpTaskLoad(OSTask* intp);
+void osSpTaskStartGo(OSTask* tp);
+void* osViGetCurrentFramebuffer(void);
+void* osViGetNextFramebuffer(void);
+OSYieldResult osSpTaskYielded(OSTask* task);
+void osSpTaskYield(void);
+void osViSetXScale(f32 value);
+void osViSetYScale(f32 value);
+// #endregion
+
 void Regs_InitData(PlayState* play);
 
 #ifdef __cplusplus

mm/include/libc/stdint.h

@@ -3,8 +3,12 @@
 
 #include "PR/ultratypes.h"
 
+// #region 2S2H [Port] These are defined by LUS
+#if 0
 typedef s32 intptr_t;
 typedef u32 uintptr_t;
+#endif
+// #endregion
 
 #define INT8_MIN    (-0x80)
 #define INT16_MIN   (-0x8000)

mm/include/variables.h

@@ -25,7 +25,7 @@ extern s32 sIrqMgrRetraceCount;
 
 extern u8 sYaz0DataBuffer[0x400];
 extern u8* sYaz0CurDataEnd;
-extern u32 sYaz0CurRomStart;
+extern uintptr_t sYaz0CurRomStart;
 extern u32 sYaz0CurSize;
 extern u8* sYaz0MaxPtr;
 extern void* gYaz0DecompressDstEnd;

mm/include/z64item.h

@@ -669,7 +669,7 @@ typedef enum GetItemDrawId {
     /* 0x73 */ GID_CHATEAU,
     /* 0x74 */ GID_PICTOGRAPH_BOX,
     /* 0x75 */ GID_MASK_FIERCE_DEITY,
-    /* 0x76 */ GID_MAX
+    /* 0x76 */ GID_MAXIMUM // 2S2H [Port] Changed from GID_MAX because that's a reserved macro on MacOS(?)
 } GetItemDrawId;
 
 #endif