minit

commit bbe9fad0afe47378da2a71904114040f47bc58fd
parent 7ada1fc6cea69bf57dc43568d2d8bb717bd0f900
Author: leitner <leitner>
Date:   Fri,  6 Sep 2002 18:01:23 +0000

new byte_copy from libowfat

Diffstat:
M
byte_copy.c
 | 
22
++++++++++------------

1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/byte_copy.c b/byte_copy.c
@@ -7,19 +7,17 @@ void byte_copy(void* out, unsigned int len, const void* in) {
   register const char* t=in;
   register const char* u=t+len;
   if (len>127) {
-    if (sizeof(unsigned long)>4) {	/* a good compiler should optimize this check away */
-      for (;(unsigned long)t&7;) {
-	if (t==u) break; *s=*t; ++s; ++t;
-      }
-    } else {
-      for (;(unsigned long)t&3;) {
-	if (t==u) break; *s=*t; ++s; ++t;
-      }
-    }
-    while (t+sizeof(long)<=u) {
-      *(unsigned long*)s=*(unsigned long*)t;
-      s+=sizeof(long); t+=sizeof(long);
+    while ((unsigned long)s&(sizeof(unsigned long)-1)) {
+      if (t==u) break; *s=*t; ++s; ++t;
     }
+    /* s (destination) is now unsigned long aligned */
+#ifndef __i386__
+    if (!((unsigned long)t&(sizeof(unsigned long)-1)))
+#endif
+      while (t+sizeof(unsigned long)<=u) {
+	*(unsigned long*)s=*(unsigned long*)t;
+	s+=sizeof(unsigned long); t+=sizeof(unsigned long);
+      }
   }
   for (;;) {
     if (t==u) break; *s=*t; ++s; ++t;