Changeset 7f1c620 in mainline for arch/amd64/include/memstr.h

Timestamp:

2006-07-04T17:17:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ffa3ef5

Parents:

991779c5

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

• arch/amd64/include/memstr.h (modified) (6 diffs)

arch/amd64/include/memstr.h

@@ -50 +50 @@
 static inline void * memcpy(void * dst, const void * src, size_t cnt)
 {
-        __native d0, d1, d2;
+        unative_t d0, d1, d2;
 
         __asm__ __volatile__(
@@ -60 +60 @@
                 "1:\n"
                 : "=&c" (d0), "=&D" (d1), "=&S" (d2)
-                : "0" ((__native)(cnt / 8)), "g" ((__native)cnt), "1" ((__native) dst), "2" ((__native) src)
+                : "0" ((unative_t)(cnt / 8)), "g" ((unative_t)cnt), "1" ((unative_t) dst), "2" ((unative_t) src)
                 : "memory");
 
@@ -80 +80 @@
 static inline int memcmp(const void * src, const void * dst, size_t cnt)
 {
-        __native d0, d1, d2;
-        __native ret;
+        unative_t d0, d1, d2;
+        unative_t ret;
         
         __asm__ (
@@ -90 +90 @@
                 "1:\n"
                 : "=a" (ret), "=%S" (d0), "=&D" (d1), "=&c" (d2)
-                : "0" (0), "1" (src), "2" (dst), "3" ((__native)cnt)
+                : "0" (0), "1" (src), "2" (dst), "3" ((unative_t)cnt)
         );
         
@@ -105 +105 @@
  * @param x Value to fill
  */
-static inline void memsetw(__address dst, size_t cnt, __u16 x)
+static inline void memsetw(uintptr_t dst, size_t cnt, uint16_t x)
 {
-        __native d0, d1;
+        unative_t d0, d1;
         
         __asm__ __volatile__ (
                 "rep stosw\n\t"
                 : "=&D" (d0), "=&c" (d1), "=a" (x)
-                : "0" (dst), "1" ((__native)cnt), "2" (x)
+                : "0" (dst), "1" ((unative_t)cnt), "2" (x)
                 : "memory"
         );
@@ -127 +127 @@
  * @param x Value to fill
  */
-static inline void memsetb(__address dst, size_t cnt, __u8 x)
+static inline void memsetb(uintptr_t dst, size_t cnt, uint8_t x)
 {
-        __native d0, d1;
+        unative_t d0, d1;
         
         __asm__ __volatile__ (
                 "rep stosb\n\t"
                 : "=&D" (d0), "=&c" (d1), "=a" (x)
-                : "0" (dst), "1" ((__native)cnt), "2" (x)
+                : "0" (dst), "1" ((unative_t)cnt), "2" (x)
                 : "memory"
         );