diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-03-01 04:48:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-01 14:48:49 +0200 |
| commit | 19e18654c9866a5aa5c181c0432157995596cbcb (patch) | |
| tree | 0ebbd4697e3189bad69383cfe536db7fab93c775 /src/SSystem/SComponent/c_malloc.cpp | |
| parent | 9c3c07575a47d64fa70561d6a2cfd166aee94ccd (diff) | |
tag_allmato almost, swhit0 treesh swball done, misc cleanup (#2312)
* d_a_tag_allmato almost done
* d_a_swhit0 done
* some SSystem cleanup
* treesh done
* swball done, some other rel cleanup
Diffstat (limited to 'src/SSystem/SComponent/c_malloc.cpp')
| -rw-r--r-- | src/SSystem/SComponent/c_malloc.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/SSystem/SComponent/c_malloc.cpp b/src/SSystem/SComponent/c_malloc.cpp index 1961932935..cedf67fbe2 100644 --- a/src/SSystem/SComponent/c_malloc.cpp +++ b/src/SSystem/SComponent/c_malloc.cpp @@ -6,7 +6,6 @@ #include "SSystem/SComponent/c_malloc.h" #include "JSystem/JKernel/JKRHeap.h" -/* ############################################################################################## */ /* 80451150-80451158 0004+04 s=3 e=0 z=0 None .sbss Heap__3cMl */ JKRHeap* cMl::Heap; @@ -16,12 +15,15 @@ void cMl::init(JKRHeap* heap) { } /* 80263228-80263260 0038+00 s=0 e=8 z=0 None .text memalignB__3cMlFiUl */ -void* cMl::memalignB(int alignment, unsigned long size) { +void* cMl::memalignB(int alignment, u32 size) { + void* ret; if (size == 0) { - return NULL; + ret = NULL; } else { - return Heap->alloc(size, alignment); + ret = Heap->alloc(size, alignment); } + + return ret; } /* 80263260-8026328C 002C+00 s=0 e=4 z=0 None .text free__3cMlFPv */ @@ -29,4 +31,4 @@ void cMl::free(void* ptr) { if (ptr != NULL) { Heap->free(ptr); } -}
\ No newline at end of file +} |
