Add JKRHeap.cpp

include/dolphin/OS/OSAddress.h

@@ -0,0 +1,32 @@
+#ifndef OS_ADDRESS_H
+#define OS_ADDRESS_H
+
+// maybe put this in OSUtil instead
+#include "types.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+// Defines for cached and uncached memory.
+#define OS_BASE_CACHED (0x80000000)
+#define OS_BASE_UNCACHED (0xC0000000)
+
+// Address conversions.
+#define OSPhysicalToCached(paddr) ((void *)((u32)(paddr) + OS_BASE_CACHED))
+#define OSPhysicalToUncached(paddr) ((void *)((u32)(paddr) + OS_BASE_UNCACHED))
+#define OSCachedToPhysical(caddr) ((u32)((u8 *)(caddr)-OS_BASE_CACHED))
+#define OSUncachedToPhysical(ucaddr) ((u32)((u8 *)(ucaddr)-OS_BASE_UNCACHED))
+#define OSCachedToUncached(caddr) ((void *)((u8 *)(caddr) + (OS_BASE_UNCACHED - OS_BASE_CACHED)))
+#define OSUncachedToCached(ucaddr) ((void *)((u8 *)(ucaddr) - (OS_BASE_UNCACHED - OS_BASE_CACHED)))
+
+#define OS_CACHED_REGION_PREFIX 0x8000
+#define OS_UNCACHED_REGION_PREFIX 0xC000
+#define OS_PHYSICAL_MASK 0x3FFF
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif

include/dolphin/OS/OSAlloc.h

@@ -0,0 +1,15 @@
+#ifndef OS_ALLOC_H
+#define OS_ALLOC_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    void *OSInitAlloc(void *, void *, int);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/dolphin/OS/OSMutex.h

@@ -0,0 +1,36 @@
+#ifndef OS_MUTEX_H
+#define OS_MUTEX_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include "dolphin/OS/OSThread.h"
+
+    struct OSMutex
+    {
+        OSThreadQueue queue;
+        OSThread *thread; // the current owner
+        s32 count;        // lock count
+        OSMutexLink link; // for OSThread.queueMutex
+    };
+
+    struct OSCond
+    {
+        OSThreadQueue queue;
+    };
+
+    void OSInitMutex(OSMutex *mutex);
+    void OSLockMutex(OSMutex *mutex);
+    void OSUnlockMutex(OSMutex *mutex);
+    BOOL OSTryLockMutex(OSMutex *mutex);
+    void OSInitCond(OSCond *cond);
+    void OSWaitCond(OSCond *cond, OSMutex *mutex);
+    void OSSignalCond(OSCond *cond);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // DOLPHIN_OSMUTEX_H

include/dolphin/OS/OSThread.h

@@ -0,0 +1,129 @@
+#ifndef OS_THREAD_H
+#define OS_THREAD_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include "dolphin/os/OSContext.h"
+
+    typedef struct OSThread OSThread;
+    typedef struct OSThreadQueue OSThreadQueue;
+    typedef struct OSThreadLink OSThreadLink;
+    typedef s32 OSPriority; //  0 highest, 31 lowest
+
+    typedef struct OSMutex OSMutex;
+    typedef struct OSMutexQueue OSMutexQueue;
+    typedef struct OSMutexLink OSMutexLink;
+    typedef struct OSCond OSCond;
+
+    typedef void (*OSIdleFunction)(void *param);
+
+    struct OSThreadQueue
+    {
+        OSThread *head;
+        OSThread *tail;
+    };
+
+    struct OSThreadLink
+    {
+        OSThread *next;
+        OSThread *prev;
+    };
+
+    struct OSMutexQueue
+    {
+        OSMutex *head;
+        OSMutex *tail;
+    };
+
+    struct OSMutexLink
+    {
+        OSMutex *next;
+        OSMutex *prev;
+    };
+
+    struct OSThread
+    {
+        OSContext context; // register context
+
+        u16 state;           // OS_THREAD_STATE_*
+        u16 attr;            // OS_THREAD_ATTR_*
+        s32 suspend;         // suspended if the count is greater than zero
+        OSPriority priority; // effective scheduling priority
+        OSPriority base;     // base scheduling priority
+        void *val;           // exit value
+
+        OSThreadQueue *queue; // queue thread is on
+        OSThreadLink link;    // queue link
+
+        OSThreadQueue queueJoin; // list of threads waiting for termination (join)
+
+        OSMutex *mutex;          // mutex trying to lock
+        OSMutexQueue queueMutex; // list of mutexes owned
+
+        OSThreadLink linkActive; // link of all threads for debugging
+
+        u8 *stackBase; // the thread's designated stack (high address)
+        u32 *stackEnd; // last word of stack (low address)
+    };
+
+    // Thread states
+    enum OS_THREAD_STATE
+    {
+        OS_THREAD_STATE_READY = 1,
+        OS_THREAD_STATE_RUNNING = 2,
+        OS_THREAD_STATE_WAITING = 4,
+        OS_THREAD_STATE_MORIBUND = 8
+    };
+
+// Thread priorities
+#define OS_PRIORITY_MIN 0  // highest
+#define OS_PRIORITY_MAX 31 // lowest
+#define OS_PRIORITY_IDLE OS_PRIORITY_MAX
+
+// Thread attributes
+#define OS_THREAD_ATTR_DETACH 0x0001u // detached
+
+// Stack magic value
+#define OS_THREAD_STACK_MAGIC 0xDEADBABE
+
+    void OSInitThreadQueue(OSThreadQueue *queue);
+    OSThread *OSGetCurrentThread(void);
+    BOOL OSIsThreadSuspended(OSThread *thread);
+    BOOL OSIsThreadTerminated(OSThread *thread);
+    s32 OSDisableScheduler(void);
+    s32 OSEnableScheduler(void);
+    void OSYieldThread(void);
+    BOOL OSCreateThread(OSThread *thread,
+                        void *(*func)(void *),
+                        void *param,
+                        void *stack,
+                        u32 stackSize,
+                        OSPriority priority,
+                        u16 attr);
+    void OSExitThread(void *val);
+    void OSCancelThread(OSThread *thread);
+    BOOL OSJoinThread(OSThread *thread, void **val);
+    void OSDetachThread(OSThread *thread);
+    s32 OSResumeThread(OSThread *thread);
+    s32 OSSuspendThread(OSThread *thread);
+    BOOL OSSetThreadPriority(OSThread *thread, OSPriority priority);
+    OSPriority OSGetThreadPriority(OSThread *thread);
+    void OSSleepThread(OSThreadQueue *queue);
+    void OSWakeupThread(OSThreadQueue *queue);
+
+    OSThread *OSSetIdleFunction(OSIdleFunction idleFunction,
+                                void *param,
+                                void *stack,
+                                u32 stackSize);
+    OSThread *OSGetIdleFunction(void);
+
+    long OSCheckActiveThreads(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // DOLPHIN_OSTHREAD_H

include/dolphin/OS/OSUtil.h

@@ -0,0 +1,18 @@
+#ifndef OS_UTIL_H
+#define OS_UTIL_H
+
+#include "types.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#define OSRoundUp32B(x) (((u32)(x) + 0x1F) & ~(0x1F))
+#define OSRoundDown32B(x) (((u32)(x)) & ~(0x1F))
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif

include/dolphin/OS/os.h

@@ -8,14 +8,17 @@
 extern "C" {
 #endif
 
+void OSPanic(const char *file, int line, const char *message, ...);
 void OSReport(const char*, ...);
 void OSVReport(const char* format, va_list list);
 
+#define OSErrorLine(line, ...) \
+    OSPanic(__FILE__, line, __VA_ARGS__)
+
 asm BOOL OSDisableInterrupts(void);
 asm BOOL OSEnableInterrupts(void);
 asm BOOL OSRestoreInterrupts(BOOL level);
 
-
 void __RAS_OSDisableInterrupts_begin(void);
 void __RAS_OSDisableInterrupts_end(void);