Changeset 3727 in vbox

Timestamp:

Jul 19, 2007 7:14:09 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

23026

Message:

Double underscore cleanup.

Location:

trunk/src/recompiler

Files:

• InnoTek/e_powl-x86.S (modified) (1 diff)
• InnoTek/testmath.c (modified) (2 diffs)
• VBoxREMWrapper.cpp (modified) (1 diff)
• cpu-all.h (modified) (1 diff)
• exec-all.h (modified) (1 diff)
• target-i386/cpu.h (modified) (2 diffs)
• target-i386/helper.c (modified) (1 diff)
• target-i386/ops_sse.h (modified) (1 diff)

trunk/src/recompiler/InnoTek/e_powl-x86.S

@@ -103 +103 @@
 //ENTRY(__ieee754_powl)
 ENTRY(RT_NOCRT(powl))
-#ifdef __DARWIN__ /* 16-byte long double with 8 byte alignment requirements */
+#ifdef RT_OS_DARWIN /* 16-byte long double with 8 byte alignment requirements */
         fldt    20(%esp)        // y
 #else

trunk/src/recompiler/InnoTek/testmath.c

@@ -193 +193 @@
     CHECKLL(llrint(42.42), 42);
     CHECKLL(llrint(-2147483648.12343), -2147483648LL);
-#if !defined(__AMD64__) && !defined(__x86_64__)
+#if !defined(RT_ARCH_AMD64)
     CHECKLL(lrint(-21474836499.12343), -2147483648LL);
     CHECKLL(lrint(-2147483649932412.12343), -2147483648LL);
@@ -243 +243 @@
     CHECKL(lrintl(make_lrd_cw(0x8000000000000000ULL,0x400e,0x0e7f)), 32768L);
     CHECKL(lrintl(make_lrd_cw(0x8000000000000000ULL,0x400e,0x0e7f)), 32768L);
-#if !defined(__AMD64__) && !defined(__x86_64__)
+#if !defined(RT_ARHC_AMD64)
     CHECKL(lrintl(make_lrd_cw(0xad78ebc5ac620000ULL,0xc041,0x027f)), (long)-2147483648L);
     CHECKL(lrintl(make_lrd_cw(0xad78ebc5ac620000ULL,0xc041,0x027f)), (long)-2147483648L);

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -166 +166 @@
  * emit some jump glue to deal with big addresses.
  */
-#if (defined(RT_ARCH_AMD64) && !defined(USE_REM_CALLING_CONVENTION_GLUE) && !defined(__DARWIN__)) || defined(__DOXYGEN__)
+#if (defined(RT_ARCH_AMD64) && !defined(USE_REM_CALLING_CONVENTION_GLUE) && !defined(RT_OS_DARWIN)) || defined(__DOXYGEN__)
 # define USE_REM_IMPORT_JUMP_GLUE
 #endif

trunk/src/recompiler/cpu-all.h

@@ -220 +220 @@
 void     remR3GrowDynRange(unsigned long physaddr);
 #endif
-#if 0 /*defined(__AMD64__) && defined(VBOX_STRICT)*/
+#if 0 /*defined(RT_ARCH_AMD64) && defined(VBOX_STRICT)*/
 # define VBOX_CHECK_ADDR(ptr) do { if ((uintptr_t)(ptr) >= _4G) __asm__("int3"); } while (0)
 #else

trunk/src/recompiler/exec-all.h

@@ -206 +206 @@
     uint16_t tb_jmp_offset[4]; /* offset of jump instruction */
 #else
-# if defined(VBOX) && defined(__DARWIN__) && defined(__AMD64__)
+# if defined(VBOX) && defined(RT_OS_DARWIN) && defined(RT_ARCH_AMD64)
 #  error "First 4GB aren't reachable. jmp dword [tb_next] wont work."
 # endif

trunk/src/recompiler/target-i386/cpu.h

@@ -492 +492 @@
 #endif 
     CPU86_LDouble ft0;
-#if defined(VBOX) && defined(__X86__) && !defined(__DARWIN__)
+#if defined(VBOX) && defined(RT_ARCH_X86) && !defined(RT_OS_DARWIN)
     uint32_t alignment4; /* long double is 12 byte, pad it to 16. */
 #endif 
@@ -535 +535 @@
     /* exception/interrupt handling */
     jmp_buf jmp_env;
-#if defined(VBOX) && defined(__WIN__) && defined(__X86__) 
+#if defined(VBOX) && defined(RT_OS_WINDOWS) && defined(RT_ARCH_X86) 
     /* This will be removed when switching to the no-crt code everywhere. */
     uint32_t alignment1[23];

trunk/src/recompiler/target-i386/helper.c

@@ -1197 +1197 @@
 void helper_external_event(void)
 {
-#if defined(__DARWIN__) && defined(VBOX_STRICT)
+#if defined(RT_OS_DARWIN) && defined(VBOX_STRICT)
     uintptr_t uESP;
     __asm__ __volatile__("movl %%esp, %0" : "=r" (uESP));

trunk/src/recompiler/target-i386/ops_sse.h

@@ -581 +581 @@
 void OPPROTO glue(op_pshufw, SUFFIX) (void)
 {
-#if __GCC__ == 3 || defined(__AMD64__)
+#if __GCC__ == 3 || defined(RT_ARCH_AMD64) /* VBOX hack in #else */
     Reg r, *d, *s;
     int order;