Changeset 9383 in vbox for trunk

Timestamp:

Jun 4, 2008 12:22:45 PM (17 years ago)

Author:

vboxsync

Message:

VT-x/AMD-V updates for 64 bits guests

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• HWACCMInternal.h (modified) (2 diffs)
• PGM.cpp (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (4 diffs)
• VMMR0/HWVMXR0.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -46 +46 @@
 #include <iprt/string.h>
 #include <iprt/thread.h>
-
-/* Uncomment to enable experimental nested paging. */
-//#define VBOX_WITH_NESTED_PAGING
-/* Uncomment to enable 64 bits guest support. */
-//#define VBOX_ENABLE_64_BITS_GUESTS
 
 /*******************************************************************************

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -34 +34 @@
 #include <iprt/mp.h>
 
+/* Uncomment to enable experimental nested paging. */
+//#define VBOX_WITH_NESTED_PAGING
+/* Uncomment to enable 64 bits guest support. */
+//#define VBOX_ENABLE_64_BITS_GUESTS
+
 __BEGIN_DECLS
 
@@ -105 +110 @@
  */
 #ifdef VBOX_STRICT
-#define HWACCM_VMX_TRAP_MASK                RT_BIT(0) | RT_BIT(7) | RT_BIT(14) | RT_BIT(6) | RT_BIT(11) | RT_BIT(12) | RT_BIT(13) | RT_BIT(16)
+#define HWACCM_VMX_TRAP_MASK                RT_BIT(X86_XCPT_DE) | RT_BIT(X86_XCPT_NM) | RT_BIT(X86_XCPT_PF) | RT_BIT(X86_XCPT_UD) | RT_BIT(X86_XCPT_NP) | RT_BIT(X86_XCPT_SS) | RT_BIT(X86_XCPT_GP) | RT_BIT(X86_XCPT_MF)
 #define HWACCM_SVM_TRAP_MASK                HWACCM_VMX_TRAP_MASK
 #else
-#define HWACCM_VMX_TRAP_MASK                RT_BIT(7) | RT_BIT(14)
+#define HWACCM_VMX_TRAP_MASK                RT_BIT(X86_XCPT_NM) | RT_BIT(X86_XCPT_PF)
 #define HWACCM_SVM_TRAP_MASK                HWACCM_VMX_TRAP_MASK
 #endif

trunk/src/VBox/VMM/PGM.cpp

@@ -3149 +3149 @@
         //case PGMMODE_AMD64_NX:
         case PGMMODE_AMD64:
-            GCPhysCR3 = CPUMGetGuestCR3(pVM) & 0xfffffffffffff000ULL; /** @todo define this mask and make CR3 64-bit in this case! */
+            GCPhysCR3 = CPUMGetGuestCR3(pVM) & 0xfffffffffffff000ULL; /** @todo define this mask! */
             rc = PGM_GST_NAME_AMD64(Enter)(pVM, GCPhysCR3);
             switch (pVM->pgm.s.enmShadowMode)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -644 +644 @@
             case PGMMODE_AMD64:         /* 64-bit AMD paging (long mode). */
             case PGMMODE_AMD64_NX:      /* 64-bit AMD paging (long mode) with NX enabled. */
+#ifdef VBOX_ENABLE_64_BITS_GUESTS
+                break;
+#else
                 AssertFailed();
                 return VERR_PGM_UNSUPPORTED_HOST_PAGING_MODE;
+#endif
 
             default:                    /* shut up gcc */
@@ -671 +675 @@
 
     /* EIP, ESP and EFLAGS */
-    pVMCB->guest.u64RIP    = pCtx->eip;
-    pVMCB->guest.u64RSP    = pCtx->esp;
-    pVMCB->guest.u64RFlags = pCtx->eflags.u32;
+    pVMCB->guest.u64RIP    = pCtx->rip;
+    pVMCB->guest.u64RSP    = pCtx->rsp;
+    pVMCB->guest.u64RFlags = pCtx->rflags.u64;
 
     /* Set CPL */
@@ -679 +683 @@
 
     /* RAX/EAX too, as VMRUN uses RAX as an implicit parameter. */
-    pVMCB->guest.u64RAX    = pCtx->eax;
+    pVMCB->guest.u64RAX    = pCtx->rax;
 
     /* vmrun will fail without MSR_K6_EFER_SVME. */
@@ -1031 +1035 @@
 
     /* Let's first sync back eip, esp, and eflags. */
-    pCtx->eip        = pVMCB->guest.u64RIP;
-    pCtx->esp        = pVMCB->guest.u64RSP;
-    pCtx->eflags.u32 = pVMCB->guest.u64RFlags;
+    pCtx->rip        = pVMCB->guest.u64RIP;
+    pCtx->rsp        = pVMCB->guest.u64RSP;
+    pCtx->rflags.u64 = pVMCB->guest.u64RFlags;
     /* eax is saved/restore across the vmrun instruction */
-    pCtx->eax        = pVMCB->guest.u64RAX;
+    pCtx->rax        = pVMCB->guest.u64RAX;
 
     /* Guest CPU context: ES, CS, SS, DS, FS, GS. */

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -784 +784 @@
                 if (!pVM->hwaccm.s.fFPUOldStyleOverride)
                 {
-                    rc = VMXWriteVMCS(VMX_VMCS_CTRL_EXCEPTION_BITMAP, HWACCM_VMX_TRAP_MASK | RT_BIT(16));
+                    rc = VMXWriteVMCS(VMX_VMCS_CTRL_EXCEPTION_BITMAP, HWACCM_VMX_TRAP_MASK | RT_BIT(X86_XCPT_MF));
                     AssertRC(rc);
                     pVM->hwaccm.s.fFPUOldStyleOverride = true;
@@ -837 +837 @@
         case PGMMODE_AMD64:         /* 64-bit AMD paging (long mode). */
         case PGMMODE_AMD64_NX:      /* 64-bit AMD paging (long mode) with NX enabled. */
+#ifdef VBOX_ENABLE_64_BITS_GUESTS
+            break;
+#else
             AssertFailed();
             return VERR_PGM_UNSUPPORTED_HOST_PAGING_MODE;
-
+#endif
         default:                   /* shut up gcc */
             AssertFailed();
@@ -896 +899 @@
 
     /* EIP, ESP and EFLAGS */
-    rc  = VMXWriteVMCS(VMX_VMCS_GUEST_RIP,              pCtx->eip);
-    rc |= VMXWriteVMCS(VMX_VMCS_GUEST_RSP,              pCtx->esp);
+    rc  = VMXWriteVMCS(VMX_VMCS_GUEST_RIP,              pCtx->rip);
+    rc |= VMXWriteVMCS(VMX_VMCS_GUEST_RSP,              pCtx->rsp);
     AssertRC(rc);
 
@@ -978 +981 @@
 {
     int         rc = VINF_SUCCESS;
-    RTCCUINTREG val, valShadow;
-    RTCCUINTREG exitReason, instrError, cbInstr;
-    RTGCUINTPTR exitQualification;
-    RTGCUINTPTR intInfo = 0; /* shut up buggy gcc 4 */
-    RTGCUINTPTR errCode, instrInfo, uInterruptState;
+    uint64_t    val, valShadow;
+    uint64_t    exitReason, instrError, cbInstr;
+    uint64_t    exitQualification;
+    uint64_t    intInfo = 0; /* shut up buggy gcc 4 */
+    uint64_t    errCode, instrInfo, uInterruptState;
     bool        fGuestStateSynced = false;
     unsigned    cResume = 0;
@@ -1350 +1353 @@
     rc = VMXReadVMCS(VMX_VMCS_GUEST_RIP,              &val);
     AssertRC(rc);
-    pCtx->eip               = val;
+    pCtx->rip               = val;
     rc = VMXReadVMCS(VMX_VMCS_GUEST_RSP,              &val);
     AssertRC(rc);
-    pCtx->esp               = val;
+    pCtx->rsp               = val;
     rc = VMXReadVMCS(VMX_VMCS_GUEST_RFLAGS,           &val);
     AssertRC(rc);
-    pCtx->eflags.u32        = val;
+    pCtx->rflags.u64        = val;
 
     /* Real mode emulation using v86 mode with CR4.VME (interrupt redirection using the int bitmap in the TSS) */