dc425a6e14
Currently to use warn(), a caller would need to include misc.h. However, this means they would get the (unavailable during compressed boot) gcc built-in memcpy family of functions. But since string.c is defining these memcpy functions for use by misc.c, we end up in a weird circular dependency. To break this loop, move the error reporting functions outside of misc.c with their own header so that they can be independently included by other sources. Since the screen-writing routines use memmove(), keep the low-level *_putstr() functions in misc.c. Signed-off-by: Kees Cook <keescook@chromium.org> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Baoquan He <bhe@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Borislav Petkov <bp@suse.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Lasse Collin <lasse.collin@tukaani.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Yinghai Lu <yinghai@kernel.org> Link: http://lkml.kernel.org/r/1462229461-3370-2-git-send-email-keescook@chromium.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
65 lines
1.3 KiB
C
65 lines
1.3 KiB
C
/*
|
|
* This provides an optimized implementation of memcpy, and a simplified
|
|
* implementation of memset and memmove. These are used here because the
|
|
* standard kernel runtime versions are not yet available and we don't
|
|
* trust the gcc built-in implementations as they may do unexpected things
|
|
* (e.g. FPU ops) in the minimal decompression stub execution environment.
|
|
*/
|
|
#include "error.h"
|
|
|
|
#include "../string.c"
|
|
|
|
#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
|
|
|
|
void *memset(void *s, int c, size_t n)
|
|
{
|
|
int i;
|
|
char *ss = s;
|
|
|
|
for (i = 0; i < n; i++)
|
|
ss[i] = c;
|
|
return s;
|
|
}
|
|
|
|
void *memmove(void *dest, const void *src, size_t n)
|
|
{
|
|
unsigned char *d = dest;
|
|
const unsigned char *s = src;
|
|
|
|
if (d <= s || d - s >= n)
|
|
return memcpy(dest, src, n);
|
|
|
|
while (n-- > 0)
|
|
d[n] = s[n];
|
|
|
|
return dest;
|
|
}
|