summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAda Christine <adachristine18@gmail.com>2021-03-29 01:41:50 +0000
committerAda Christine <adachristine18@gmail.com>2021-03-29 01:41:50 +0000
commit42c6af83ec7e26983f1ecdefc81ea481a2354cb4 (patch)
treea096824a181eff4874e7840d148f3e5a06e3a5df /kernel
parent56ec6c782455f7d8e4560d30ad6d2c3e1cd2738f (diff)
don't echo command spam
move common files to new source add VPATH to loader and kernel makefiles for common source
Diffstat (limited to 'kernel')
-rw-r--r--kernel/Makefile2
-rw-r--r--kernel/memcmp.c16
-rw-r--r--kernel/memcpy.c12
-rw-r--r--kernel/memmove.c20
-rw-r--r--kernel/memset.c11
5 files changed, 2 insertions, 59 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index b51532e..7835041 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,5 +1,7 @@
include ../defaults.mk
+VPATH := ../lib
+
TARGET := kernel.os
.DEFAULT: $(TARGET)
diff --git a/kernel/memcmp.c b/kernel/memcmp.c
deleted file mode 100644
index 2348afe..0000000
--- a/kernel/memcmp.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Public domain. */
-#include <stddef.h>
-
-int
-memcmp (const void *str1, const void *str2, size_t count)
-{
- const unsigned char *s1 = str1;
- const unsigned char *s2 = str2;
-
- while (count-- > 0)
- {
- if (*s1++ != *s2++)
- return s1[-1] < s2[-1] ? -1 : 1;
- }
- return 0;
-}
diff --git a/kernel/memcpy.c b/kernel/memcpy.c
deleted file mode 100644
index 58b1e40..0000000
--- a/kernel/memcpy.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Public domain. */
-#include <stddef.h>
-
-void *
-memcpy (void *dest, const void *src, size_t len)
-{
- char *d = dest;
- const char *s = src;
- while (len--)
- *d++ = *s++;
- return dest;
-}
diff --git a/kernel/memmove.c b/kernel/memmove.c
deleted file mode 100644
index fd06bb6..0000000
--- a/kernel/memmove.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Public domain. */
-#include <stddef.h>
-
-void *
-memmove (void *dest, const void *src, size_t len)
-{
- char *d = dest;
- const char *s = src;
- if (d < s)
- while (len--)
- *d++ = *s++;
- else
- {
- const char *lasts = s + (len-1);
- char *lastd = d + (len-1);
- while (len--)
- *lastd-- = *lasts--;
- }
- return dest;
-}
diff --git a/kernel/memset.c b/kernel/memset.c
deleted file mode 100644
index 3e7025e..0000000
--- a/kernel/memset.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Public domain. */
-#include <stddef.h>
-
-void *
-memset (void *dest, int val, size_t len)
-{
- unsigned char *ptr = dest;
- while (len-- > 0)
- *ptr++ = val;
- return dest;
-}