Changeset 9148 in vbox for trunk/src/VBox

Timestamp:

May 27, 2008 9:21:03 AM (17 years ago)

Author:

vboxsync

Message:

More 64 bits guest preps

Location:

trunk/src/VBox/VMM

Files:

• MMHyper.cpp (modified) (2 diffs)
• PDMDevice.cpp (modified) (9 diffs)
• PDMLdr.cpp (modified) (2 diffs)
• PGM.cpp (modified) (3 diffs)
• PGMHandler.cpp (modified) (2 diffs)
• TM.cpp (modified) (2 diffs)
• TRPM.cpp (modified) (2 diffs)
• TRPMInternal.h (modified) (2 diffs)
• VMM.cpp (modified) (7 diffs)
• VMMInternal.h (modified) (2 diffs)
• VMMTests.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/MMHyper.cpp

@@ -100 +100 @@
          * Map the VM structure into the hypervisor space.
          */
-        rc = MMR3HyperMapPages(pVM, pVM, pVM->pVMR0, RT_ALIGN_Z(sizeof(VM), PAGE_SIZE) >> PAGE_SHIFT, pVM->paVMPagesR3, "VM", &pVM->pVMGC);
+        RTGCPTR GCPtr;
+        rc = MMR3HyperMapPages(pVM, pVM, pVM->pVMR0, RT_ALIGN_Z(sizeof(VM), PAGE_SIZE) >> PAGE_SHIFT, pVM->paVMPagesR3, "VM", &GCPtr);
         if (VBOX_SUCCESS(rc))
         {
+            pVM->pVMGC = (RTGCPTR32)GCPtr;
+
             /* Reserve a page for fencing. */
             MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
@@ -109 +112 @@
              * Map the heap into the hypervisor space.
              */
-            rc = mmR3HyperHeapMap(pVM, pVM->mm.s.pHyperHeapHC, &pVM->mm.s.pHyperHeapGC);
+            rc = mmR3HyperHeapMap(pVM, pVM->mm.s.pHyperHeapHC, &GCPtr);
             if (VBOX_SUCCESS(rc))
             {
+                pVM->mm.s.pHyperHeapGC = (RTGCPTR32)GCPtr;
+
                 /*
                  * Register info handlers.

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -1261 +1261 @@
         &&  (pDevIns->pDevReg->fFlags & PDM_DEVREG_FLAGS_GC))
     {
-        RTGCPTR GCPtrIn = 0;
+        RTGCPTR32 GCPtrIn = 0;
         if (pszIn)
         {
@@ -1267 +1267 @@
             AssertMsgRC(rc, ("Failed to resolve %s.%s (pszIn)\n", pDevIns->pDevReg->szGCMod, pszIn));
         }
-        RTGCPTR GCPtrOut = 0;
+        RTGCPTR32 GCPtrOut = 0;
         if (pszOut && VBOX_SUCCESS(rc))
         {
@@ -1273 +1273 @@
             AssertMsgRC(rc, ("Failed to resolve %s.%s (pszOut)\n", pDevIns->pDevReg->szGCMod, pszOut));
         }
-        RTGCPTR GCPtrInStr = 0;
+        RTGCPTR32 GCPtrInStr = 0;
         if (pszInStr && VBOX_SUCCESS(rc))
         {
@@ -1279 +1279 @@
             AssertMsgRC(rc, ("Failed to resolve %s.%s (pszInStr)\n", pDevIns->pDevReg->szGCMod, pszInStr));
         }
-        RTGCPTR GCPtrOutStr = 0;
+        RTGCPTR32 GCPtrOutStr = 0;
         if (pszOutStr && VBOX_SUCCESS(rc))
         {
@@ -1406 +1406 @@
         &&  (pDevIns->pDevReg->fFlags & PDM_DEVREG_FLAGS_GC))
     {
-        RTGCPTR GCPtrWrite = 0;
+        RTGCPTR32 GCPtrWrite = 0;
         if (pszWrite)
             rc = PDMR3GetSymbolGCLazy(pDevIns->Internal.s.pVMHC, pDevIns->pDevReg->szGCMod, pszWrite, &GCPtrWrite);
-        RTGCPTR GCPtrRead = 0;
+        RTGCPTR32 GCPtrRead = 0;
         int rc2 = VINF_SUCCESS;
         if (pszRead)
             rc2 = PDMR3GetSymbolGCLazy(pDevIns->Internal.s.pVMHC, pDevIns->pDevReg->szGCMod, pszRead, &GCPtrRead);
-        RTGCPTR GCPtrFill = 0;
+        RTGCPTR32 GCPtrFill = 0;
         int rc3 = VINF_SUCCESS;
         if (pszFill)
@@ -4144 +4144 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC);
-    RTGCPTR pGCHelpers = 0;
+    RTGCPTR32 pGCHelpers = 0;
     int rc = PDMR3GetSymbolGC(pDevIns->Internal.s.pVMHC, NULL, "g_pdmGCPicHlp", &pGCHelpers);
     AssertReleaseRC(rc);
@@ -4230 +4230 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC);
-    RTGCPTR pGCHelpers = 0;
+    RTGCPTR32 pGCHelpers = 0;
     int rc = PDMR3GetSymbolGC(pDevIns->Internal.s.pVMHC, NULL, "g_pdmGCApicHlp", &pGCHelpers);
     AssertReleaseRC(rc);
@@ -4294 +4294 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC);
-    RTGCPTR pGCHelpers = 0;
+    RTGCPTR32 pGCHelpers = 0;
     int rc = PDMR3GetSymbolGC(pDevIns->Internal.s.pVMHC, NULL, "g_pdmGCIoApicHlp", &pGCHelpers);
     AssertReleaseRC(rc);
@@ -4377 +4377 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC);
-    RTGCPTR pGCHelpers = 0;
+    RTGCPTR32 pGCHelpers = 0;
     int rc = PDMR3GetSymbolGC(pDevIns->Internal.s.pVMHC, NULL, "g_pdmGCPciHlp", &pGCHelpers);
     AssertReleaseRC(rc);

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -750 +750 @@
  * @param   pGCPtrValue     Where to store the symbol value.
  */
-PDMR3DECL(int) PDMR3GetSymbolGC(PVM pVM, const char *pszModule, const char *pszSymbol, PRTGCPTR pGCPtrValue)
+PDMR3DECL(int) PDMR3GetSymbolGC(PVM pVM, const char *pszModule, const char *pszSymbol, PRTGCPTR32 pGCPtrValue)
 {
 #ifdef PDMLDR_FAKE_MODE
@@ -806 +806 @@
  * @param   pGCPtrValue     Where to store the symbol value.
  */
-PDMR3DECL(int) PDMR3GetSymbolGCLazy(PVM pVM, const char *pszModule, const char *pszSymbol, PRTGCPTR pGCPtrValue)
+PDMR3DECL(int) PDMR3GetSymbolGCLazy(PVM pVM, const char *pszModule, const char *pszSymbol, PRTGCPTR32 pGCPtrValue)
 {
 #ifdef PDMLDR_FAKE_MODE

trunk/src/VBox/VMM/PGM.cpp

@@ -1588 +1588 @@
 PGMR3DECL(int) PGMR3InitDynMap(PVM pVM)
 {
+    RTGCPTR GCPtr;
     /*
      * Reserve space for mapping the paging pages into guest context.
      */
-    int rc = MMR3HyperReserve(pVM, PAGE_SIZE * (2 + ELEMENTS(pVM->pgm.s.apHCPaePDs) + 1 + 2 + 2), "Paging", &pVM->pgm.s.pGC32BitPD);
+    int rc = MMR3HyperReserve(pVM, PAGE_SIZE * (2 + ELEMENTS(pVM->pgm.s.apHCPaePDs) + 1 + 2 + 2), "Paging", &GCPtr);
     AssertRCReturn(rc, rc);
+    pVM->pgm.s.pGC32BitPD = GCPtr;
     MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
 
@@ -1599 +1601 @@
      */
     /** @todo r=bird: Need to verify that the checks for crossing PTs are correct here. They seems to be assuming 4MB PTs.. */
-    rc = MMR3HyperReserve(pVM, MM_HYPER_DYNAMIC_SIZE, "Dynamic mapping", &pVM->pgm.s.pbDynPageMapBaseGC);
+    rc = MMR3HyperReserve(pVM, MM_HYPER_DYNAMIC_SIZE, "Dynamic mapping", &GCPtr);
+    if (VBOX_SUCCESS(rc))
+        pVM->pgm.s.pbDynPageMapBaseGC = GCPtr;
+
     if (    VBOX_SUCCESS(rc)
         &&  (pVM->pgm.s.pbDynPageMapBaseGC >> X86_PD_SHIFT) != ((pVM->pgm.s.pbDynPageMapBaseGC + MM_HYPER_DYNAMIC_SIZE - 1) >> X86_PD_SHIFT))
-        rc = MMR3HyperReserve(pVM, MM_HYPER_DYNAMIC_SIZE, "Dynamic mapping not crossing", &pVM->pgm.s.pbDynPageMapBaseGC);
+    {
+        rc = MMR3HyperReserve(pVM, MM_HYPER_DYNAMIC_SIZE, "Dynamic mapping not crossing", &GCPtr);
+        if (VBOX_SUCCESS(rc))
+            pVM->pgm.s.pbDynPageMapBaseGC = GCPtr;
+    }
     if (VBOX_SUCCESS(rc))
     {
@@ -2122 +2131 @@
         SSMR3GetGCPtr(pSSM,     &GCPtr);
         RTGCUINTPTR cPTs;
-        rc = SSMR3GetU32(pSSM,  &cPTs);
+        rc = SSMR3GetGCUIntPtr(pSSM, &cPTs);
         if (VBOX_FAILURE(rc))
             return rc;

trunk/src/VBox/VMM/PGMHandler.cpp

@@ -112 +112 @@
          * Resolve the GC handler.
          */
-        RTGCPTR pfnHandlerGC = NIL_RTGCPTR;
+        RTGCPTR32 pfnHandlerGC = NIL_RTGCPTR;
         if (pszHandlerGC)
             rc = PDMR3GetSymbolGCLazy(pVM, pszModGC, pszHandlerGC, &pfnHandlerGC);
@@ -250 +250 @@
      * Resolve the GC handler.
      */
-    RTGCPTR pfnHandlerGC;
+    RTGCPTR32 pfnHandlerGC;
     int rc = PDMR3GetSymbolGCLazy(pVM, pszModGC, pszHandlerGC, &pfnHandlerGC);
     if (VBOX_SUCCESS(rc))

trunk/src/VBox/VMM/TM.cpp

@@ -213 +213 @@
     AssertMsgRCReturn(rc, ("Failed to get GIP physical address!\n"), rc);
 
-    rc = MMR3HyperMapHCPhys(pVM, pVM->tm.s.pvGIPR3, HCPhysGIP, PAGE_SIZE, "GIP", &pVM->tm.s.pvGIPGC);
+    RTGCPTR GCPtr;
+    rc = MMR3HyperMapHCPhys(pVM, pVM->tm.s.pvGIPR3, HCPhysGIP, PAGE_SIZE, "GIP", &GCPtr);
     if (VBOX_FAILURE(rc))
     {
@@ -219 +220 @@
         return rc;
     }
+    pVM->tm.s.pvGIPGC = GCPtr;
     LogFlow(("TMR3Init: HCPhysGIP=%RHp at %VGv\n", HCPhysGIP, pVM->tm.s.pvGIPGC));
     MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);

trunk/src/VBox/VMM/TRPM.cpp

@@ -552 +552 @@
      * exports in TRPMR3Init().
      */
-    RTGCPTR aGCPtrs[TRPM_HANDLER_MAX] = {0};
+    RTGCPTR32 aGCPtrs[TRPM_HANDLER_MAX] = {0};
     int rc;
     rc = PDMR3GetSymbolGC(pVM, VMMGC_MAIN_MODULE_NAME, "TRPMGCHandlerInterupt", &aGCPtrs[TRPM_HANDLER_INT]);
@@ -1051 +1051 @@
 {
     /** @todo cleanup trpmR3ClearPassThroughHandler()! */
-    RTGCPTR aGCPtrs[TRPM_HANDLER_MAX];
+    RTGCPTR32 aGCPtrs[TRPM_HANDLER_MAX];
     int rc;
 

trunk/src/VBox/VMM/TRPMInternal.h

@@ -149 +149 @@
     /** Temporary Hypervisor trap handlers.
      * NULL means default action. */
-    RTGCPTR         aTmpTrapHandlers[256];
+    RTGCPTR32       aTmpTrapHandlers[256];
 
     /** GC Pointer to the IDT shadow area (aIdt) placed in Hypervisor memory arena. */
-    RTGCPTR         GCPtrIdt;
+    RTGCPTR32       GCPtrIdt;
     /** Current (last) Guest's IDTR. */
     VBOXIDTR        GuestIdtr;
@@ -160 +160 @@
 
     /** Checked trap & interrupt handler array */
-    RTGCPTR         aGuestTrapHandler[256];
+    RTGCPTR32       aGuestTrapHandler[256];
 
     /** GC: The number of times writes to the Guest IDT were detected. */

trunk/src/VBox/VMM/VMM.cpp

@@ -306 +306 @@
          * Map the code into the GC address space.
          */
-        rc = MMR3HyperMapHCPhys(pVM, pVM->vmm.s.pvHCCoreCodeR3, pVM->vmm.s.HCPhysCoreCode, cbCoreCode, "Core Code", &pVM->vmm.s.pvGCCoreCode);
+        RTGCPTR GCPtr;
+        rc = MMR3HyperMapHCPhys(pVM, pVM->vmm.s.pvHCCoreCodeR3, pVM->vmm.s.HCPhysCoreCode, cbCoreCode, "Core Code", &GCPtr);
         if (VBOX_SUCCESS(rc))
         {
+            pVM->vmm.s.pvGCCoreCode = GCPtr;
             MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
             LogRel(("CoreCode: R3=%VHv R0=%VHv GC=%VGv Phys=%VHp cb=%#x\n",
@@ -677 +679 @@
      *      -# do a generic hypervisor call.
      */
-    RTGCPTR GCPtrEP;
+    RTGCPTR32 GCPtrEP;
     int rc = PDMR3GetSymbolGC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &GCPtrEP);
     if (VBOX_SUCCESS(rc))
@@ -866 +868 @@
      */
     int rc = VINF_SUCCESS;
-    RTGCPTR GCPtrLoggerFlush = 0;
+    RTGCPTR32 GCPtrLoggerFlush = 0;
 
     if (pVM->vmm.s.pLoggerHC
@@ -880 +882 @@
     if (pVM->vmm.s.pLoggerHC)
     {
-        RTGCPTR GCPtrLoggerWrapper = 0;
+        RTGCPTR32 GCPtrLoggerWrapper = 0;
         rc = PDMR3GetSymbolGC(pVM, VMMGC_MAIN_MODULE_NAME, "vmmGCLoggerWrapper", &GCPtrLoggerWrapper);
         AssertReleaseMsgRC(rc, ("vmmGCLoggerWrapper not found! rc=%Vra\n", rc));
@@ -892 +894 @@
     if (pVM->vmm.s.pRelLoggerHC)
     {
-        RTGCPTR GCPtrLoggerWrapper = 0;
+        RTGCPTR32 GCPtrLoggerWrapper = 0;
         rc = PDMR3GetSymbolGC(pVM, VMMGC_MAIN_MODULE_NAME, "vmmGCRelLoggerWrapper", &GCPtrLoggerWrapper);
         AssertReleaseMsgRC(rc, ("vmmGCRelLoggerWrapper not found! rc=%Vra\n", rc));
@@ -1567 +1569 @@
 VMMR3DECL(const char *) VMMR3GetGCAssertMsg1(PVM pVM)
 {
-    RTGCPTR GCPtr;
+    RTGCPTR32 GCPtr;
     int rc = PDMR3GetSymbolGC(pVM, NULL, "g_szRTAssertMsg1", &GCPtr);
     if (VBOX_SUCCESS(rc))
@@ -1583 +1585 @@
 VMMR3DECL(const char *) VMMR3GetGCAssertMsg2(PVM pVM)
 {
-    RTGCPTR GCPtr;
+    RTGCPTR32 GCPtr;
     int rc = PDMR3GetSymbolGC(pVM, NULL, "g_szRTAssertMsg2", &GCPtr);
     if (VBOX_SUCCESS(rc))

trunk/src/VBox/VMM/VMMInternal.h

@@ -161 +161 @@
     RTR0PTR                     pvHCCoreCodeR0;
     /** Pointer to core code guest context mapping. */
-    RTGCPTR                     pvGCCoreCode;
+    RTGCPTR32                   pvGCCoreCode;
 #ifdef VBOX_WITH_NMI
     /** The guest context address of the APIC (host) mapping. */
-    RTGCPTR                     GCPtrApicBase;
-    RTGCPTR                     pGCPadding0; /**< Alignment padding */
+    RTGCPTR32                   GCPtrApicBase;
+    RTGCPTR32                   pGCPadding0; /**< Alignment padding */
 #endif
     /** The current switcher.
@@ -180 +180 @@
     GCPTRTYPE(PFNVMMSWITCHERGC) pfnGCGuestToHost;
     /** Call Trampoline. See vmmGCCallTrampoline(). */
-    RTGCPTR                     pfnGCCallTrampoline;
+    RTGCPTR32                   pfnGCCallTrampoline;
 
     /** Resume Guest Execution. See CPUMGCResumeGuest(). */
-    RTGCPTR                     pfnCPUMGCResumeGuest;
+    RTGCPTR32                   pfnCPUMGCResumeGuest;
     /** Resume Guest Execution in V86 mode. See CPUMGCResumeGuestV86(). */
-    RTGCPTR                     pfnCPUMGCResumeGuestV86;
+    RTGCPTR32                   pfnCPUMGCResumeGuestV86;
     /** The last GC return code. */
     RTINT                       iLastGCRc;

trunk/src/VBox/VMM/VMMTests.cpp

@@ -56 +56 @@
 static int vmmR3DoGCTest(PVM pVM, VMMGCOPERATION enmTestcase, unsigned uVariation)
 {
-    RTGCPTR GCPtrEP;
+    RTGCPTR32 GCPtrEP;
     int rc = PDMR3GetSymbolGC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &GCPtrEP);
     if (VBOX_FAILURE(rc))
@@ -90 +90 @@
     RTPrintf("VMM: testing 0%x / %d - %s\n", u8Trap, uVariation, pszDesc);
 
-    RTGCPTR GCPtrEP;
+    RTGCPTR32 GCPtrEP;
     int rc = PDMR3GetSymbolGC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &GCPtrEP);
     if (VBOX_FAILURE(rc))
@@ -123 +123 @@
     else if (pszFaultEIP)
     {
-        RTGCPTR GCPtrFault;
+        RTGCPTR32 GCPtrFault;
         int rc2 = PDMR3GetSymbolGC(pVM, VMMGC_MAIN_MODULE_NAME, pszFaultEIP, &GCPtrFault);
         if (VBOX_FAILURE(rc2))
@@ -178 +178 @@
      * Setup stack for calling VMMGCEntry().
      */
-    RTGCPTR GCPtrEP;
+    RTGCPTR32 GCPtrEP;
     int rc = PDMR3GetSymbolGC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &GCPtrEP);
     if (VBOX_SUCCESS(rc))
@@ -485 +485 @@
      * Setup stack for calling VMMGCEntry().
      */
-    RTGCPTR GCPtrEP;
+    RTGCPTR32 GCPtrEP;
     rc = PDMR3GetSymbolGC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &GCPtrEP);
     if (VBOX_SUCCESS(rc))