Changeset 56d40fe in mainline

Timestamp:

2005-10-24T20:18:55Z (19 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

81e1396

Parents:

2a99fa8

Message:

Memory inline functions for AMD64.
memcmp and memcpy are redefined according to norma

Location:

arch

Files:

• amd64/Makefile.inc (modified) (1 diff)
• amd64/include/memstr.h (modified) (1 diff)
• amd64/src/supplib.c (deleted)
• ia32/include/memstr.h (modified) (4 diffs)

arch/amd64/Makefile.inc

@@ -39 +39 @@
         src/arch/drivers/i8254.c \
         src/arch/drivers/i8259.c \
-        src/arch/supplib.c \
         src/arch/delay.S \
         src/arch/amd64.c \

arch/amd64/include/memstr.h

@@ -30 +30 @@
 #define __amd64_MEMSTR_H__
 
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt)); 
+/** 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 dst Destination
+ * @param src Source
+ * @param cnt Number of bytes
+ * @return Destination
+ */
+static inline void * memcpy(void * dst, const void * src, size_t cnt)
+{
+        __native d0, d1, d2;
 
-extern void memsetw(__address dst, size_t cnt, __u16 x);
-extern void memsetb(__address dst, size_t cnt, __u8 x);
-extern int memcmp(__address src, __address dst, int cnt);
+        __asm__ __volatile__(
+                "rep movsq\n\t"
+                "movq %4, %%rcx\n\t"
+                "andq $7, %%rcx\n\t"
+                "jz 1f\n\t"
+                "rep movsb\n\t"
+                "1:\n"
+                : "=&c" (d0), "=&D" (d1), "=&S" (d2)
+                : "0" ((__native)(cnt / 8)), "g" ((__native)cnt), "1" ((__native) dst), "2" ((__native) src)
+                : "memory");
+
+        return dst;
+}
+
+
+/** Compare memory regions for equality
+ *
+ * Compare a given number of bytes (3rd argument)
+ * at memory locations defined by 1st and 2nd argument
+ * for equality. If bytes are equal function returns 0.
+ *
+ * @param src Region 1
+ * @param dst Region 2
+ * @param cnt Number of bytes
+ * @return Zero if bytes are equal, non-zero otherwise
+ */
+static inline int memcmp(const void * src, const void * dst, size_t cnt)
+{
+        __native d0, d1, d2;
+        __native ret;
+        
+        __asm__ (
+                "repe cmpsb\n\t"
+                "je 1f\n\t"
+                "movq %3, %0\n\t"
+                "addq $1, %0\n\t"
+                "1:\n"
+                : "=a" (ret), "=%S" (d0), "=&D" (d1), "=&c" (d2)
+                : "0" (0), "1" (src), "2" (dst), "3" ((__native)cnt)
+        );
+        
+        return ret;
+}
+
+/** Fill memory with words
+ * Fill a given number of words (2nd argument)
+ * at memory defined by 1st argument with the
+ * word value defined by 3rd argument.
+ *
+ * @param dst Destination
+ * @param cnt Number of words
+ * @param x Value to fill
+ */
+static inline void memsetw(__address dst, size_t cnt, __u16 x)
+{
+        __native d0, d1;
+        
+        __asm__ __volatile__ (
+                "rep stosw\n\t"
+                : "=&D" (d0), "=&c" (d1), "=a" (x)
+                : "0" (dst), "1" ((__native)cnt), "2" (x)
+                : "memory"
+        );
+
+}
+
+/** Fill memory with bytes
+ * Fill a given number of bytes (2nd argument)
+ * at memory defined by 1st argument with the
+ * word value defined by 3rd argument.
+ *
+ * @param dst Destination
+ * @param cnt Number of bytes
+ * @param x Value to fill
+ */
+static inline void memsetb(__address dst, size_t cnt, __u8 x)
+{
+        __native d0, d1;
+        
+        __asm__ __volatile__ (
+                "rep stosb\n\t"
+                : "=&D" (d0), "=&c" (d1), "=a" (x)
+                : "0" (dst), "1" ((__native)cnt), "2" (x)
+                : "memory"
+        );
+
+}
 
 #endif

arch/ia32/include/memstr.h

@@ -44 +44 @@
 static inline void * memcpy(void * dst, const void * src, size_t cnt)
 {
-        __u32 d0, d1, d2;
+        __native d0, d1, d2;
 
         __asm__ __volatile__(
@@ -60 +60 @@
                 "1:\n"
                 : "=&c" (d0), "=&D" (d1), "=&S" (d2)
-                : "0" (cnt / 4), "g" (cnt), "1" ((__u32) dst), "2" ((__u32) src)
+                : "0" ((__native) (cnt / 4)), "g" ((__native) cnt), "1" ((__native) dst), "2" ((__native) src)
                 : "memory");
 
@@ -78 +78 @@
  * @return Zero if bytes are equal, non-zero otherwise
  */
-static inline int memcmp(__address src, __address dst, size_t cnt)
+static inline int memcmp(const void * src, const void * dst, size_t cnt)
 {
         __u32 d0, d1, d2;
@@ -90 +90 @@
                 "1:\n"
                 : "=a" (ret), "=%S" (d0), "=&D" (d1), "=&c" (d2)
-                : "0" (0), "1" (src), "2" (dst), "3" (cnt)
+                : "0" (0), "1" ((__native) src), "2" ((__native) dst), "3" ((__native) cnt)
         );