m68k: remove duplicate memcpy() implementation

Merging the mmu and non-mmu directories we ended up with duplicate
implementations of memcpy(). One is a little more optimized for the
>= 68020 case, but that can easily be inserted into a single
implementation of memcpy(). Clean up the exporting of this symbol
too, otherwise we end up exporting it twice on a no-mmu build.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/arch/m68k/kernel/m68k_ksyms_no.c b/arch/m68k/kernel/m68k_ksyms_no.c
index 346bce63bbf3e56515e28337658a63670edc83c2..10af0af4ddefec3146ceeec114f53eb172d7fca3 100644 (file)
--- a/arch/m68k/kernel/m68k_ksyms_no.c
+++ b/arch/m68k/kernel/m68k_ksyms_no.c
@@ -31,12 +31,6 @@ EXPORT_SYMBOL(kernel_thread);
 /* Networking helper routines. */
 EXPORT_SYMBOL(csum_partial_copy_nocheck);
 
-/* The following are special because they're not called
-   explicitly (the C compiler generates them).  Fortunately,
-   their interface isn't gonna change any time soon now, so
-   it's OK to leave it out of version control.  */
-EXPORT_SYMBOL(memcpy);
-
 /*
  * libgcc functions - functions that are used internally by the
  * compiler...  (prototypes are not correct though, but that

diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
index ac275d5e9e3cd799fd6aaadfc090641f34350821..2438d02ebf43ddc484608aaf95c981256caf6936 100644 (file)
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
@@ -4,12 +4,11 @@
 #
 
 lib-y  := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
-          memset.o memmove.o checksum.o
+          memcpy.o memset.o memmove.o checksum.o
 
 ifdef CONFIG_MMU
 lib-y  += string.o uaccess.o
 else
-lib-y  += mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \
-          memcpy.o delay.o
+lib-y  += mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o delay.o
 endif
 

diff --git a/arch/m68k/lib/memcpy.c b/arch/m68k/lib/memcpy.c
index b50dbcad47464534688b7414997d488e4ba721bd..62182c81e91c55bf106df98d14a00e4dc950ccd9 100644 (file)
--- a/arch/m68k/lib/memcpy.c
+++ b/arch/m68k/lib/memcpy.c
@@ -1,62 +1,80 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
 
-#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/string.h>
 
-void * memcpy(void * to, const void * from, size_t n)
+void *memcpy(void *to, const void *from, size_t n)
 {
-#ifdef CONFIG_COLDFIRE
-  void *xto = to;
-  size_t temp;
+       void *xto = to;
+       size_t temp, temp1;
 
-  if (!n)
-    return xto;
-  if ((long) to & 1)
-    {
-      char *cto = to;
-      const char *cfrom = from;
-      *cto++ = *cfrom++;
-      to = cto;
-      from = cfrom;
-      n--;
-    }
-  if (n > 2 && (long) to & 2)
-    {
-      short *sto = to;
-      const short *sfrom = from;
-      *sto++ = *sfrom++;
-      to = sto;
-      from = sfrom;
-      n -= 2;
-    }
-  temp = n >> 2;
-  if (temp)
-    {
-      long *lto = to;
-      const long *lfrom = from;
-      for (; temp; temp--)
-       *lto++ = *lfrom++;
-      to = lto;
-      from = lfrom;
-    }
-  if (n & 2)
-    {
-      short *sto = to;
-      const short *sfrom = from;
-      *sto++ = *sfrom++;
-      to = sto;
-      from = sfrom;
-    }
-  if (n & 1)
-    {
-      char *cto = to;
-      const char *cfrom = from;
-      *cto = *cfrom;
-    }
-  return xto;
+       if (!n)
+               return xto;
+       if ((long)to & 1) {
+               char *cto = to;
+               const char *cfrom = from;
+               *cto++ = *cfrom++;
+               to = cto;
+               from = cfrom;
+               n--;
+       }
+       if (n > 2 && (long)to & 2) {
+               short *sto = to;
+               const short *sfrom = from;
+               *sto++ = *sfrom++;
+               to = sto;
+               from = sfrom;
+               n -= 2;
+       }
+       temp = n >> 2;
+       if (temp) {
+               long *lto = to;
+               const long *lfrom = from;
+#if defined(__mc68020__) || defined(__mc68030__) || \
+    defined(__mc68040__) || defined(__mc68060__) || defined(__mcpu32__)
+               asm volatile (
+                       "       movel %2,%3\n"
+                       "       andw  #7,%3\n"
+                       "       lsrl  #3,%2\n"
+                       "       negw  %3\n"
+                       "       jmp   %%pc@(1f,%3:w:2)\n"
+                       "4:     movel %0@+,%1@+\n"
+                       "       movel %0@+,%1@+\n"
+                       "       movel %0@+,%1@+\n"
+                       "       movel %0@+,%1@+\n"
+                       "       movel %0@+,%1@+\n"
+                       "       movel %0@+,%1@+\n"
+                       "       movel %0@+,%1@+\n"
+                       "       movel %0@+,%1@+\n"
+                       "1:     dbra  %2,4b\n"
+                       "       clrw  %2\n"
+                       "       subql #1,%2\n"
+                       "       jpl   4b"
+                       : "=a" (lfrom), "=a" (lto), "=d" (temp), "=&d" (temp1)
+                       : "0" (lfrom), "1" (lto), "2" (temp));
 #else
-  const char *c_from = from;
-  char *c_to = to;
-  while (n-- > 0)
-    *c_to++ = *c_from++;
-  return((void *) to);
+               for (; temp; temp--)
+                       *lto++ = *lfrom++;
 #endif
+               to = lto;
+               from = lfrom;
+       }
+       if (n & 2) {
+               short *sto = to;
+               const short *sfrom = from;
+               *sto++ = *sfrom++;
+               to = sto;
+               from = sfrom;
+       }
+       if (n & 1) {
+               char *cto = to;
+               const char *cfrom = from;
+               *cto = *cfrom;
+       }
+       return xto;
 }
+EXPORT_SYMBOL(memcpy);

diff --git a/arch/m68k/lib/string.c b/arch/m68k/lib/string.c
index 6d2461237a16bace5f876c6de672e1c8deb13fd8..b9a57abfad08dc545f703b16f3cb2241727dccf9 100644 (file)
--- a/arch/m68k/lib/string.c
+++ b/arch/m68k/lib/string.c
@@ -20,70 +20,3 @@ char *strcat(char *dest, const char *src)
        return __kernel_strcpy(dest + __kernel_strlen(dest), src);
 }
 EXPORT_SYMBOL(strcat);
-
-void *memcpy(void *to, const void *from, size_t n)
-{
-       void *xto = to;
-       size_t temp, temp1;
-
-       if (!n)
-               return xto;
-       if ((long)to & 1) {
-               char *cto = to;
-               const char *cfrom = from;
-               *cto++ = *cfrom++;
-               to = cto;
-               from = cfrom;
-               n--;
-       }
-       if (n > 2 && (long)to & 2) {
-               short *sto = to;
-               const short *sfrom = from;
-               *sto++ = *sfrom++;
-               to = sto;
-               from = sfrom;
-               n -= 2;
-       }
-       temp = n >> 2;
-       if (temp) {
-               long *lto = to;
-               const long *lfrom = from;
-
-               asm volatile (
-                       "       movel %2,%3\n"
-                       "       andw  #7,%3\n"
-                       "       lsrl  #3,%2\n"
-                       "       negw  %3\n"
-                       "       jmp   %%pc@(1f,%3:w:2)\n"
-                       "4:     movel %0@+,%1@+\n"
-                       "       movel %0@+,%1@+\n"
-                       "       movel %0@+,%1@+\n"
-                       "       movel %0@+,%1@+\n"
-                       "       movel %0@+,%1@+\n"
-                       "       movel %0@+,%1@+\n"
-                       "       movel %0@+,%1@+\n"
-                       "       movel %0@+,%1@+\n"
-                       "1:     dbra  %2,4b\n"
-                       "       clrw  %2\n"
-                       "       subql #1,%2\n"
-                       "       jpl   4b"
-                       : "=a" (lfrom), "=a" (lto), "=d" (temp), "=&d" (temp1)
-                       : "0" (lfrom), "1" (lto), "2" (temp));
-               to = lto;
-               from = lfrom;
-       }
-       if (n & 2) {
-               short *sto = to;
-               const short *sfrom = from;
-               *sto++ = *sfrom++;
-               to = sto;
-               from = sfrom;
-       }
-       if (n & 1) {
-               char *cto = to;
-               const char *cfrom = from;
-               *cto = *cfrom;
-       }
-       return xto;
-}
-EXPORT_SYMBOL(memcpy);