Organize libc and libm files (zeldaret#1499)

* memmove

* strcpy

* strcmp

* memset

* fmodf

* fix some missing includes

* Remove libc header dependencies on libultra

* fix

* review

Author: AngheloAlf

Makefile

@@ -207,6 +207,8 @@ $(shell mkdir -p build/baserom $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(ASSET_BIN
 # directory flags
 build/src/boot/O2/%.o: OPTFLAGS := -O2
 
+build/src/boot/libc/%.o: OPTFLAGS := -O2
+build/src/boot/libm/%.o: OPTFLAGS := -O2
 build/src/boot/libc64/%.o: OPTFLAGS := -O2
 
 build/src/libultra/os/%.o: OPTFLAGS := -O1

include/PR/ultratypes.h

@@ -22,11 +22,14 @@ typedef volatile s64 vs64;
 typedef float  f32;
 typedef double f64;
 
+#if !defined(_SIZE_T)
+#define _SIZE_T
 #if defined(_MIPS_SZLONG) && (_MIPS_SZLONG == 64)
 typedef unsigned long size_t;
 #else
 typedef unsigned int  size_t;
 #endif
+#endif
 
 #ifndef NULL
 #define NULL ((void*)0)

include/functions.h

@@ -65,12 +65,6 @@ void MtxConv_L2F(MtxF* mtx, Mtx* mf);
 
 s32 func_80086620(OSMesgQueue* param_1, PadMgr* param_2, OSContStatus* param_3);
 
-f32 fmodf(f32 dividend, f32 divisor);
-void* __osMemset(void* ptr, s32 val, size_t size);
-s32 __osStrcmp(const char* str1, const char* str2);
-char* __osStrcpy(char* dst, const char* src);
-void* __osMemcpy(void* dst, void* src, size_t size);
-
 // void EnItem00_SetObject(EnItem00* this, PlayState* play, f32* shadowOffset, f32* shadowScale);
 // void EnItem00_Init(Actor* thisx, PlayState* play);
 // void EnItem00_Destroy(Actor* thisx, PlayState* play);

include/libc/math.h

@@ -17,4 +17,6 @@ float fabsf(float f);
 double sqrt(double d);
 #pragma intrinsic(sqrt)
 
+float fmodf(float dividend, float divisor);
+
 #endif

include/libc/stddef.h

@@ -1,9 +1,16 @@
 #ifndef LIBC_STDDEF_H
 #define LIBC_STDDEF_H
 
-#include "PR/ultratypes.h"
+#if !defined(_SIZE_T)
+#define _SIZE_T
+#if defined(_MIPS_SZLONG) && (_MIPS_SZLONG == 64)
+typedef unsigned long size_t;
+#else
+typedef unsigned int  size_t;
+#endif
+#endif
 
-typedef s32 ptrdiff_t;
+typedef signed long ptrdiff_t;
 
 #ifdef __GNUC__
 #define offsetof(structure, member) __builtin_offsetof (structure, member)

include/libc/string.h

@@ -3,10 +3,13 @@
 
 #include "libc/stddef.h"
 
-
 const char* strchr(const char* s, int c);
 size_t strlen(const char* s);
 void* memcpy(void* s1, const void* s2, size_t n);
 
+void* memset(void* ptr, int val, size_t size);
+int strcmp(const char* str1, const char* str2);
+char* strcpy(char* dst, const char* src);
+void* memmove(void* dst, const void* src, size_t size);
 
 #endif

spec

@@ -237,11 +237,11 @@ beginseg
     include "build/src/libultra/os/sethwinterrupt.o"
     include "build/asm/boot/getwatchlo.text.o"
     include "build/asm/boot/setwatchlo.text.o"
-    include "build/src/boot/O2/fmodf.o"
-    include "build/src/boot/O2/__osMemset.o"
-    include "build/src/boot/O2/__osStrcmp.o"
-    include "build/src/boot/O2/__osStrcpy.o"
-    include "build/src/boot/O2/__osMemcpy.o"
+    include "build/src/boot/libm/fmodf.o"
+    include "build/src/boot/libc/memset.o"
+    include "build/src/boot/libc/strcmp.o"
+    include "build/src/boot/libc/strcpy.o"
+    include "build/src/boot/libc/memmove.o"
     include "build/src/boot/build.o"
 endseg
 

src/boot/O2/__osMemset.c

@@ -1,9 +1,9 @@
-#include "global.h"
+#include "libc/string.h"
 
-void* __osMemcpy(void* dst, void* src, size_t size) {
-    u8* _dst = dst;
-    u8* _src = src;
-    register s32 rem;
+void* memmove(void* dst, const void* src, size_t size) {
+    unsigned char* _dst = dst;
+    const unsigned char* _src = src;
+    register size_t rem;
 
     if (_dst == _src) {
         return dst;

src/boot/O2/__osMemcpy.c renamed to src/boot/libc/memmove.c

@@ -0,0 +1,12 @@
+#include "libc/string.h"
+
+void* memset(void* ptr, int val, size_t size) {
+    unsigned char* dst = ptr;
+    register size_t rem;
+
+    for (rem = size--; rem != 0; rem = size--) {
+        *dst++ = val;
+    }
+
+    return ptr;
+}