2009-12-14 Maxim Kuvyrkov <maxim@codesourcery.com>

        * libc/machine/m68k/memcpy.S: Patch to support
        boards which do not support unaligned read/write.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index c0b1a52..5f0bac9 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-14  Maxim Kuvyrkov <maxim@codesourcery.com>
+
+       * libc/machine/m68k/memcpy.S: Patch to support
+       boards which do not support unaligned read/write.
+
 2009-12-10  Conny Marco Menebrocker  <c-m-m@gmx.de>
 
        * configure.host: Add xc16x support.

diff --git a/newlib/libc/machine/m68k/memcpy.S b/newlib/libc/machine/m68k/memcpy.S
index 3badd58..e3df003 100644 (file)
--- a/newlib/libc/machine/m68k/memcpy.S
+++ b/newlib/libc/machine/m68k/memcpy.S
@@ -15,6 +15,12 @@
 
 #include "m68kasm.h"
 
+#if defined (__mcoldfire__) || defined (__mcpu32__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
+# define MISALIGNED_OK 1
+#else
+# define MISALIGNED_OK 0
+#endif
+       
        .text
        .align  4
 
@@ -40,6 +46,15 @@ SYM(memcpy):
        cmp.l   #8,d1           | if fewer than 8 bytes to transfer,
        blo     .Lresidue       | do not optimise
 
+#if !MISALIGNED_OK
+       /* Goto .Lresidue if either dest or src is not 4-byte aligned */
+       move.l  a0,d0
+       and.l   #3,d0
+       bne     .Lresidue
+       move.l  a1,d0
+       and.l   #3,d0
+       bne     .Lresidue
+#else /* MISALIGNED_OK */
        /* align dest */
        move.l  a0,d0           | copy of dest
        neg.l   d0
@@ -54,6 +69,7 @@ SYM(memcpy):
        bcc     2f
        move.w  (a1)+,(a0)+
 2:
+#endif /* !MISALIGNED_OK */
 
        /* long word transfers */
        move.l  d1,d0