Changeset f3ade6c in mainline

Timestamp:

2005-09-11T15:13:53Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2b3e0738

Parents:

61a9bbe

Message:

Avoid code duplication by creating generic byteorder.h.
Some naming changes in swap functions.

Files:

• arch/amd64/include/byteorder.h (modified) (1 diff)
• arch/ia32/include/byteorder.h (modified) (1 diff)
• arch/ia64/include/byteorder.h (modified) (1 diff)
• arch/mips/include/byteorder.h (modified) (1 diff)
• arch/ppc/include/byteorder.h (modified) (2 diffs)
• include/byteorder.h (added)
• src/debug/symtab.c (modified) (1 diff)

arch/amd64/include/byteorder.h

@@ -31 +31 @@
 
 /* AMD64 is little-endian */
-#define native_le2host(n)               (n)
-#define u64_le2host(n)          (n)
+#define __native_le2host(n)             (n)
+#define __u64_le2host(n)                (n)
 
 #endif

arch/ia32/include/byteorder.h

@@ -31 +31 @@
 
 /* IA-32 is little-endian */
-#define native_le2host(n)               (n)
-#define u64_le2host(n)          (n)
+#define __native_le2host(n)             (n)
+#define __u64_le2host(n)                (n)
 
 #endif

arch/ia64/include/byteorder.h

@@ -31 +31 @@
 
 /* IA-64 is little-endian */
-#define native_le2host(n)               (n)
-#define u64_le2host(n)          (n)
+#define __native_le2host(n)             (n)
+#define __u64_le2host(n)                (n)
 
 #endif

arch/mips/include/byteorder.h

@@ -30 +30 @@
 #define __mips_BYTEORDER_H__
 
+#include <arch/types.h>
+#include <byteorder.h>
+
 #ifdef BIG_ENDIAN
-static inline __u64 u64_le2host(__u64 n)
+static inline __u64 __u64_le2host(__u64 n)
 {
-        return ((n & 0xff) << 56) |
-                ((n & 0xff00) << 40) |
-                ((n & 0xff0000) << 24) |
-                ((n & 0xff000000LL) << 8) |
-                ((n & 0xff00000000LL) >>8) |
-                ((n & 0xff0000000000LL) >> 24) |
-                ((n & 0xff000000000000LL) >> 40) |
-                ((n & 0xff00000000000000LL) >> 56);
+        return __u64_byteorder_swap(n);
 }
 
-static inline __native native_le2host(__native n)
+static inline __native __native_le2host(__native n)
 {
-        return ((n & 0xff) << 24) |
-                ((n & 0xff00) << 8) |
-                ((n & 0xff0000) >> 8) |
-                ((n & 0xff000000) >> 24);
+        return __u32_byteroder_swap(n);
 }
+
 #else
-#  define native_le2host(n)             (n)
-#  define u64_le2host(n)                (n)
+#  define __native_le2host(n)           (n)
+#  define __u64_le2host(n)              (n)
 #endif
 

arch/ppc/include/byteorder.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <byteorder.h>
+
+static inline __u64 __u64_le2host(__u64 n)
+{
+        return __u64_byteorder_swap(n);
+}
+
 
 /** Convert little-endian __native to host __native
@@ -41 +48 @@
  *
  */
-static inline __u64 u64_le2host(__u64 n)
-{
-        return ((n & 0xff) << 56) |
-                ((n & 0xff00) << 40) |
-                ((n & 0xff0000) << 24) |
-                ((n & 0xff000000LL) << 8) |
-                ((n & 0xff00000000LL) >>8) |
-                ((n & 0xff0000000000LL) >> 24) |
-                ((n & 0xff000000000000LL) >> 40) |
-                ((n & 0xff00000000000000LL) >> 56);
-}
-static inline __native native_le2host(__native n)
+static inline __native __native_le2host(__native n)
 {
         __address v;

src/debug/symtab.c

@@ -40 +40 @@
 
         for (i=1;symbol_table[i].address_le;++i) {
-                if (addr < u64_le2host(symbol_table[i].address_le))
+                if (addr < __u64_le2host(symbol_table[i].address_le))
                         break;
         }
-        if (addr >= u64_le2host(symbol_table[i-1].address_le))
+        if (addr >= __u64_le2host(symbol_table[i-1].address_le))
                 return symbol_table[i-1].symbol_name;
         return NULL;