diff options
| author | Max <mparisi@stevens.edu> | 2020-09-15 11:54:46 -0400 |
|---|---|---|
| committer | Max <mparisi@stevens.edu> | 2020-09-15 11:54:46 -0400 |
| commit | 3c02ef9ea299c9f78ff9df4322bcf4d9130213c0 (patch) | |
| tree | f7bfe703f6cc9252f778b92f135fdcbee0cbe347 | |
| parent | adc235826d66553dfb1eb4286430aac4810bc991 (diff) | |
Match OSAlloc.c, labeled HeapArray is sbss.s
| -rw-r--r-- | asm/sbss.s | 4 | ||||
| -rw-r--r-- | include/SDK/OS/OSAlloc.h | 1 | ||||
| -rw-r--r-- | src/SDK/OS/OSAlloc.c | 2 |
3 files changed, 3 insertions, 4 deletions
@@ -2529,8 +2529,8 @@ lbl_8063FA6C: .global lbl_8063FA70 lbl_8063FA70: .skip 0x8 -.global lbl_8063FA78 -lbl_8063FA78: +.global HeapArray +HeapArray: .skip 0x8 .global lbl_8063FA80 lbl_8063FA80: diff --git a/include/SDK/OS/OSAlloc.h b/include/SDK/OS/OSAlloc.h index 0c583e8..a8714eb 100644 --- a/include/SDK/OS/OSAlloc.h +++ b/include/SDK/OS/OSAlloc.h @@ -34,7 +34,6 @@ typedef struct { HeapDesc* heapArray; } OSHeapInfo; - Cell *DLInsert(Cell *original, Cell *inserted); void *OSAllocFromHeap(OSHeapHandle heap, u32 size); void OSFreeToHeap(OSHeapHandle heap, void *ptr); diff --git a/src/SDK/OS/OSAlloc.c b/src/SDK/OS/OSAlloc.c index 9270776..a60f3c0 100644 --- a/src/SDK/OS/OSAlloc.c +++ b/src/SDK/OS/OSAlloc.c @@ -139,7 +139,7 @@ OSHeapHandle OSCreateHeap(void *start, void *end) // arenaStart param of OSInitAlloc, points to array of // maxHeap HeapDescs, 68c -HeapDesc *HeapArray; +extern HeapDesc *HeapArray; #define HEADERSIZE OSi_ROUND(sizeof(Cell), 32) #define MINOBJSIZE (HEADERSIZE+32) |