From 42c6af83ec7e26983f1ecdefc81ea481a2354cb4 Mon Sep 17 00:00:00 2001
From: Ada Christine <adachristine18@gmail.com>
Date: Mon, 29 Mar 2021 01:41:50 +0000
Subject: don't echo command spam move common files to new source add VPATH to
 loader and kernel makefiles for common source

---
 kernel/Makefile  |  2 ++
 kernel/memcmp.c  | 16 ----------------
 kernel/memcpy.c  | 12 ------------
 kernel/memmove.c | 20 --------------------
 kernel/memset.c  | 11 -----------
 5 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 kernel/memcmp.c
 delete mode 100644 kernel/memcpy.c
 delete mode 100644 kernel/memmove.c
 delete mode 100644 kernel/memset.c

(limited to 'kernel')

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;
-}
-- 
cgit v1.3.1-1-g115d