Changeset 14799 in vbox for trunk/include

Timestamp:

Nov 28, 2008 11:59:56 PM (16 years ago)

Author:

vboxsync

Message:

#3202: assembly hacking for weird darwin kernel.

File:

• trunk/include/VBox/hwacc_vmx.h (modified) (8 diffs)

trunk/include/VBox/hwacc_vmx.h

@@ -1203 +1203 @@
  * @param   pVMXOn      Physical address of VMXON structure
  */
-#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
 DECLASM(int) VMXEnable(RTHCPHYS pVMXOn);
 #else
@@ -1257 +1257 @@
  * Executes VMXOFF
  */
-#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
 DECLASM(void) VMXDisable(void);
 #else
@@ -1284 +1284 @@
  * @param   pVMCS       Physical address of VM control structure
  */
-#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
 DECLASM(int) VMXClearVMCS(RTHCPHYS pVMCS);
 #else
@@ -1332 +1332 @@
  * @param   pVMCS       Physical address of VMCS structure
  */
-#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
 DECLASM(int) VMXActivateVMCS(RTHCPHYS pVMCS);
 #else
@@ -1387 +1387 @@
  * @param   u32Val          32 bits value
  */
-#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
 DECLASM(int) VMXWriteVMCS32(uint32_t idxField, uint32_t u32Val);
 #else
@@ -1432 +1432 @@
 #endif
 
-/** 
- * Executes VMWRITE 
- * 
- * @returns VBox status code 
- * @param   idxField        VMCS index 
- * @param   u64Val          16, 32 or 64 bits value 
- */ 
-#if HC_ARCH_BITS == 64 
-DECLASM(int) VMXWriteVMCS64(uint32_t idxField, uint64_t u64Val); 
-#else 
-DECLINLINE(int) VMXWriteVMCS64(uint32_t idxField, uint64_t u64Val) 
-{ 
-    int rc; 
-
-    rc  = VMXWriteVMCS32(idxField, u64Val); 
-        rc |= VMXWriteVMCS32(idxField + 1, (uint32_t)(u64Val >> 32ULL)); 
-        AssertRC(rc); 
-        return rc; 
-} 
-#endif 
+/**
+ * Executes VMWRITE
+ *
+ * @returns VBox status code
+ * @param   idxField        VMCS index
+ * @param   u64Val          16, 32 or 64 bits value
+ */
+#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+DECLASM(int) VMXWriteVMCS64(uint32_t idxField, uint64_t u64Val);
+#else
+DECLINLINE(int) VMXWriteVMCS64(uint32_t idxField, uint64_t u64Val)
+{
+    int rc;
+
+    rc  = VMXWriteVMCS32(idxField, u64Val);
+        rc |= VMXWriteVMCS32(idxField + 1, (uint32_t)(u64Val >> 32ULL));
+        AssertRC(rc);
+        return rc;
+}
+#endif
 
 #if HC_ARCH_BITS == 64
@@ -1483 +1483 @@
  * @param   pData           Ptr to store VM field value
  */
-#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
 DECLASM(int) VMXReadVMCS32(uint32_t idxField, uint32_t *pData);
 #else
@@ -1531 +1531 @@
 #endif
 
-#if HC_ARCH_BITS == 64 
-/** 
- * Executes VMREAD 
- * 
- * @returns VBox status code 
- * @param   idxField        VMCS index 
- * @param   pData           Ptr to store VM field value 
- */ 
-DECLASM(int) VMXReadVMCS64(uint32_t idxField, uint64_t *pData); 
-#else 
-DECLINLINE(int) VMXReadVMCS64(uint32_t idxField, uint64_t *pData) 
-{ 
-    int rc; 
-
-    uint32_t val_hi, val; 
-    rc  = VMXReadVMCS32(idxField, &val); 
-    rc |= VMXReadVMCS32(idxField + 1, &val_hi); 
-    AssertRC(rc); 
-    *pData = RT_MAKE_U64(val, val_hi); 
-    return rc; 
-} 
-#endif 
+/**
+ * Executes VMREAD
+ *
+ * @returns VBox status code
+ * @param   idxField        VMCS index
+ * @param   pData           Ptr to store VM field value
+ */
+#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+DECLASM(int) VMXReadVMCS64(uint32_t idxField, uint64_t *pData);
+#else
+DECLINLINE(int) VMXReadVMCS64(uint32_t idxField, uint64_t *pData)
+{
+    int rc;
+
+    uint32_t val_hi, val;
+    rc  = VMXReadVMCS32(idxField, &val);
+    rc |= VMXReadVMCS32(idxField + 1, &val_hi);
+    AssertRC(rc);
+    *pData = RT_MAKE_U64(val, val_hi);
+    return rc;
+}
+#endif
 
 #if HC_ARCH_BITS == 64