Changeset 104dc0b in mainline

Timestamp:

2005-09-18T21:39:56Z (19 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

d9430f7

Parents:

650d976

Message:

built-in memcpy is not used anymore on IA-32.
IA-32 memcpy is now fast and inline.

Files:

• arch/ia32/include/asm.h (modified) (5 diffs)
• arch/ia32/src/asm.S (modified) (2 diffs)
• include/memstr.h (modified) (1 diff)

arch/ia32/include/asm.h

@@ -139 +139 @@
         pri_t v;
         __asm__ volatile (
-                "pushf\n"
-                "popl %0\n"
+                "pushf\n\t"
+                "popl %0\n\t"
                 "sti\n"
                 : "=r" (v)
@@ -155 +155 @@
         pri_t v;
         __asm__ volatile (
-                "pushf\n"
-                "popl %0\n"
+                "pushf\n\t"
+                "popl %0\n\t"
                 "cli\n"
                 : "=r" (v)
@@ -169 +169 @@
 static inline void cpu_priority_restore(pri_t pri) {
         __asm__ volatile (
-                "pushl %0\n"
+                "pushl %0\n\t"
                 "popf\n"
                 : : "r" (pri)
@@ -182 +182 @@
         pri_t v;
         __asm__ volatile (
-                "pushf\n"
+                "pushf\n\t"
                 "popl %0\n"
                 : "=r" (v)
@@ -213 +213 @@
 }
 
+/** Copy memory
+ * 
+ * Copy a given number of bytes (3rd argument)
+ * from the memory location defined by 2nd argument
+ * to the memory location defined by 1st argument.
+ * The memory areas cannot overlap.
+ *
+ * @param destination
+ * @param source
+ * @param number of bytes
+ * @return destination
+ */
+static inline void * memcpy(void * dst, const void * src, size_t cnt)
+{
+        __u32 d0, d1, d2;
+        
+        __asm__ __volatile__(
+                "rep movsl\n\t"
+                "movl %4, %%ecx\n\t"
+                "andl $3, %%ecx\n\t"
+                "jz 1f\n\t"
+                "rep movsb\n\t"
+                "1:\n"
+                : "=&c" (d0), "=&D" (d1), "=&S" (d2)
+                : "0" (cnt / 4), "g" (cnt), "1" ((__u32) dst), "2" ((__u32) src)
+                : "memory");
+                
+        return dst;
+}
+
 
 #endif

arch/ia32/src/asm.S

@@ -38 +38 @@
 .global enable_l_apic_in_msr
 .global interrupt_handlers
-.global memcpy
 .global memsetb
 .global memsetw
@@ -153 +152 @@
 #       handler 192 256
 h_end:
-
-
-## Copy memory
-#
-# Copy a given number of bytes (3rd argument)
-# from the memory location defined by 2nd argument
-# to the memory location defined by 1st argument.
-# The memory areas cannot overlap.
-#
-SRC=16
-DST=12
-CNT=20
-memcpy:
-        push %esi
-        push %edi
-
-        movl CNT(%esp),%ecx
-        movl DST(%esp),%edi
-        movl SRC(%esp),%esi
-
-        rep movsb %ds:(%esi),%es:(%edi)
-
-        pop %edi
-        pop %esi
-        ret
 
 

include/memstr.h

@@ -32 +32 @@
 #include <typedefs.h>
 #include <arch/types.h>
-
-#define memcpy(dst, src, cnt)   __builtin_memcpy((dst), (src), (cnt)); 
+#include <arch/asm.h>
 
 extern void memsetw(__address dst, size_t cnt, __u16 x);