From: Alan Cox <alan@etchedpixels.co.uk>
Date: Fri, 28 Nov 2014 22:05:15 +0000 (+0000)
Subject: dragon: fix memcpy prototype and implementation
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=959e93ddd6ec7224d7b1bd93736b608a2044846b;p=FUZIX.git

dragon: fix memcpy prototype and implementation
---

diff --git a/Kernel/cpu-6809/cpu.h b/Kernel/cpu-6809/cpu.h
index eef09d40..bbb83dd6 100644
--- a/Kernel/cpu-6809/cpu.h
+++ b/Kernel/cpu-6809/cpu.h
@@ -18,7 +18,7 @@ extern void irqrestore(irqflags_t f);
 
 #define EMAGIC    0x0E    /* Header of executable  (JMP) */
 
-extern void *memcpy(void *, void *, size_t);
+extern void *memcpy(void *, const void *, size_t);
 extern void *memset(void *, int, size_t);
 extern size_t strlen(const char *);
 extern uint16_t swab(uint16_t);
diff --git a/Kernel/platform-dragon/libc.c b/Kernel/platform-dragon/libc.c
index 8b3940ba..a4cb9dd4 100644
--- a/Kernel/platform-dragon/libc.c
+++ b/Kernel/platform-dragon/libc.c
@@ -1,8 +1,9 @@
 #include "cpu.h"
 
-void *memcpy(void *d, void *s, size_t sz)
+void *memcpy(void *d, const void *s, size_t sz)
 {
-  unsigned char *dp, *sp;
+  unsigned char *dp = d;
+  const unsigned char *sp = s;
   while(sz--)
     *dp++=*sp++;
   return d;
@@ -22,13 +23,3 @@ size_t strlen(const char *p)
   while(*e++);
   return e-p-1;
 }
-
-/* Until we pull out the bits of libgcc that are useful instead */
-void abort(void)
-{
-}
-
-void *malloc(size_t size)
-{
-  return 0;
-}
\ No newline at end of file