Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66d83ab3 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent d10ed2f5

arch/m68k/kernel/m68k_ksyms_no.c

+0 −6
Original line number Diff line number Diff line
@@ -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

arch/m68k/lib/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -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

arch/m68k/lib/memcpy.c

+73 −55
Original line number Diff line number Diff line 
/*

 * 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)

{

#ifdef CONFIG_COLDFIRE

	void *xto = to;

  size_t temp;

	size_t temp, temp1;



	if (!n)

		return xto;

  if ((long) to & 1)

    {

	if ((long)to & 1) {

		char *cto = to;

		const char *cfrom = from;

		*cto++ = *cfrom++;
@@ -18,8 +22,7 @@ void * memcpy(void * to, const void * from, size_t n) 
		from = cfrom;

		n--;

	}

  if (n > 2 && (long) to & 2)

    {

	if (n > 2 && (long)to & 2) {

		short *sto = to;

		const short *sfrom = from;

		*sto++ = *sfrom++;
@@ -28,35 +31,50 @@ void * memcpy(void * to, const void * from, size_t n) 
		n -= 2;

	}

	temp = n >> 2;

  if (temp)

    {

	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

		for (; temp; temp--)

			*lto++ = *lfrom++;

#endif

		to = lto;

		from = lfrom;

	}

  if (n & 2)

    {

	if (n & 2) {

		short *sto = to;

		const short *sfrom = from;

		*sto++ = *sfrom++;

		to = sto;

		from = sfrom;

	}

  if (n & 1)

    {

	if (n & 1) {

		char *cto = to;

		const char *cfrom = from;

		*cto = *cfrom;

	}

	return xto;

#else

  const char *c_from = from;

  char *c_to = to;

  while (n-- > 0)

    *c_to++ = *c_from++;

  return((void *) to);

#endif

}

EXPORT_SYMBOL(memcpy);

arch/m68k/lib/string.c

+0 −67
Original line number Diff line number Diff line
@@ -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);