Changeset 9539 in vbox

Timestamp:

Jun 9, 2008 12:15:55 PM (17 years ago)

Author:

vboxsync

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

31819

Message:

Some changes for amd64.
Lifted a restriction for executing code in VT-x (idt & tr): watch for regressions.

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (2 diffs)
• PGM.cpp (modified) (1 diff)
• VMM.cpp (modified) (1 diff)
• VMMAll/PGMAll.cpp (modified) (1 diff)
• VMMAll/PGMAllGst.h (modified) (7 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -635 +635 @@
     }
 
-    /* @todo we can support real-mode by using v86 and protected mode without paging with identity mapped pages.
+    /* @todo we can support real-mode by using v86 with identity mapped pages.
      * (but do we really care?)
      */
@@ -643 +643 @@
     /** @note The context supplied by REM is partial. If we add more checks here, be sure to verify that REM provides this info! */
 
-#ifndef HWACCM_VMX_EMULATE_ALL
+#if 0 //ndef HWACCM_VMX_EMULATE_ALL
     /* Too early for VMX. */
     if (pCtx->idtr.pIdt == 0 || pCtx->idtr.cbIdt == 0 || pCtx->tr == 0)
         return false;
+#endif
 
     /* The guest is about to complete the switch to protected mode. Wait a bit longer. */
+    /* Windows XP; switch to protected mode; all selectors are marked not present in the 
+     * hidden registers (possible recompiler bug) */
     if (pCtx->csHid.Attr.n.u1Present == 0)
         return false;
     if (pCtx->ssHid.Attr.n.u1Present == 0)
         return false;
-#endif
 
     if (pVM->hwaccm.s.vmx.fEnabled)

trunk/src/VBox/VMM/PGM.cpp

@@ -3147 +3147 @@
         }
 
-        //case PGMMODE_AMD64_NX:
+        case PGMMODE_AMD64_NX:
         case PGMMODE_AMD64:
             GCPhysCR3 = CPUMGetGuestCR3(pVM) & 0xfffffffffffff000ULL; /** @todo define this mask! */

trunk/src/VBox/VMM/VMM.cpp

@@ -1700 +1700 @@
     }
 
+    /* Do nothing if the switcher is disabled. */
+    if (pVM->vmm.s.fSwitcherDisabled)
+        return VINF_SUCCESS;
+
     /*
      * Select the new switcher.

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -581 +581 @@
     int rc;
 
-    LogFlow(("PGMInvalidatePage: GCPtrPage=%VGv\n", GCPtrPage));
+    Log2(("PGMInvalidatePage: GCPtrPage=%VGv\n", GCPtrPage));
 
     /** @todo merge PGMGCInvalidatePage with this one */

trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

@@ -398 +398 @@
 {
 #if PGM_GST_TYPE == PGM_TYPE_32BIT \
- || PGM_GST_TYPE == PGM_TYPE_PAE \
- || PGM_GST_TYPE == PGM_TYPE_AMD64
+ || PGM_GST_TYPE == PGM_TYPE_PAE
 
     LogFlow(("MapCR3: %VGp\n", GCPhysCR3));
@@ -415 +414 @@
         {
             PGM_INVL_PG(pVM->pgm.s.GCPtrCR3Mapping);
-#if PGM_GST_TYPE == PGM_TYPE_32BIT
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
             pVM->pgm.s.pGuestPDHC = (R3R0PTRTYPE(PX86PD))HCPtrGuestCR3;
             pVM->pgm.s.pGuestPDGC = (RCPTRTYPE(PX86PD))pVM->pgm.s.GCPtrCR3Mapping;
 
-#elif PGM_GST_TYPE == PGM_TYPE_PAE
+# else /* PAE */
             unsigned offset = GCPhysCR3 & GST_CR3_PAGE_MASK & PAGE_OFFSET_MASK;
             pVM->pgm.s.pGstPaePDPTHC = (R3R0PTRTYPE(PX86PDPT)) HCPtrGuestCR3;
@@ -455 +454 @@
                 PGM_INVL_PG(GCPtr);
             }
-
-#else /* PGM_GST_TYPE == PGM_TYPE_AMD64 */
-            rc = VERR_NOT_IMPLEMENTED;
-#endif
+# endif
         }
         else
@@ -466 +462 @@
         AssertMsgFailed(("rc=%Vrc GCPhysGuestPD=%VGp\n", rc, GCPhysCR3));
 
-#else /* prot/real mode stub */
+#else /* prot/real/amd64 mode stub */
     int rc = VINF_SUCCESS;
 #endif
@@ -500 +496 @@
 
 #elif PGM_GST_TYPE == PGM_TYPE_AMD64
-//#error not implemented
-    rc = VERR_NOT_IMPLEMENTED;
+    /* nothing to do; vt-x/amd-v only */
 
 #else /* prot/real mode stub */
@@ -613 +608 @@
     }
 
-#elif PGM_GST_TYPE == PGM_TYPE_AMD64
-    AssertFailed();
 #else
-    /* prot/real mode stub */
+    /* prot/real/amd64 mode stub */
 
 #endif
@@ -680 +673 @@
         }
     }
-#elif PGM_GST_TYPE == PGM_TYPE_AMD64
-    AssertFailed();
 #else
-    /* prot/real mode stub */
+    /* prot/real/amd64 mode stub */
 #endif
     return rc;