mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-09-07 19:11:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into eggXfbManager

Browse Source
This commit is contained in:
Elijah Thomas
2024-05-12 13:00:28 -04:00
committed by GitHub
parent 477f6da6cd d91a829295
commit 901eebc4ef
15 changed files with 504 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rvl/MEM/mem_expHeap.h
+6 -2
View File
@@ -53,8 +53,11 @@ struct MEMiHeapHead *MEMDestroyExpHeap(struct MEMiHeapHead *heap);
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 MEMGetAllocatableSizeForExpHeapEx(struct MEMiHeapHead *heap, s32 align);
void MEMSetGroupIdForExpHeap(MEMiHeapHead *mHeapHandle, u16 groupId);
u32 MEMAdjustExpHeap(struct MEMiHeapHead *heap);
u32 MEMGetSizeForMBlockExpHeap(const void *block);
static inline struct MEMiHeapHead *MEMCreateExpHeap(void *start, u32 size) {
return MEMCreateExpHeapEx(start, size, 0);
@@ -63,10 +66,11 @@ static inline struct MEMiHeapHead *MEMCreateExpHeap(void *start, u32 size) {
static inline void *MEMAllocFromExpHeap(struct MEMiHeapHead *heap, u32 size) {
return MEMAllocFromExpHeapEx(heap, size, 4);
}
// This doesn't appear to be inline in SS yet
/*
static inline u32 MEMGetAllocatableSizeForExpHeap(struct MEMiHeapHead *heap) {
return MEMGetAllocatableSizeForExpHeapEx(heap, 4);
}
}*/
#ifdef __cplusplus
}
include/rvl/OS/OSError.h
+2
View File
@@ -1,6 +1,7 @@
#ifndef RVL_SDK_OS_ERROR_H
#define RVL_SDK_OS_ERROR_H
#include <common.h>
#include <Runtime.PPCEABI.H/__va_arg.h>
#ifdef __cplusplus
extern "C" {
#endif
@@ -41,6 +42,7 @@ extern OSErrorHandler __OSErrorTable[OS_ERR_MAX];
extern u32 __OSFpscrEnableBits;
DECL_WEAK void OSReport(const char *msg, ...);
DECL_WEAK void OSVReport(const char *msg, va_list args);
DECL_WEAK void OSPanic(const char *file, int line, const char *msg, ...);
OSErrorHandler OSSetErrorHandler(u16 error, OSErrorHandler handler);