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

Commit 820e8fec authored by Vivek Goyal's avatar Vivek Goyal Committed by H. Peter Anvin
Browse files

x86, boot: Move optimized memcpy() 32/64 bit versions to compressed/string.c 



Move optimized versions of memcpy to compressed/string.c This will allow
any other code to use these functions too if need be in future. Again
trying to put definition in a common place instead of hiding it in misc.c

Signed-off-by: default avatarVivek Goyal <vgoyal@redhat.com>
Link: http://lkml.kernel.org/r/1395170800-11059-4-git-send-email-vgoyal@redhat.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent c041b5ad

arch/x86/boot/compressed/misc.c

+1 −30
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */

 */





#include "misc.h"

#include "misc.h"

#include "../string.h"





/* WARNING!!

/* WARNING!!

 * This code is compiled with -fPIC and it is relocated dynamically

 * This code is compiled with -fPIC and it is relocated dynamically
@@ -110,7 +111,6 @@ static void error(char *m); 
struct boot_params *real_mode;		/* Pointer to real-mode data */

struct boot_params *real_mode;		/* Pointer to real-mode data */





void *memset(void *s, int c, size_t n);

void *memset(void *s, int c, size_t n);

void *memcpy(void *dest, const void *src, size_t n);





memptr free_mem_ptr;

memptr free_mem_ptr;

memptr free_mem_end_ptr;

memptr free_mem_end_ptr;
@@ -225,35 +225,6 @@ void *memset(void *s, int c, size_t n) 
		ss[i] = c;

		ss[i] = c;

	return s;

	return s;

}

}

#ifdef CONFIG_X86_32

void *memcpy(void *dest, const void *src, size_t n)

{

	int d0, d1, d2;

	asm volatile(

		"rep ; movsl\n\t"

		"movl %4,%%ecx\n\t"

		"rep ; movsb\n\t"

		: "=&c" (d0), "=&D" (d1), "=&S" (d2)

		: "0" (n >> 2), "g" (n & 3), "1" (dest), "2" (src)

		: "memory");



	return dest;

}

#else

void *memcpy(void *dest, const void *src, size_t n)

{

	long d0, d1, d2;

	asm volatile(

		"rep ; movsq\n\t"

		"movq %4,%%rcx\n\t"

		"rep ; movsb\n\t"

		: "=&c" (d0), "=&D" (d1), "=&S" (d2)

		: "0" (n >> 3), "g" (n & 7), "1" (dest), "2" (src)

		: "memory");



	return dest;

}

#endif





static void error(char *x)

static void error(char *x)

{

{

arch/x86/boot/compressed/string.c

+33 −0
Original line number Original line Diff line number Diff line
@@ -11,3 +11,36 @@ int memcmp(const void *s1, const void *s2, size_t len) 
}

}





#include "../string.c"

#include "../string.c"



/* misc.h might pull in string_32.h which has a macro for memcpy. undef that */

#undef memcpy



#ifdef CONFIG_X86_32

void *memcpy(void *dest, const void *src, size_t n)

{

	int d0, d1, d2;

	asm volatile(

		"rep ; movsl\n\t"

		"movl %4,%%ecx\n\t"

		"rep ; movsb\n\t"

		: "=&c" (d0), "=&D" (d1), "=&S" (d2)

		: "0" (n >> 2), "g" (n & 3), "1" (dest), "2" (src)

		: "memory");



	return dest;

}

#else

void *memcpy(void *dest, const void *src, size_t n)

{

	long d0, d1, d2;

	asm volatile(

		"rep ; movsq\n\t"

		"movq %4,%%rcx\n\t"

		"rep ; movsb\n\t"

		: "=&c" (d0), "=&D" (d1), "=&S" (d2)

		: "0" (n >> 3), "g" (n & 7), "1" (dest), "2" (src)

		: "memory");



	return dest;

}

#endif