More splits (text only)

include/egg/core/eggExpHeap.h

@@ -24,7 +24,7 @@ public:
     ExpHeap(MEMiHeapHead *heapHead);
     static ExpHeap *create(void *block, size_t size, u16 attr);
     static ExpHeap *create(size_t size, Heap *heap, u16 attr);
-    void setGroupID(u16 groupId);
+    void setAllocMode(u16 allocMode);
     static u32 getSizeForMBlock(const void *block);
 
     // Placement new for ::create

include/rvl/GX/GXTexture.h

@@ -52,7 +52,7 @@ void GXSetTexCoordBias(GXTexCoordID, GXBool, GXBool);
 
 u16 GXGetTexObjWidth(const GXTexObj *obj);
 u16 GXGetTexObjHeight(const GXTexObj *obj);
-GXTexFmt GXGetTexObjFormat(const GXTexObj *obj);
+GXTexFmt GXGetTexObjFmt(const GXTexObj *obj);
 GXBool GXGetTexObjMipMap(const GXTexObj *obj);
 GXTexWrapMode GXGetTexObjWrapS(const GXTexObj *obj);
 u32 GXGetTexObjTlut(const GXTexObj *);

include/rvl/MEM/mem_expHeap.h

@@ -56,10 +56,12 @@ void *MEMAllocFromExpHeapEx(struct MEMiHeapHead *heap, u32 size, s32 align);
 u32 MEMResizeForMBlockExpHeap(struct MEMiHeapHead *heap, void *memBlock, u32 size);
 void MEMFreeToExpHeap(struct MEMiHeapHead *heap, void *memBlock);
 u32 MEMGetAllocatableSizeForExpHeap(struct MEMiHeapHead *heap);
+u32 MEMGetTotalFreeSizeForExpHeap(struct MEMiHeapHead *heap);
 u32 MEMGetAllocatableSizeForExpHeapEx(struct MEMiHeapHead *heap, s32 align);
-void MEMSetGroupIdForExpHeap(MEMiHeapHead *mHeapHandle, u16 groupId);
+void MEMSetGroupIdForExpHeap(struct MEMiHeapHead *mHeapHandle, u16 groupId);
 u32 MEMAdjustExpHeap(struct MEMiHeapHead *heap);
 u32 MEMGetSizeForMBlockExpHeap(const void *block);
+void MEMSetAllocModeForExpHeap(struct MEMiHeapHead *heap, u16 allocMode);
 
 static inline struct MEMiHeapHead *MEMCreateExpHeap(void *start, u32 size) {
     return MEMCreateExpHeapEx(start, size, 0);

include/rvl/MEM/mem_heapCommon.h

@@ -37,6 +37,7 @@ typedef struct MEMiHeapHead {
 void MEMiInitHeapHead(MEMiHeapHead *heap, u32 magic, void *start, void *end, u16 opt);
 void MEMiFinalizeHeap(MEMiHeapHead *heap);
 MEMiHeapHead *MEMFindContainHeap(const void *memBlock);
+MEMiHeapHead *MEMFindParentHeap(const MEMiHeapHead *pHandle);
 
 static inline int GetUIntPtr(const void *p) {
     return (int)p;

include/rvl/OS/OSContext.h

@@ -27,6 +27,7 @@ typedef struct OSContext {
     f64 psfs[32];  // at 0x1C8
 } OSContext;
 
+void OSFillFPUContext(OSContext *ctx);
 void OSSaveFPUContext(OSContext *ctx);
 void OSSetCurrentContext(OSContext *ctx);
 OSContext *OSGetCurrentContext(void);

include/rvl/OS/OSMemory.h

@@ -11,11 +11,22 @@ extern "C" {
 #define OS_MEM_IS_MEM1(addr) (((u32)(addr) & 0x30000000) == 0)
 #define OS_MEM_IS_MEM2(addr) (((u32)(addr) & 0x30000000) == 0x10000000)
 
+#define OS_PROTECT_CHAN0 0
+#define OS_PROTECT_CHAN1 1
+#define OS_PROTECT_CHAN2 2
+#define OS_PROTECT_CHAN3 3
+
+#define OS_PROTECT_CONTROL_NONE 0x00
+#define OS_PROTECT_CONTROL_READ 0x01
+#define OS_PROTECT_CONTROL_WRITE 0x02
+#define OS_PROTECT_CONTROL_RDWR (OS_PROTECT_CONTROL_READ | OS_PROTECT_CONTROL_WRITE)
+
 u32 OSGetPhysicalMem1Size(void);
 u32 OSGetPhysicalMem2Size(void);
 u32 OSGetConsoleSimulatedMem1Size(void);
 u32 OSGetConsoleSimulatedMem2Size(void);
 void __OSInitMemoryProtection(void);
+void OSProtectRange(u32 chan, void* addr, u32 nBytes, u32 control);
 
 #ifdef __cplusplus
 }