Changeset 13815 in vbox for trunk

Timestamp:

Nov 4, 2008 10:46:38 PM (16 years ago)

Author:

vboxsync

Message:

Some RTGCPTR32 cleanup.

Location:

trunk

Files:

• include/VBox/vm.h (modified) (3 diffs)
• include/VBox/vm.mac (modified) (1 diff)
• src/VBox/VMM/MMHyper.cpp (modified) (1 diff)
• src/VBox/VMM/PDMDevHlp.cpp (modified) (2 diffs)
• src/VBox/VMM/PDMLdr.cpp (modified) (2 diffs)
• src/VBox/VMM/PGMHandler.cpp (modified) (1 diff)
• src/VBox/VMM/VMM.cpp (modified) (2 diffs)

trunk/include/VBox/vm.h

@@ -493 +493 @@
      * @remark  Assume interrupts disabled.
      */
-    RTGCPTR32           pfnVMMGCGuestToHostAsmGuestCtx/*(int32_t eax, CPUMCTXCORE Ctx)*/;
+    RTRCPTR             pfnVMMGCGuestToHostAsmGuestCtx/*(int32_t eax, CPUMCTXCORE Ctx)*/;
 
     /**
@@ -508 +508 @@
      * @remark  Assume interrupts disabled.
      */
-    RTGCPTR32           pfnVMMGCGuestToHostAsmHyperCtx/*(int32_t eax, PCPUMCTXCORE ecx)*/;
+    RTRCPTR             pfnVMMGCGuestToHostAsmHyperCtx/*(int32_t eax, PCPUMCTXCORE ecx)*/;
 
     /**
@@ -520 +520 @@
      * @remark  Assume interrupts disabled.
      */
-    RTGCPTR32           pfnVMMGCGuestToHostAsm/*(int32_t eax)*/;
+    RTRCPTR             pfnVMMGCGuestToHostAsm/*(int32_t eax)*/;
     /** @} */
 

trunk/include/VBox/vm.mac

@@ -62 +62 @@
     .u32Reserved        resd 5
 
-    .pfnVMMGCGuestToHostAsmGuestCtx RTGCPTR32_RES 1
-    .pfnVMMGCGuestToHostAsmHyperCtx RTGCPTR32_RES 1
-    .pfnVMMGCGuestToHostAsm         RTGCPTR32_RES 1
+    .pfnVMMGCGuestToHostAsmGuestCtx RTRCPTR_RES 1
+    .pfnVMMGCGuestToHostAsmHyperCtx RTRCPTR_RES 1
+    .pfnVMMGCGuestToHostAsm         RTRCPTR_RES 1
 
     .uPadding1          RTHCPTR_RES 1

trunk/src/VBox/VMM/MMHyper.cpp

@@ -110 +110 @@
         if (VBOX_SUCCESS(rc))
         {
-            pVM->pVMRC = (RTGCPTR32)GCPtr;
+            pVM->pVMRC = (RTRCPTR)GCPtr;
             pVM->pVMGC = pVM->pVMRC;
             for (uint32_t i = 0; i < pVM->cCPUs; i++)

trunk/src/VBox/VMM/PDMDevHlp.cpp

@@ -91 +91 @@
         &&  (pDevIns->pDevReg->fFlags & PDM_DEVREG_FLAGS_RC))
     {
-        RTGCPTR32 GCPtrIn = 0;
+        RTRCPTR RCPtrIn = NIL_RTRCPTR;
         if (pszIn)
         {
-            rc = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszIn, &GCPtrIn);
+            rc = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszIn, &RCPtrIn);
             AssertMsgRC(rc, ("Failed to resolve %s.%s (pszIn)\n", pDevIns->pDevReg->szRCMod, pszIn));
         }
-        RTGCPTR32 GCPtrOut = 0;
+        RTRCPTR RCPtrOut = NIL_RTRCPTR;
         if (pszOut && VBOX_SUCCESS(rc))
         {
-            rc = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszOut, &GCPtrOut);
+            rc = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszOut, &RCPtrOut);
             AssertMsgRC(rc, ("Failed to resolve %s.%s (pszOut)\n", pDevIns->pDevReg->szRCMod, pszOut));
         }
-        RTGCPTR32 GCPtrInStr = 0;
+        RTRCPTR RCPtrInStr = NIL_RTRCPTR;
         if (pszInStr && VBOX_SUCCESS(rc))
         {
-            rc = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszInStr, &GCPtrInStr);
+            rc = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszInStr, &RCPtrInStr);
             AssertMsgRC(rc, ("Failed to resolve %s.%s (pszInStr)\n", pDevIns->pDevReg->szRCMod, pszInStr));
         }
-        RTGCPTR32 GCPtrOutStr = 0;
+        RTRCPTR RCPtrOutStr = NIL_RTRCPTR;
         if (pszOutStr && VBOX_SUCCESS(rc))
         {
-            rc = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszOutStr, &GCPtrOutStr);
+            rc = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszOutStr, &RCPtrOutStr);
             AssertMsgRC(rc, ("Failed to resolve %s.%s (pszOutStr)\n", pDevIns->pDevReg->szRCMod, pszOutStr));
         }
 
         if (VBOX_SUCCESS(rc))
-            rc = IOMR3IOPortRegisterRC(pDevIns->Internal.s.pVMR3, pDevIns, Port, cPorts, pvUser, GCPtrOut, GCPtrIn, GCPtrOutStr, GCPtrInStr, pszDesc);
+            rc = IOMR3IOPortRegisterRC(pDevIns->Internal.s.pVMR3, pDevIns, Port, cPorts, pvUser, RCPtrOut, RCPtrIn, RCPtrOutStr, RCPtrInStr, pszDesc);
     }
     else
@@ -236 +236 @@
         &&  (pDevIns->pDevReg->fFlags & PDM_DEVREG_FLAGS_RC))
     {
-        RTGCPTR32 GCPtrWrite = 0;
+        RTRCPTR RCPtrWrite = NIL_RTRCPTR;
         if (pszWrite)
-            rc = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszWrite, &GCPtrWrite);
-        RTGCPTR32 GCPtrRead = 0;
+            rc = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszWrite, &RCPtrWrite);
+
+        RTRCPTR RCPtrRead = NIL_RTRCPTR;
         int rc2 = VINF_SUCCESS;
         if (pszRead)
-            rc2 = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszRead, &GCPtrRead);
-        RTGCPTR32 GCPtrFill = 0;
+            rc2 = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszRead, &RCPtrRead);
+
+        RTRCPTR RCPtrFill = NIL_RTRCPTR;
         int rc3 = VINF_SUCCESS;
         if (pszFill)
-            rc3 = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszFill, &GCPtrFill);
+            rc3 = PDMR3LdrGetSymbolRCLazy(pDevIns->Internal.s.pVMR3, pDevIns->pDevReg->szRCMod, pszFill, &RCPtrFill);
+
         if (VBOX_SUCCESS(rc) && VBOX_SUCCESS(rc2) && VBOX_SUCCESS(rc3))
-            rc = IOMR3MMIORegisterRC(pDevIns->Internal.s.pVMR3, pDevIns, GCPhysStart, cbRange, pvUser, GCPtrWrite, GCPtrRead, GCPtrFill);
+            rc = IOMR3MMIORegisterRC(pDevIns->Internal.s.pVMR3, pDevIns, GCPhysStart, cbRange, pvUser, RCPtrWrite, RCPtrRead, RCPtrFill);
         else
         {

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -756 +756 @@
  * @param   pRCPtrValue     Where to store the symbol value.
  */
-VMMR3DECL(int) PDMR3LdrGetSymbolRC(PVM pVM, const char *pszModule, const char *pszSymbol, PRTGCPTR32 pRCPtrValue)
+VMMR3DECL(int) PDMR3LdrGetSymbolRC(PVM pVM, const char *pszModule, const char *pszSymbol, PRTRCPTR pRCPtrValue)
 {
 #ifdef PDMLDR_FAKE_MODE
@@ -812 +812 @@
  * @param   pRCPtrValue     Where to store the symbol value.
  */
-VMMR3DECL(int) PDMR3LdrGetSymbolRCLazy(PVM pVM, const char *pszModule, const char *pszSymbol, PRTGCPTR32 pRCPtrValue)
+VMMR3DECL(int) PDMR3LdrGetSymbolRCLazy(PVM pVM, const char *pszModule, const char *pszSymbol, PRTRCPTR pRCPtrValue)
 {
 #ifdef PDMLDR_FAKE_MODE

trunk/src/VBox/VMM/PGMHandler.cpp

@@ -249 +249 @@
      * Resolve the GC handler.
      */
-    RTGCPTR32 pfnHandlerGC;
-    int rc = PDMR3LdrGetSymbolRCLazy(pVM, pszModRC, pszHandlerRC, &pfnHandlerGC);
+    RTRCPTR pfnHandlerRC;
+    int rc = PDMR3LdrGetSymbolRCLazy(pVM, pszModRC, pszHandlerRC, &pfnHandlerRC);
     if (VBOX_SUCCESS(rc))
-        return PGMR3HandlerVirtualRegisterEx(pVM, enmType, GCPtr, GCPtrLast, pfnInvalidateR3, pfnHandlerR3, pfnHandlerGC, pszDesc);
+        return PGMR3HandlerVirtualRegisterEx(pVM, enmType, GCPtr, GCPtrLast, pfnInvalidateR3, pfnHandlerR3, pfnHandlerRC, pszDesc);
 
     AssertMsgFailed(("Failed to resolve %s.%s, rc=%Vrc.\n", pszModRC, pszHandlerRC, rc));

trunk/src/VBox/VMM/VMM.cpp

@@ -496 +496 @@
      *      -# do a generic hypervisor call.
      */
-    RTGCPTR32 GCPtrEP;
-    int rc = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &GCPtrEP);
+    RTRCPTR RCPtrEP;
+    int rc = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
     if (VBOX_SUCCESS(rc))
     {
@@ -508 +508 @@
         CPUMPushHyper(pVM, VMMGC_DO_VMMGC_INIT);        /* Param 1: Operation. */
         CPUMPushHyper(pVM, pVM->pVMRC);                 /* Param 0: pVM */
-        CPUMPushHyper(pVM, 3 * sizeof(RTGCPTR32));      /* trampoline param: stacksize.  */
-        CPUMPushHyper(pVM, GCPtrEP);                    /* Call EIP. */
+        CPUMPushHyper(pVM, 3 * sizeof(RTRCPTR));        /* trampoline param: stacksize.  */
+        CPUMPushHyper(pVM, RCPtrEP);                    /* Call EIP. */
         CPUMSetHyperEIP(pVM, pVM->vmm.s.pfnCallTrampolineRC);