Changeset 13197 in vbox for trunk/include/VBox

Timestamp:

Oct 13, 2008 8:52:06 AM (16 years ago)

Author:

vboxsync

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

37739

Message:

Backed out 37737&37738. (regressions)

Location:

trunk/include/VBox

Files:

• hwacc_vmx.h (modified) (2 diffs)
• pgm.h (modified) (1 diff)

trunk/include/VBox/hwacc_vmx.h

@@ -1380 +1380 @@
  * @returns VBox status code
  * @param   idxField        VMCS index
+ * @param   u64Val          16, 32 or 64 bits value
+ */
+DECLASM(int) VMXWriteVMCS64(uint32_t idxField, uint64_t u64Val);
+
+/**
+ * Executes VMWRITE
+ *
+ * @returns VBox status code
+ * @param   idxField        VMCS index
  * @param   u32Val          32 bits value
  */
-#if HC_ARCH_BITS == 64
-DECLINLINE(int) VMXWriteVMCS32(uint32_t idxField, uint32_t u32Val)
-{
-    return VMXWriteVMCS64(idxField, u32Val);
-}
-#elif RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
 DECLASM(int) VMXWriteVMCS32(uint32_t idxField, uint32_t u32Val);
 #else
@@ -1432 +1436 @@
 #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);
+#define VMXWriteVMCS VMXWriteVMCS64
 #else
-DECLINLINE(int) VMXWriteVMCS64(uint32_t idxField, uint64_t u64Val)
-{
-    int rc;
-
-    rc  = VMXWriteVMCS32(idxField,    u64Val);
-    rc |= VMXWriteVMCS32(idxField+1,  u64Val >> 32ULL);
-    return rc;
-}
-#endif
+#define VMXWriteVMCS VMXWriteVMCS32
+#endif /* HC_ARCH_BITS == 64 */
 
 

trunk/include/VBox/pgm.h

@@ -336 +336 @@
 VMMDECL(int)    PGMGstSetPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags);
 VMMDECL(int)    PGMGstModifyPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask);
-VMMDECL(X86PDPE) PGMGstGetPaePDPtr(PVM pVM, unsigned iPdPt);
-
 VMMDECL(int)    PGMFlushTLB(PVM pVM, uint64_t cr3, bool fGlobal);
 VMMDECL(int)    PGMUpdateCR3(PVM pVM, uint64_t cr3);