From f230e80b423f6cb002015ab4771c06a53d5a2287 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Fri, 5 Aug 2011 14:41:29 +1000 Subject: [PATCH] m68k: fix memcpy to unmatched/unaligned source and dest on 68000 The original 68000 processors cannot copy 16bit or larger quantities from odd addresses. All newer members of the 68k family (including ColdFire) can do this. In the current memcpy implementation after trying to align the destination address to a 16bit boundary if we end up with an odd source address we go off and try to copy multi-byte quantities from it. This will trap on the 68000. The only solution if we end with an odd source address is to byte wise copy the whole memcpy region. We only need to do this if we are supporting original 68000 processors. Signed-off-by: Greg Ungerer --- arch/m68k/lib/memcpy.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/m68k/lib/memcpy.c b/arch/m68k/lib/memcpy.c index 0648893..10ca051 100644 --- a/arch/m68k/lib/memcpy.c +++ b/arch/m68k/lib/memcpy.c @@ -22,6 +22,15 @@ void *memcpy(void *to, const void *from, size_t n) from = cfrom; n--; } +#if defined(CONFIG_M68000) + if ((long)from & 1) { + char *cto = to; + const char *cfrom = from; + for (; n; n--) + *cto++ = *cfrom++; + return xto; + } +#endif if (n > 2 && (long)to & 2) { short *sto = to; const short *sfrom = from; -- 2.7.4