Changeset 37675 in vbox for trunk/src/recompiler/host-utils.h

Timestamp:

Jun 29, 2011 7:07:14 AM (13 years ago)

Author:

vboxsync

Message:

rem: Synced with v0.12.5.

File:

• trunk/src/recompiler/host-utils.h (modified) (10 diffs)

trunk/src/recompiler/host-utils.h

@@ -28 +28 @@
 #if defined(__x86_64__)
 #define __HAVE_FAST_MULU64__
-static always_inline void mulu64 (uint64_t *plow, uint64_t *phigh,
-                                  uint64_t a, uint64_t b)
+static inline void mulu64(uint64_t *plow, uint64_t *phigh,
+                          uint64_t a, uint64_t b)
 {
     __asm__ ("mul %0\n\t"
@@ -36 +36 @@
 }
 #define __HAVE_FAST_MULS64__
-static always_inline void muls64 (uint64_t *plow, uint64_t *phigh,
-                                  int64_t a, int64_t b)
+static inline void muls64(uint64_t *plow, uint64_t *phigh,
+                          int64_t a, int64_t b)
 {
     __asm__ ("imul %0\n\t"
@@ -50 +50 @@
 /* Binary search for leading zeros.  */
 
-static always_inline int clz32(uint32_t val)
+static inline int clz32(uint32_t val)
 {
 #if QEMU_GNUC_PREREQ(3, 4)
@@ -87 +87 @@
 }
 
-static always_inline int clo32(uint32_t val)
+static inline int clo32(uint32_t val)
 {
     return clz32(~val);
 }
 
-static always_inline int clz64(uint64_t val)
+static inline int clz64(uint64_t val)
 {
 #if QEMU_GNUC_PREREQ(3, 4)
@@ -112 +112 @@
 }
 
-static always_inline int clo64(uint64_t val)
+static inline int clo64(uint64_t val)
 {
     return clz64(~val);
 }
 
-static always_inline int ctz32 (uint32_t val)
+static inline int ctz32(uint32_t val)
 {
 #if QEMU_GNUC_PREREQ(3, 4)
@@ -129 +129 @@
     cnt = 0;
     if (!(val & 0x0000FFFFUL)) {
-         cnt += 16;
+        cnt += 16;
         val >>= 16;
-     }
+    }
     if (!(val & 0x000000FFUL)) {
-         cnt += 8;
+        cnt += 8;
         val >>= 8;
-     }
+    }
     if (!(val & 0x0000000FUL)) {
-         cnt += 4;
+        cnt += 4;
         val >>= 4;
-     }
+    }
     if (!(val & 0x00000003UL)) {
-         cnt += 2;
+        cnt += 2;
         val >>= 2;
-     }
+    }
     if (!(val & 0x00000001UL)) {
-         cnt++;
+        cnt++;
         val >>= 1;
-     }
+    }
     if (!(val & 0x00000001UL)) {
-         cnt++;
-     }
-
-     return cnt;
-#endif
- }
-
-static always_inline int cto32 (uint32_t val)
+        cnt++;
+    }
+
+    return cnt;
+#endif
+}
+
+static inline int cto32(uint32_t val)
 {
     return ctz32(~val);
 }
 
-static always_inline int ctz64 (uint64_t val)
-{
-#if QEMU_GNUC_PREREQ(3, 4)
-    if (val)
-        return __builtin_ctz(val);
+static inline int ctz64(uint64_t val)
+{
+#if QEMU_GNUC_PREREQ(3, 4)
+    if (val)
+        return __builtin_ctzll(val);
     else
         return 64;
@@ -181 +181 @@
 }
 
-static always_inline int cto64 (uint64_t val)
+static inline int cto64(uint64_t val)
 {
     return ctz64(~val);
 }
 
-static always_inline int ctpop8 (uint8_t val)
+static inline int ctpop8(uint8_t val)
 {
     val = (val & 0x55) + ((val >> 1) & 0x55);
@@ -195 +195 @@
 }
 
-static always_inline int ctpop16 (uint16_t val)
+static inline int ctpop16(uint16_t val)
 {
     val = (val & 0x5555) + ((val >> 1) & 0x5555);
@@ -205 +205 @@
 }
 
-static always_inline int ctpop32 (uint32_t val)
+static inline int ctpop32(uint32_t val)
 {
 #if QEMU_GNUC_PREREQ(3, 4)
@@ -220 +220 @@
 }
 
-static always_inline int ctpop64 (uint64_t val)
+static inline int ctpop64(uint64_t val)
 {
 #if QEMU_GNUC_PREREQ(3, 4)