Changeset 36125 in vbox for trunk/src/recompiler/bswap.h

Timestamp:

Mar 1, 2011 4:49:42 PM (14 years ago)

Author:

vboxsync

Message:

recompiler: Removing traces of attempts at making the recompiler compile with the microsoft compiler. (untested)

File:

• trunk/src/recompiler/bswap.h (modified) (7 diffs)

trunk/src/recompiler/bswap.h

@@ -4 +4 @@
 #include "config-host.h"
 
-#ifndef _MSC_VER
 #include <inttypes.h>
-#endif
 
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
-#else
-#ifdef _MSC_VER
-static _inline uint16_t bswap_16(register uint16_t x)
-{
-    return ((uint16_t)( \
-                (((uint16_t)(x) & (uint16_t)0x00ffU) << 8) | \
-                (((uint16_t)(x) & (uint16_t)0xff00U) >> 8) )); \
-}
-
-static _inline uint32_t bswap_32(register uint32_t x) \
-{ \
-    return ((uint32_t)( \
-                (((uint32_t)(x) & (uint32_t)0x000000ffUL) << 24) | \
-                (((uint32_t)(x) & (uint32_t)0x0000ff00UL) <<  8) | \
-                (((uint32_t)(x) & (uint32_t)0x00ff0000UL) >>  8) | \
-                (((uint32_t)(x) & (uint32_t)0xff000000UL) >> 24) )); \
-}
-
-static _inline uint64_t bswap_64(register uint64_t x) \
-{ \
-    return ((uint64_t)( \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x00000000000000ffULL) << 56) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x000000000000ff00ULL) << 40) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x0000000000ff0000ULL) << 24) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x00000000ff000000ULL) <<  8) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x000000ff00000000ULL) >>  8) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x0000ff0000000000ULL) >> 24) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56) )); \
-}
-
 #else
 
@@ -74 +41 @@
                 (uint64_t)(((uint64_t)(__x) & (uint64_t)0xff00000000000000ULL) >> 56) )); \
 })
-#endif
 
 #endif /* !HAVE_BYTESWAP_H */
 
 #ifndef bswap16 /* BSD endian.h clash */
-#ifndef VBOX
 static inline uint16_t bswap16(uint16_t x)
-#else
-DECLINLINE(uint16_t) bswap16(uint16_t x)
-#endif
 {
     return bswap_16(x);
@@ -90 +52 @@
 
 #ifndef bswap32 /* BSD endian.h clash */
-#ifndef VBOX
 static inline uint32_t bswap32(uint32_t x)
-#else
-DECLINLINE(uint32_t) bswap32(uint32_t x)
-#endif
 {
     return bswap_32(x);
@@ -101 +59 @@
 
 #ifndef bswap64 /* BSD endian.h clash. */
-#ifndef VBOX
 static inline uint64_t bswap64(uint64_t x)
-#else
-DECLINLINE(uint64_t) bswap64(uint64_t x)
-#endif
 {
     return bswap_64(x);
@@ -111 +65 @@
 #endif
 
-#ifndef VBOX
 static inline void bswap16s(uint16_t *s)
-#else
-DECLINLINE(void) bswap16s(uint16_t *s)
-#endif
 {
     *s = bswap16(*s);
 }
 
-#ifndef VBOX
 static inline void bswap32s(uint32_t *s)
-#else
-DECLINLINE(void) bswap32s(uint32_t *s)
-#endif
 {
     *s = bswap32(*s);
 }
 
-#ifndef VBOX
 static inline void bswap64s(uint64_t *s)
-#else
-DECLINLINE(void) bswap64s(uint64_t *s)
-#endif
 {
     *s = bswap64(*s);
@@ -150 +92 @@
 #endif
 
-#ifndef VBOX
 #define CPU_CONVERT(endian, size, type)\
 static inline type endian ## size ## _to_cpu(type v)\
@@ -181 +122 @@
      *p = cpu_to_ ## endian ## size(v);\
 }
-#else  /* VBOX */
-#define CPU_CONVERT(endian, size, type)\
-DECLINLINE(type) endian ## size ## _to_cpu(type v)\
-{\
-    return endian ## _bswap(v, size);\
-}\
-\
-DECLINLINE(type) cpu_to_ ## endian ## size(type v)\
-{\
-    return endian ## _bswap(v, size);\
-}\
-\
-DECLINLINE(void) endian ## size ## _to_cpus(type *p)\
-{\
-    endian ## _bswaps(p, size)\
-}\
-\
-DECLINLINE(void) cpu_to_ ## endian ## size ## s(type *p)\
-{\
-    endian ## _bswaps(p, size)\
-}\
-\
-DECLINLINE(type) endian ## size ## _to_cpup(const type *p)\
-{\
-    return endian ## size ## _to_cpu(*p);\
-}\
-\
-DECLINLINE(void) cpu_to_ ## endian ## size ## w(type *p, type v)\
-{\
-     *p = cpu_to_ ## endian ## size(v);\
-}
-#endif /* VBOX */
 
 CPU_CONVERT(be, 16, uint16_t)