From ff8ba2cc108c2a2d58cb86d6d2c760a8b7a43eef Mon Sep 17 00:00:00 2001
From: louist103 <35883445+louist103@users.noreply.github.com>
Date: Sat, 13 Jan 2024 19:22:47 -0500
Subject: Use libc functions for bcmp, bcpy, bzero, LibMemset, LibMemCmp.

---
 mm/src/boot/O2/__osMalloc.c    | 7 ++++---
 mm/src/boot/O2/loadfragment.c  | 5 +++--
 mm/src/boot/O2/system_malloc.c | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'mm/src/boot/O2')

diff --git a/mm/src/boot/O2/__osMalloc.c b/mm/src/boot/O2/__osMalloc.c
index 085f6286c..dd94e8c0d 100644
--- a/mm/src/boot/O2/__osMalloc.c
+++ b/mm/src/boot/O2/__osMalloc.c
@@ -3,6 +3,7 @@
 #include "libc/stdint.h"
 #include "macros.h"
 #include "functions.h"
+#include <string.h>
 
 #define FILL_ALLOCBLOCK (1 << 0)
 #define FILL_FREEBLOCK (1 << 1)
@@ -57,7 +58,7 @@ ArenaNode* ArenaImpl_GetLastBlock(Arena* arena) {
  * @param size   The size of the heap.
  */
 void __osMallocInit(Arena* arena, void* heap, size_t size) {
-    bzero(arena, sizeof(Arena));
+    memset(arena, 0, sizeof(Arena));
 
     ArenaImpl_LockInit(arena);
 
@@ -112,7 +113,7 @@ void __osMallocAddHeap(Arena* arena, void* heap, size_t size) {
  * @param arena  The Arena to clear.
  */
 void __osMallocCleanup(Arena* arena) {
-    bzero(arena, sizeof(Arena));
+    memset(arena, 0, sizeof(Arena));
 }
 
 /**
@@ -377,7 +378,7 @@ void* __osRealloc(Arena* arena, void* ptr, size_t newSize) {
                 // Create a new pointer and manually copy the data from the old pointer to the new one
                 newPtr = __osMalloc(arena, newSize);
                 if (newPtr != NULL) {
-                    bcopy(newPtr, ptr, node->size);
+                    memcpy(ptr, newPtr, node->size);
                     __osFree(arena, ptr);
                 }
                 ptr = newPtr;
diff --git a/mm/src/boot/O2/loadfragment.c b/mm/src/boot/O2/loadfragment.c
index 69fa9959c..b1ba39d65 100644
--- a/mm/src/boot/O2/loadfragment.c
+++ b/mm/src/boot/O2/loadfragment.c
@@ -13,6 +13,7 @@
 #include "global.h"
 #include "system_malloc.h"
 #include "loadfragment.h"
+#include <string.h>
 
 s32 gLoadLogSeverity = 2;
 
@@ -165,7 +166,7 @@ size_t Fragment_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, vo
 
     if (ovlRelocs->bssSize != 0) {
         if (gLoadLogSeverity >= 3) {}
-        bzero((void*)end, ovlRelocs->bssSize);
+        memset((void*)end, 0, ovlRelocs->bssSize);
     }
 
     osWritebackDCache(allocatedRamAddr, allocatedBytes);
@@ -220,7 +221,7 @@ void* Fragment_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, void* vra
 
     if (ovlRelocs->bssSize != 0) {
         if (gLoadLogSeverity >= 3) {}
-        bzero((void*)end, ovlRelocs->bssSize);
+        memset((void*)end, 0, ovlRelocs->bssSize);
     }
 
     osInvalICache(allocatedRamAddr, allocatedBytes);
diff --git a/mm/src/boot/O2/system_malloc.c b/mm/src/boot/O2/system_malloc.c
index cea017b38..eebaa291f 100644
--- a/mm/src/boot/O2/system_malloc.c
+++ b/mm/src/boot/O2/system_malloc.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "os_malloc.h"
+#include <string.h>
 
 Arena gSystemArena;
 
@@ -25,7 +26,7 @@ void* SystemArena_Calloc(u32 elements, size_t size) {
 
     ptr = __osMalloc(&gSystemArena, totalSize);
     if (ptr != NULL) {
-        bzero(ptr, totalSize);
+        memset(ptr, 0, totalSize);
     }
     return ptr;
 }
-- 
cgit v1.2.3