De-inlining some memory functions for freestanding gcc.

Author: nicolasnoble

libc/LIB.status

@@ -123,10 +123,10 @@ lseek      - ok
 String:
 ------
 
-memcpy      - ok, inlined
-memmove     - ok, inlined
-memset      - ok, inlined
-memcmp      - ok, inlined
+memcpy      - ok
+memmove     - ok
+memset      - ok
+memcmp      - ok
 memchr      - ok, inlined
 
 strcpy      - ok, inlined

libc/Makefile

@@ -16,6 +16,7 @@ TARGET_SRCS = \
 src/cxx-glue.c \
 src/unistd.c \
 src/stdio.c \
+src/string.c \
 src/errno.c \
 \
 src/qsort.c \

libc/include/string.h

@@ -4,60 +4,10 @@
 #include <stddef.h>
 #include <malloc.h>
 
-static __inline__ void * memcpy(void * _s1, const void * _s2, size_t n) {
-    uint8_t * s1 = (uint8_t *) _s1;
-    const uint8_t * s2 = (uint8_t *) _s2;
-    size_t i;
-    
-    for (i = 0; i < n; i++)
-        *s1++ = *s2++;
-    
-    return _s1;
-}
-
-static __inline__ void * memmove(void * _s1, const void * _s2, size_t n) {
-    uint8_t * s1 = (uint8_t *) _s1;
-    const uint8_t * s2 = (uint8_t *) _s2;
-    size_t i;
-    
-    if (s1 < s2) {
-        for (i = 0; i < n; i++)
-            *s1++ = *s2++;
-    } else if (s1 > s2) {
-        s1 += n;
-        s2 += n;
-        for (i = 0; i < n; i++)
-            *--s1 = *--s2;
-    }
-    
-    return _s1;
-}
-
-static __inline__ int memcmp(const void * _s1, const void * _s2, size_t n) {
-    uint8_t * s1 = (uint8_t *) _s1;
-    const uint8_t * s2 = (uint8_t *) _s2;
-    size_t i;
-    
-    for (i = 0; i < n; i++, s1++, s2++) {
-        if (*s1 < *s2) {
-            return -1;
-        } else if (*s1 > *s2) {
-            return 1;
-        }
-    }
-    
-    return 0;
-}
-
-static __inline__ void * memset(void * _s, int c, size_t n) {
-    uint8_t * s = (uint8_t *) _s;
-    size_t i;
-    
-    for (i = 0; i < n; i++)
-        *s++ = (uint8_t) c;
-    
-    return _s;
-}
+void * memcpy(void * _s1, const void * _s2, size_t n);
+void * memmove(void * _s1, const void * _s2, size_t n);
+int memcmp(const void * _s1, const void * _s2, size_t n);
+void * memset(void * _s, int c, size_t n);
 
 static __inline__ const void * memchr(const void * _s, int c, size_t n) {
     const uint8_t * s = (uint8_t *) _s;

libc/src/string.c

@@ -0,0 +1,56 @@
+#include <string.h>
+
+void * memcpy(void * _s1, const void * _s2, size_t n) {
+    uint8_t * s1 = (uint8_t *) _s1;
+    const uint8_t * s2 = (uint8_t *) _s2;
+    size_t i;
+
+    for (i = 0; i < n; i++)
+        *s1++ = *s2++;
+
+    return _s1;
+}
+
+void * memmove(void * _s1, const void * _s2, size_t n) {
+    uint8_t * s1 = (uint8_t *) _s1;
+    const uint8_t * s2 = (uint8_t *) _s2;
+    size_t i;
+
+    if (s1 < s2) {
+        for (i = 0; i < n; i++)
+            *s1++ = *s2++;
+    } else if (s1 > s2) {
+        s1 += n;
+        s2 += n;
+        for (i = 0; i < n; i++)
+            *--s1 = *--s2;
+    }
+
+    return _s1;
+}
+
+int memcmp(const void * _s1, const void * _s2, size_t n) {
+    uint8_t * s1 = (uint8_t *) _s1;
+    const uint8_t * s2 = (uint8_t *) _s2;
+    size_t i;
+
+    for (i = 0; i < n; i++, s1++, s2++) {
+        if (*s1 < *s2) {
+            return -1;
+        } else if (*s1 > *s2) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+void * memset(void * _s, int c, size_t n) {
+    uint8_t * s = (uint8_t *) _s;
+    size_t i;
+
+    for (i = 0; i < n; i++)
+        *s++ = (uint8_t) c;
+
+    return _s;
+}