Changeset 3641 in vbox

Timestamp:

Jul 16, 2007 1:28:16 PM (18 years ago)

Author:

vboxsync

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

22912

Message:

darn.

Location:

trunk/include/VBox

Files:

• VBoxGuest.h (modified) (1 diff)
• asmdefs.mac (modified) (6 diffs)
• hwacc_svm.h (modified) (1 diff)
• stam.mac (modified) (6 diffs)
• sup.h (modified) (1 diff)

trunk/include/VBox/VBoxGuest.h

@@ -958 +958 @@
  * @{
  */
-#ifdef RT_OS_AMD64
+#ifdef RT_ARCH_AMD64
 # define VBOXGUEST_IOCTL_FLAG     128
-#elif defined(RT_OS_X86)
+#elif defined(RT_ARCH_X86)
 # define VBOXGUEST_IOCTL_FLAG     0
 #else

trunk/include/VBox/asmdefs.mac

@@ -163 +163 @@
 
 %macro COM_S_PRINT 1+
-%ifdef RT_OS_AMD64
+%ifdef RT_ARCH_AMD64
     COM64_S_PRINT %1
 %else
@@ -252 +252 @@
 
 %macro COM_S_CHAR 1
-%ifdef RT_OS_AMD64
+%ifdef RT_ARCH_AMD64
     COM64_S_CHAR %1
 %else
@@ -371 +371 @@
 
 %macro COM_S_NEWLINE 0
-%ifdef RT_OS_AMD64
+%ifdef RT_ARCH_AMD64
     COM64_S_NEWLINE
 %else
@@ -499 +499 @@
 
 %macro COM_S_DWORD_REG 1
-%ifdef RT_OS_AMD64
+%ifdef RT_ARCH_AMD64
     COM64_S_DWORD_REG %1
 %else
@@ -627 +627 @@
 
 %macro COM_S_BYTE_REG 1
-%ifdef RT_OS_AMD64
+%ifdef RT_ARCH_AMD64
     COM64_S_BYTE_REG %1
 %else
@@ -698 +698 @@
 
 %macro COM_S_DIGIT_REG 1
-%ifdef RT_OS_AMD64
+%ifdef RT_ARCH_AMD64
     COM64_S_DIGIT_REG %1
 %else

trunk/include/VBox/hwacc_svm.h

@@ -652 +652 @@
     __asm
     {
-#   ifdef RT_OS_AMD64
+#   ifdef RT_ARCH_AMD64
         mov     rax, pPageGC
 #   else

trunk/include/VBox/stam.mac

@@ -62 +62 @@
 %macro STAM_COUNTER_INC 1
 %ifdef VBOX_WITH_STATISTICS
- %ifdef RT_OS_AMD64
+ %ifdef RT_ARCH_AMD64
     STAM64_COUNTER_INC %1
  %else
@@ -107 +107 @@
 %macro STAM_COUNTER_ADD 2
 %ifdef VBOX_WITH_STATISTICS
- %ifdef RT_OS_AMD64
+ %ifdef RT_ARCH_AMD64
      STAM64_COUNTER_ADD %1, %2
  %else
@@ -166 +166 @@
 %macro STAM_PROFILE_START 1
 %ifdef VBOX_WITH_STATISTICS
- %ifdef RT_OS_AMD64
+ %ifdef RT_ARCH_AMD64
     STAM64_PROFILE_START %1
  %else
@@ -272 +272 @@
 %macro STAM_PROFILE_STOP 2
 %ifdef VBOX_WITH_STATISTICS
- %ifdef RT_OS_AMD64
+ %ifdef RT_ARCH_AMD64
     STAM64_PROFILE_STOP %1, %2
  %else
@@ -317 +317 @@
 %macro STAM_PROFILE_ADV_START 1
 %ifdef VBOX_WITH_STATISTICS
- %ifdef RT_OS_AMD64
+ %ifdef RT_ARCH_AMD64
     STAM64_PROFILE_ADV_START %1
  %else
@@ -366 +366 @@
 %macro STAM_PROFILE_ADV_STOP 1
 %ifdef VBOX_WITH_STATISTICS
- %ifdef RT_OS_AMD64
+ %ifdef RT_ARCH_AMD64
     STAM64_PROFILE_ADV_STOP %1
  %else

trunk/include/VBox/sup.h

@@ -207 +207 @@
 #elif defined(IN_RING0)
 extern DECLIMPORT(SUPGLOBALINFOPAGE)    g_SUPGlobalInfoPage;
-# if defined(__GNUC__) && !defined(RT_OS_DARWIN) && defined(RT_OS_AMD64)
+# if defined(__GNUC__) && !defined(RT_OS_DARWIN) && defined(RT_ARCH_AMD64)
 /** Workaround for ELF+GCC problem on 64-bit hosts.
  * (GCC emits a mov with a R_X86_64_32 reloc, we need R_X86_64_64.) */