Changeset 2d7a5fe in mainline

Timestamp:

2006-06-06T15:42:36Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ae3f1709

Parents:

e269c53

Message:

Generic version of memcpy that is resistent towards unaligned memory accesses.

File:

• generic/src/lib/memstr.c (modified) (2 diffs)

generic/src/lib/memstr.c

@@ -41 +41 @@
 #include <memstr.h>
 #include <arch/types.h>
+#include <align.h>
 
 /** Copy block of memory
@@ -57 +58 @@
         int i, j;
         
-        for (i = 0; i < cnt/sizeof(__native); i++)
-                ((__native *) dst)[i] = ((__native *) src)[i];
+        if (ALIGN_UP((__address) src, sizeof(__native)) != (__address) src ||
+                ALIGN_UP((__address) dst, sizeof(__native)) != (__address) dst) {
+                for (i = 0; i < cnt; i++)
+                        ((__u8 *) dst)[i] = ((__u8 *) src)[i];
+        } else { 
+        
+                for (i = 0; i < cnt/sizeof(__native); i++)
+                        ((__native *) dst)[i] = ((__native *) src)[i];
                 
-        for (j = 0; j < cnt%sizeof(__native); j++)
-                ((__u8 *)(((__native *) dst) + i))[j] = ((__u8 *)(((__native *) src) + i))[j];
+                for (j = 0; j < cnt%sizeof(__native); j++)
+                        ((__u8 *)(((__native *) dst) + i))[j] = ((__u8 *)(((__native *) src) + i))[j];
+        }
                 
         return (char *)src;