vbox的更動 57446 路徑 trunk/src/VBox/VMM/include/CPUMInternal.h

時間撮記:

2015-8-18 下午05:33:53 (9 年 以前)

作者:

vboxsync

訊息:

VMM: Removing VBOX_WITH_HYBRID_32BIT_KERNEL and other 32-bit darwin fun.

檔案:

• trunk/src/VBox/VMM/include/CPUMInternal.h (修改) (7 筆差異)

trunk/src/VBox/VMM/include/CPUMInternal.h

@@ -111 +111 @@
 #define CPUM_USE_SUPPORTS_LONGMODE      RT_BIT(20)
 /** @} */
-
-/* Sanity check. */
-#ifndef VBOX_FOR_DTRACE_LIB
-#if defined(VBOX_WITH_HYBRID_32BIT_KERNEL) && (HC_ARCH_BITS != 32 || R0_ARCH_BITS != 32)
-# error "VBOX_WITH_HYBRID_32BIT_KERNEL is only for 32 bit builds."
-#endif
-#endif
 
 
@@ -202 +195 @@
 /**
  * The saved host CPU state.
- *
- * @remark  The special VBOX_WITH_HYBRID_32BIT_KERNEL checks here are for the 10.4.x series
- *          of Mac OS X where the OS is essentially 32-bit but the cpu mode can be 64-bit.
  */
 typedef struct CPUMHOSTCTX
@@ -210 +200 @@
     /** General purpose register, selectors, flags and more
      * @{ */
-#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+#if HC_ARCH_BITS == 64
     /** General purpose register ++
      * { */
@@ -264 +254 @@
     /** @} */
 
-#if HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+#if HC_ARCH_BITS == 32
     /** Control registers.
      * @{ */
@@ -309 +299 @@
     uint8_t         auPadding[20];
 
-#elif HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+#elif HC_ARCH_BITS == 64
 
     /** Control registers.
@@ -352 +342 @@
 
     /* padding to get 32byte aligned size */
-# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
-    uint8_t         auPadding[52];
-# else
     uint8_t         auPadding[4];
-# endif
 
 #else
-# error HC_ARCH_BITS not defined
+# error HC_ARCH_BITS not defined or unsupported
 #endif
 
@@ -558 +544 @@
 DECLASM(void)       cpumR0SetMXCSR(uint32_t u32MXCSR);
 DECLASM(uint32_t)   cpumR0GetMXCSR(void);
-DECLASM(void)       cpumR0LoadDRx(uint64_t const *pa4Regs);
-DECLASM(void)       cpumR0SaveDRx(uint64_t *pa4Regs);
 #endif