Changeset 342de62 in mainline

Timestamp:

2005-10-05T19:42:32Z (19 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

49c1f93

Parents:

1084a784

Message:

Last inline functions for IA-32

Location:

arch/ia32

Files:

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

arch/ia32/include/memstr.h

@@ -29 +29 @@
 #ifndef __ia32_MEMSTR_H__
 #define __ia32_MEMSTR_H__
-
-extern void memsetw(__address dst, size_t cnt, __u16 x);
-extern void memsetb(__address dst, size_t cnt, __u8 x);
 
 /** Copy memory
@@ -70 +67 @@
 
 
-/** Compare memory
+/** 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 memory is equal, returns 0.
+ * for equality. If bytes are equal function returns 0.
  *
- * @param pointer 1
- * @param pointer 2
+ * @param region 1
+ * @param region 2
  * @param number of bytes
- * @return 0 on match or non-zero if different
+ * @return zero if bytes are equal, non-zero otherwise
  */
-static inline int memcmp(const void * mem1, const void * mem2, size_t cnt)
+static inline int memcmp(__address src, __address dst, size_t cnt)
 {
         __u32 d0, d1, d2;
@@ -93 +90 @@
                 "1:\n"
                 : "=a" (ret), "=%S" (d0), "=&D" (d1), "=&c" (d2)
-                : "0" (0), "1" (mem1), "2" (mem2), "3" (cnt)
+                : "0" (0), "1" (src), "2" (dst), "3" (cnt)
         );
         
@@ -99 +96 @@
 }
 
+/** 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 destination
+ * @param number of words
+ * @param value to fill
+ */
+static inline void memsetw(__address dst, size_t cnt, __u16 x)
+{
+        __u32 d0, d1;
+        
+        __asm__ __volatile__ (
+                "rep stosw\n\t"
+                : "=&D" (d0), "=&c" (d1), "=a" (x)
+                : "0" (dst), "1" (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 destination
+ * @param number of bytes
+ * @param value to fill
+ */
+static inline void memsetb(__address dst, size_t cnt, __u8 x)
+{
+        __u32 d0, d1;
+        
+        __asm__ __volatile__ (
+                "rep stosb\n\t"
+                : "=&D" (d0), "=&c" (d1), "=a" (x)
+                : "0" (dst), "1" (cnt), "2" (x)
+                : "memory"
+        );
+
+}
+
 #endif

arch/ia32/src/asm.S

@@ -38 +38 @@
 .global enable_l_apic_in_msr
 .global interrupt_handlers
-.global memsetb
-.global memsetw
 
 ## Turn paging on
@@ -152 +150 @@
 
 
-## Fill memory with bytes
-#
-# Fill a given number of bytes (2nd argument)
-# at memory defined by 1st argument with the
-# byte value defined by 3rd argument.
-#
-DST=12
-CNT=16
-X=20
-memsetb:
-        push %eax
-        push %edi
-
-        movl CNT(%esp),%ecx
-        movl DST(%esp),%edi
-        movl X(%esp),%eax
-
-        rep stosb %al,%es:(%edi)
-
-        pop %edi
-        pop %eax
-        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.
-#
-DST=12
-CNT=16
-X=20
-memsetw:
-        push %eax
-        push %edi
-
-        movl CNT(%esp),%ecx
-        movl DST(%esp),%edi
-        movl X(%esp),%eax
-
-        rep stosw %ax,%es:(%edi)
-
-        pop %edi
-        pop %eax
-
-        ret
-
-
 # THIS IS USERSPACE CODE
 .global utext

arch/ia32/src/ia32.c

@@ -51 +51 @@
 #include <arch/mm/memory_init.h>
 
-
 void arch_pre_mm_init(void)
 {