Changeset 9344 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 3, 2008 9:49:14 AM (17 years ago)

Author:

vboxsync

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

31559

Message:

Types and string format specifiers.

Location:

trunk/src/VBox/VMM

Files:

• PATM/CSAM.cpp (modified) (29 diffs)
• PATM/CSAMInternal.h (modified) (7 diffs)
• PATM/PATMPatch.cpp (modified) (1 diff)
• PATM/VMMAll/CSAMAll.cpp (modified) (9 diffs)
• PATM/VMMAll/PATMAll.cpp (modified) (11 diffs)
• VMMAll/PGMAllBth.h (modified) (7 diffs)
• VMMGC/TRPMGCHandlers.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -74 +74 @@
 static DECLCALLBACK(int) CSAMCodePageInvalidate(PVM pVM, RTGCPTR GCPtr);
 
-bool                csamIsCodeScanned(PVM pVM, RTGCPTR32 pInstr, PCSAMPAGE *pPage);
-int                 csamR3CheckPageRecord(PVM pVM, RTGCPTR32 pInstr);
-static PCSAMPAGE    csamCreatePageRecord(PVM pVM, RTGCPTR32 GCPtr, CSAMTAG enmTag, bool fCode32, bool fMonitorInvalidation = false);
-static int          csamRemovePageRecord(PVM pVM, RTGCPTR32 GCPtr);
+bool                csamIsCodeScanned(PVM pVM, RTRCPTR pInstr, PCSAMPAGE *pPage);
+int                 csamR3CheckPageRecord(PVM pVM, RTRCPTR pInstr);
+static PCSAMPAGE    csamCreatePageRecord(PVM pVM, RTRCPTR GCPtr, CSAMTAG enmTag, bool fCode32, bool fMonitorInvalidation = false);
+static int          csamRemovePageRecord(PVM pVM, RTRCPTR GCPtr);
 static int          csamReinit(PVM pVM);
-static void         csamMarkCode(PVM pVM, PCSAMPAGE pPage, RTGCPTR32 pInstr, uint32_t opsize, bool fScanned);
+static void         csamMarkCode(PVM pVM, PCSAMPAGE pPage, RTRCPTR pInstr, uint32_t opsize, bool fScanned);
 static int          csamAnalyseCodeStream(PVM pVM, RCPTRTYPE(uint8_t *) pInstrGC, RCPTRTYPE(uint8_t *) pCurInstrGC, bool fCode32,
                                           PFN_CSAMR3ANALYSE pfnCSAMR3Analyse, void *pUserData, PCSAMP2GLOOKUPREC pCacheRec);
@@ -118 +118 @@
     rc = MMR3HyperAllocOnceNoRel(pVM, CSAM_PGDIRBMP_CHUNKS*sizeof(RTHCPTR), 0, MM_TAG_CSAM, (void **)&pVM->csam.s.pPDBitmapHC);
     AssertRCReturn(rc, rc);
-    rc = MMR3HyperAllocOnceNoRel(pVM, CSAM_PGDIRBMP_CHUNKS*sizeof(RTGCPTR32), 0, MM_TAG_CSAM, (void **)&pVM->csam.s.pPDGCBitmapHC);
+    rc = MMR3HyperAllocOnceNoRel(pVM, CSAM_PGDIRBMP_CHUNKS*sizeof(RTRCPTR), 0, MM_TAG_CSAM, (void **)&pVM->csam.s.pPDGCBitmapHC);
     AssertRCReturn(rc, rc);
     pVM->csam.s.pPDBitmapGC   = MMHyperHC2GC(pVM, pVM->csam.s.pPDGCBitmapHC);
@@ -612 +612 @@
     for (int i=0;i<orgsize;i++)
     {
-        int rc = PATMR3QueryOpcode(pVM, (RTGCPTR32)pSrc, pDest);
+        int rc = PATMR3QueryOpcode(pVM, (RTRCPTR)pSrc, pDest);
         if (VBOX_SUCCESS(rc))
         {
@@ -642 +642 @@
 }
 
-inline int CSAMR3DISInstr(PVM pVM, DISCPUSTATE *pCpu, RTGCPTR32 InstrGC, uint8_t *InstrHC, uint32_t *pOpsize, char *pszOutput)
+inline int CSAMR3DISInstr(PVM pVM, DISCPUSTATE *pCpu, RTRCPTR InstrGC, uint8_t *InstrHC, uint32_t *pOpsize, char *pszOutput)
 {
     (pCpu)->pfnReadBytes  = CSAMR3ReadBytes;
@@ -1270 +1270 @@
            )
         {
-            RTGCPTR32  pJumpTableGC = (RTGCPTR32)cpu.param1.disp32;
+            RTRCPTR  pJumpTableGC = (RTRCPTR)cpu.param1.disp32;
             uint8_t *pJumpTableHC;
             int      rc2;
@@ -1288 +1288 @@
                         break;
 
-                    addr = *(RTGCPTR32 *)(pJumpTableHC + cpu.param1.scale * i);
+                    addr = *(RTRCPTR *)(pJumpTableHC + cpu.param1.scale * i);
 
                     rc2 = PGMGstGetPage(pVM, addr, &fFlags, NULL);
@@ -1346 +1346 @@
  * @param   pInstr      Page address
  */
-uint64_t csamR3CalcPageHash(PVM pVM, RTGCPTR32 pInstr)
+uint64_t csamR3CalcPageHash(PVM pVM, RTRCPTR pInstr)
 {
     uint64_t hash   = 0;
@@ -1411 +1411 @@
  * @param   fRemovePage Page removal flag
  */
-static int csamFlushPage(PVM pVM, RTGCPTR32 addr, bool fRemovePage)
+static int csamFlushPage(PVM pVM, RTRCPTR addr, bool fRemovePage)
 {
     PCSAMPAGEREC pPageRec;
@@ -1518 +1518 @@
  * @param   addr        GC address of the page to flush
  */
-CSAMR3DECL(int) CSAMR3FlushPage(PVM pVM, RTGCPTR32 addr)
+CSAMR3DECL(int) CSAMR3FlushPage(PVM pVM, RTRCPTR addr)
 {
     return csamFlushPage(pVM, addr, true /* remove page record */);
@@ -1530 +1530 @@
  * @param   addr        GC address of the page to flush
  */
-CSAMR3DECL(int) CSAMR3RemovePage(PVM pVM, RTGCPTR32 addr)
+CSAMR3DECL(int) CSAMR3RemovePage(PVM pVM, RTRCPTR addr)
 {
     PCSAMPAGEREC pPageRec;
@@ -1555 +1555 @@
  * @param   pInstrGC    GC instruction pointer
  */
-int csamR3CheckPageRecord(PVM pVM, RTGCPTR32 pInstrGC)
+int csamR3CheckPageRecord(PVM pVM, RTRCPTR pInstrGC)
 {
     PCSAMPAGEREC pPageRec;
@@ -1602 +1602 @@
  * @param   fMonitorInvalidation    Monitor page invalidation flag
  */
-static PCSAMPAGE csamCreatePageRecord(PVM pVM, RTGCPTR32 GCPtr, CSAMTAG enmTag, bool fCode32, bool fMonitorInvalidation)
+static PCSAMPAGE csamCreatePageRecord(PVM pVM, RTRCPTR GCPtr, CSAMTAG enmTag, bool fCode32, bool fMonitorInvalidation)
 {
     PCSAMPAGEREC pPage;
@@ -1703 +1703 @@
  * @param   enmTag      Monitor tag
  */
-CSAMR3DECL(int) CSAMR3MonitorPage(PVM pVM, RTGCPTR32 pPageAddrGC, CSAMTAG enmTag)
+CSAMR3DECL(int) CSAMR3MonitorPage(PVM pVM, RTRCPTR pPageAddrGC, CSAMTAG enmTag)
 {
     PCSAMPAGEREC pPageRec = NULL;
@@ -1825 +1825 @@
  * @param   enmTag      Monitor tag
  */
-CSAMR3DECL(int) CSAMR3UnmonitorPage(PVM pVM, RTGCPTR32 pPageAddrGC, CSAMTAG enmTag)
+CSAMR3DECL(int) CSAMR3UnmonitorPage(PVM pVM, RTRCPTR pPageAddrGC, CSAMTAG enmTag)
 {
     pPageAddrGC &= PAGE_BASE_GC_MASK;
@@ -1849 +1849 @@
  * @param   GCPtr       Page address
  */
-static int csamRemovePageRecord(PVM pVM, RTGCPTR32 GCPtr)
+static int csamRemovePageRecord(PVM pVM, RTRCPTR GCPtr)
 {
     PCSAMPAGEREC pPageRec;
@@ -1911 +1911 @@
  * @param   cbBuf           How much it's reading/writing.
  */
-static DECLCALLBACK(void) CSAMDelayedWriteHandler(PVM pVM, RTGCPTR32 GCPtr, size_t cbBuf)
+static DECLCALLBACK(void) CSAMDelayedWriteHandler(PVM pVM, RTRCPTR GCPtr, size_t cbBuf)
 {
     int rc = PATMR3PatchWrite(pVM, GCPtr, cbBuf);
@@ -1951 +1951 @@
          */
         Log(("CSAMCodePageWriteHandler: delayed write!\n"));
-        AssertCompileSize(RTGCPTR32, 4);
+        AssertCompileSize(RTRCPTR, 4);
         rc = VMR3ReqCallEx(pVM, NULL, 0, VMREQFLAGS_NO_WAIT | VMREQFLAGS_VOID,
-                           (PFNRT)CSAMDelayedWriteHandler, 3, pVM, (RTGCPTR32)GCPtr, cbBuf);
+                           (PFNRT)CSAMDelayedWriteHandler, 3, pVM, (RTRCPTR)GCPtr, cbBuf);
     }
     AssertRC(rc);
@@ -1984 +1984 @@
  * @param   pPage       CSAM patch structure pointer
  */
-bool csamIsCodeScanned(PVM pVM, RTGCPTR32 pInstr, PCSAMPAGE *pPage)
+bool csamIsCodeScanned(PVM pVM, RTRCPTR pInstr, PCSAMPAGE *pPage)
 {
     PCSAMPAGEREC pPageRec;
@@ -2036 +2036 @@
  * @param   fScanned    Mark as scanned or not
  */
-static void csamMarkCode(PVM pVM, PCSAMPAGE pPage, RTGCPTR32 pInstr, uint32_t opsize, bool fScanned)
+static void csamMarkCode(PVM pVM, PCSAMPAGE pPage, RTRCPTR pInstr, uint32_t opsize, bool fScanned)
 {
     LogFlow(("csamMarkCodeAsScanned %VRv opsize=%d\n", pInstr, opsize));
@@ -2075 +2075 @@
  * @param   fScanned    Mark as scanned or not
  */
-CSAMR3DECL(int) CSAMR3MarkCode(PVM pVM, RTGCPTR32 pInstr, uint32_t opsize, bool fScanned)
+CSAMR3DECL(int) CSAMR3MarkCode(PVM pVM, RTRCPTR pInstr, uint32_t opsize, bool fScanned)
 {
     PCSAMPAGE pPage = 0;
@@ -2103 +2103 @@
  * @param   pInstrGC    Instruction pointer
  */
-CSAMR3DECL(int) CSAMR3CheckCodeEx(PVM pVM, RTSEL Sel, CPUMSELREGHID *pHiddenSel, RTGCPTR32 pInstrGC)
+CSAMR3DECL(int) CSAMR3CheckCodeEx(PVM pVM, RTSEL Sel, CPUMSELREGHID *pHiddenSel, RTRCPTR pInstrGC)
 {
     if (EMIsRawRing0Enabled(pVM) == false || PATMIsPatchGCAddr(pVM, pInstrGC) == true)
@@ -2137 +2137 @@
  * @param   pInstrGC    Instruction pointer (0:32 virtual address)
  */
-CSAMR3DECL(int) CSAMR3CheckCode(PVM pVM, RTGCPTR32 pInstrGC)
+CSAMR3DECL(int) CSAMR3CheckCode(PVM pVM, RTRCPTR pInstrGC)
 {
     int rc;
@@ -2179 +2179 @@
         int          rc;
         PCSAMPAGEREC pPageRec;
-        RTGCPTR32      GCPtr = pVM->csam.s.pvDirtyBasePage[i];
+        RTRCPTR      GCPtr = pVM->csam.s.pvDirtyBasePage[i];
 
         GCPtr = GCPtr & PAGE_BASE_GC_MASK;
@@ -2223 +2223 @@
     for (uint32_t i=0;i<pVM->csam.s.cPossibleCodePages;i++)
     {
-        RTGCPTR32      GCPtr = pVM->csam.s.pvPossibleCodePage[i];
+        RTRCPTR      GCPtr = pVM->csam.s.pvPossibleCodePage[i];
 
         GCPtr = GCPtr & PAGE_BASE_GC_MASK;
@@ -2262 +2262 @@
 {
     uint16_t    cbIDT;
-    RTGCPTR32     GCPtrIDT = CPUMGetGuestIDTR(pVM, &cbIDT);
+    RTRCPTR     GCPtrIDT = CPUMGetGuestIDTR(pVM, &cbIDT);
     uint32_t    iGateEnd;
     uint32_t    maxGates;
@@ -2295 +2295 @@
         for (unsigned i=0;i<RT_ELEMENTS(pVM->csam.s.pvCallInstruction);i++)
         {
-            RTGCPTR32 pHandler = pVM->csam.s.pvCallInstruction[i];
+            RTRCPTR pHandler = pVM->csam.s.pvCallInstruction[i];
 
             if (pHandler)
@@ -2365 +2365 @@
            )
         {
-            RTGCPTR32 pHandler;
+            RTRCPTR pHandler;
             CSAMP2GLOOKUPREC cacheRec = {0};            /* Cache record for PATMGCVirtToHCVirt. */
             PCSAMPAGE pPage = NULL;
@@ -2462 +2462 @@
                 Log(("Gate handler 0x%X is SAFE!\n", iGate));
 
-                RTGCPTR32 pNewHandlerGC = PATMR3QueryPatchGCPtr(pVM, pHandler);
+                RTRCPTR pNewHandlerGC = PATMR3QueryPatchGCPtr(pVM, pHandler);
                 if (pNewHandlerGC)
                 {
@@ -2483 +2483 @@
  * @param   GCPtrCall   Call address
  */
-CSAMR3DECL(int) CSAMR3RecordCallAddress(PVM pVM, RTGCPTR32 GCPtrCall)
+CSAMR3DECL(int) CSAMR3RecordCallAddress(PVM pVM, RTRCPTR GCPtrCall)
 {
     for (unsigned i=0;i<RT_ELEMENTS(pVM->csam.s.pvCallInstruction);i++)

trunk/src/VBox/VMM/PATM/CSAMInternal.h

@@ -68 +68 @@
 typedef struct
 {
-  RTGCPTR32         pInstrAfterRetGC[CSAM_MAX_CALLEXIT_RET];
+  RTRCPTR         pInstrAfterRetGC[CSAM_MAX_CALLEXIT_RET];
   uint32_t          cInstrAfterRet;
 } CSAMCALLEXITREC, *PCSAMCALLEXITREC;
@@ -84 +84 @@
 typedef struct
 {
-    RTGCPTR32       pPageGC;
+    RTRCPTR       pPageGC;
     RTGCPHYS        GCPhys;
     uint64_t        fFlags;
@@ -103 +103 @@
 {
     // GC Patch pointer
-    RTGCPTR32       pInstrGC;
+    RTRCPTR       pInstrGC;
 
     // Disassembly state for original instruction
@@ -155 +155 @@
      * switch back to ring 3 each time we encounter them in GC.
      */
-    RTGCPTR32           aDangerousInstr[CSAM_MAX_DANGR_INSTR];
+    RTRCPTR           aDangerousInstr[CSAM_MAX_DANGR_INSTR];
     uint32_t            cDangerousInstr;
     uint32_t            iDangerousInstr;
 
-    RCPTRTYPE(RTGCPTR32 *)  pPDBitmapGC;
+    RCPTRTYPE(RTRCPTR *)  pPDBitmapGC;
     RCPTRTYPE(RTHCPTR *)    pPDHCBitmapGC;
     R3PTRTYPE(uint8_t **)   pPDBitmapHC;
-    R3PTRTYPE(RTGCPTR32  *) pPDGCBitmapHC;
+    R3PTRTYPE(RTRCPTR  *) pPDGCBitmapHC;
 
     /* Temporary storage during load/save state */
@@ -179 +179 @@
     /* To keep track of possible code pages */
     uint32_t            cPossibleCodePages;
-    RTGCPTR32           pvPossibleCodePage[CSAM_MAX_CODE_PAGES_FLUSH];
+    RTRCPTR           pvPossibleCodePage[CSAM_MAX_CODE_PAGES_FLUSH];
 
     /* call addresses reported by the recompiler */
-    RTGCPTR32           pvCallInstruction[16];
+    RTRCPTR           pvCallInstruction[16];
     RTUINT              iCallInstruction;
 
@@ -252 +252 @@
  * @param   pBranchInstrGC  GC pointer of branch instruction
  */
-inline RTGCPTR32 CSAMResolveBranch(PDISCPUSTATE pCpu, RTGCPTR32 pBranchInstrGC)
+inline RTRCPTR CSAMResolveBranch(PDISCPUSTATE pCpu, RTRCPTR pBranchInstrGC)
 {
     uint32_t disp;
@@ -275 +275 @@
     }
 #ifdef IN_GC
-    return (RTGCPTR32)((uint8_t *)pBranchInstrGC + pCpu->opsize + disp);
+    return (RTRCPTR)((uint8_t *)pBranchInstrGC + pCpu->opsize + disp);
 #else
     return pBranchInstrGC + pCpu->opsize + disp;

trunk/src/VBox/VMM/PATM/PATMPatch.cpp

@@ -71 +71 @@
     Assert(uType == FIXUP_ABSOLUTE || ((uType == FIXUP_REL_JMPTOPATCH || uType == FIXUP_REL_JMPTOGUEST) && pSource && pDest));
 
-    LogFlow(("patmPatchAddReloc32 type=%d pRelocGC=%VGv source=%VGv dest=%VGv\n", uType, pRelocHC - pVM->patm.s.pPatchMemGC + pVM->patm.s.pPatchMemGC , pSource, pDest));
+    LogFlow(("patmPatchAddReloc32 type=%d pRelocGC=%VRv source=%VRv dest=%VRv\n", uType, pRelocHC - pVM->patm.s.pPatchMemGC + pVM->patm.s.pPatchMemGC , pSource, pDest));
 
     pRec = (PRELOCREC)MMR3HeapAllocZ(pVM, MM_TAG_PATM_PATCH, sizeof(*pRec));

trunk/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp

@@ -53 +53 @@
  * @param   pvFault     Fault address
  */
-CSAMDECL(int) CSAMExecFault(PVM pVM, RTGCPTR32 pvFault)
+CSAMDECL(int) CSAMExecFault(PVM pVM, RTRCPTR pvFault)
 {
     if(!CSAMIsEnabled(pVM))
@@ -80 +80 @@
  * @param   pPage       GC page address
  */
-CSAMDECL(bool) CSAMIsPageScanned(PVM pVM, RTGCPTR32 pPage)
+CSAMDECL(bool) CSAMIsPageScanned(PVM pVM, RTRCPTR pPage)
 {
     int pgdir, bit;
@@ -108 +108 @@
  *
  */
-CSAMDECL(int) CSAMMarkPage(PVM pVM, RTGCPTR32 pPage, bool fScanned)
+CSAMDECL(int) CSAMMarkPage(PVM pVM, RTRCPTR pPage, bool fScanned)
 {
     int pgdir, bit;
@@ -115 +115 @@
 #ifdef LOG_ENABLED
     if (fScanned && !CSAMIsPageScanned(pVM, pPage))
-       Log(("CSAMMarkPage %VGv\n", pPage));
+       Log(("CSAMMarkPage %VRv\n", pPage));
 #endif
 
@@ -141 +141 @@
         if (!pVM->csam.s.pPDHCBitmapGC[pgdir])
         {
-            Log(("MMHyperHC2GC failed for %VGv\n", pVM->csam.s.pPDBitmapGC[pgdir]));
+            Log(("MMHyperHC2GC failed for %VRv\n", pVM->csam.s.pPDBitmapGC[pgdir]));
             return rc;
         }
@@ -177 +177 @@
  * @param   GCPtr       GC pointer of page
  */
-CSAMDECL(bool) CSAMDoesPageNeedScanning(PVM pVM, RTGCPTR32 GCPtr)
+CSAMDECL(bool) CSAMDoesPageNeedScanning(PVM pVM, RTRCPTR GCPtr)
 {
     if(!CSAMIsEnabled(pVM))
@@ -200 +200 @@
  * @param   GCPtr       GC pointer of page
  */
-CSAMDECL(void) CSAMMarkPossibleCodePage(PVM pVM, RTGCPTR32 GCPtr)
+CSAMDECL(void) CSAMMarkPossibleCodePage(PVM pVM, RTRCPTR GCPtr)
 {
     if (pVM->csam.s.cPossibleCodePages < RT_ELEMENTS(pVM->csam.s.pvPossibleCodePage))
     {
-        pVM->csam.s.pvPossibleCodePage[pVM->csam.s.cPossibleCodePages++] = (RTGCPTR32)GCPtr;
+        pVM->csam.s.pvPossibleCodePage[pVM->csam.s.cPossibleCodePages++] = (RTRCPTR)GCPtr;
         VM_FF_SET(pVM, VM_FF_CSAM_PENDING_ACTION);
     }
@@ -247 +247 @@
  * @param   GCPtr       GC pointer of page table entry
  */
-CSAMDECL(bool) CSAMIsKnownDangerousInstr(PVM pVM, RTGCPTR32 GCPtr)
+CSAMDECL(bool) CSAMIsKnownDangerousInstr(PVM pVM, RTRCPTR GCPtr)
 {
     for (uint32_t i=0;i<pVM->csam.s.cDangerousInstr;i++)
     {
-        if (pVM->csam.s.aDangerousInstr[i] == (RTGCPTR32)GCPtr)
+        if (pVM->csam.s.aDangerousInstr[i] == (RTRCPTR)GCPtr)
         {
             STAM_COUNTER_INC(&pVM->csam.s.StatInstrCacheHit);
@@ -258 +258 @@
     }
     /* Record that we're about to process it in ring 3. */
-    pVM->csam.s.aDangerousInstr[pVM->csam.s.iDangerousInstr++] = (RTGCPTR32)GCPtr;
+    pVM->csam.s.aDangerousInstr[pVM->csam.s.iDangerousInstr++] = (RTRCPTR)GCPtr;
     pVM->csam.s.iDangerousInstr &= CSAM_MAX_DANGR_INSTR_MASK;
 

trunk/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp

@@ -60 +60 @@
     register uint32_t efl = pCtxCore->eflags.u32;
     CTXSUFF(pVM->patm.s.pGCState)->uVMFlags = efl & PATM_VIRTUAL_FLAGS_MASK;
-    AssertMsg((efl & X86_EFL_IF) || PATMShouldUseRawMode(pVM, (RTRCPTR)pCtxCore->eip), ("X86_EFL_IF is clear and PATM is disabled! (eip=%VGv eflags=%08x fPATM=%d pPATMGC=%VGv-%VGv\n", pCtxCore->eip, pCtxCore->eflags.u32, PATMIsEnabled(pVM), pVM->patm.s.pPatchMemGC, pVM->patm.s.pPatchMemGC + pVM->patm.s.cbPatchMem));
-
-    AssertReleaseMsg(CTXSUFF(pVM->patm.s.pGCState)->fPIF || fPatchCode, ("fPIF=%d eip=%VGv\n", CTXSUFF(pVM->patm.s.pGCState)->fPIF, pCtxCore->eip));
+    AssertMsg((efl & X86_EFL_IF) || PATMShouldUseRawMode(pVM, (RTRCPTR)pCtxCore->eip), ("X86_EFL_IF is clear and PATM is disabled! (eip=%VRv eflags=%08x fPATM=%d pPATMGC=%VGv-%VGv\n", pCtxCore->eip, pCtxCore->eflags.u32, PATMIsEnabled(pVM), pVM->patm.s.pPatchMemGC, pVM->patm.s.pPatchMemGC + pVM->patm.s.cbPatchMem));
+
+    AssertReleaseMsg(CTXSUFF(pVM->patm.s.pGCState)->fPIF || fPatchCode, ("fPIF=%d eip=%VRv\n", CTXSUFF(pVM->patm.s.pGCState)->fPIF, pCtxCore->eip));
 
     efl &= ~PATM_VIRTUAL_FLAGS_MASK;
@@ -86 +86 @@
             pVM->patm.s.pfnSysEnterGC = 0;
 
-            Log2(("PATMRawEnter: installing sysenter patch for %VGv\n", pCtx->SysEnter.eip));
+            Log2(("PATMRawEnter: installing sysenter patch for %VRv\n", pCtx->SysEnter.eip));
             pVM->patm.s.pfnSysEnterPatchGC = PATMR3QueryPatchGCPtr(pVM, pCtx->SysEnter.eip);
             if (pVM->patm.s.pfnSysEnterPatchGC == 0)
@@ -135 +135 @@
     CTXSUFF(pVM->patm.s.pGCState)->uVMFlags = X86_EFL_IF;
 
-    AssertReleaseMsg((efl & X86_EFL_IF) || fPatchCode || rawRC == VINF_PATM_PENDING_IRQ_AFTER_IRET || VBOX_FAILURE(rawRC), ("Inconsistent state at %VGv rc=%Vrc\n", pCtxCore->eip, rawRC));
-    AssertReleaseMsg(CTXSUFF(pVM->patm.s.pGCState)->fPIF || fPatchCode || VBOX_FAILURE(rawRC), ("fPIF=%d eip=%VGv rc=%Vrc\n", CTXSUFF(pVM->patm.s.pGCState)->fPIF, pCtxCore->eip, rawRC));
+    AssertReleaseMsg((efl & X86_EFL_IF) || fPatchCode || rawRC == VINF_PATM_PENDING_IRQ_AFTER_IRET || VBOX_FAILURE(rawRC), ("Inconsistent state at %VRv rc=%Vrc\n", pCtxCore->eip, rawRC));
+    AssertReleaseMsg(CTXSUFF(pVM->patm.s.pGCState)->fPIF || fPatchCode || VBOX_FAILURE(rawRC), ("fPIF=%d eip=%VRv rc=%Vrc\n", CTXSUFF(pVM->patm.s.pGCState)->fPIF, pCtxCore->eip, rawRC));
 
 #ifdef IN_RING3
@@ -165 +165 @@
                 {
                     Assert(!PATMFindActivePatchByEntrypoint(pVM, pOrgInstrGC));
-                    Log(("Switchback from %VGv to %VGv (Psp=%x)\n", pCtxCore->eip, pOrgInstrGC, CTXSUFF(pVM->patm.s.pGCState)->Psp));
+                    Log(("Switchback from %VRv to %VRv (Psp=%x)\n", pCtxCore->eip, pOrgInstrGC, CTXSUFF(pVM->patm.s.pGCState)->Psp));
                     STAM_COUNTER_INC(&pVM->patm.s.StatSwitchBack);
                     pCtxCore->eip = pOrgInstrGC;
@@ -174 +174 @@
                 else
                 {
-                    LogFlow(("Patch address %VGv can't be interrupted (state=%d)!\n",  pCtxCore->eip, enmState));
+                    LogFlow(("Patch address %VRv can't be interrupted (state=%d)!\n",  pCtxCore->eip, enmState));
                     STAM_COUNTER_INC(&pVM->patm.s.StatSwitchBackFail);
                 }
@@ -180 +180 @@
             else
             {
-                LogFlow(("Patch address %VGv can't be interrupted (fPIF=%d)!\n",  pCtxCore->eip, CTXSUFF(pVM->patm.s.pGCState)->fPIF));
+                LogFlow(("Patch address %VRv can't be interrupted (fPIF=%d)!\n",  pCtxCore->eip, CTXSUFF(pVM->patm.s.pGCState)->fPIF));
                 STAM_COUNTER_INC(&pVM->patm.s.StatSwitchBackFail);
             }
@@ -405 +405 @@
             goto end;
 
-        Log2(("PATMSysCall: sysenter from %VGv to %VGv\n", pRegFrame->eip, pVM->patm.s.pfnSysEnterPatchGC));
+        Log2(("PATMSysCall: sysenter from %VRv to %VRv\n", pRegFrame->eip, pVM->patm.s.pfnSysEnterPatchGC));
         /** @todo the base and limit are forced to 0 & 4G-1 resp. We assume the selector is wide open here. */
         /** @note The Intel manual suggests that the OS is responsible for this. */
@@ -431 +431 @@
             goto end;
 
-        Log2(("PATMSysCall: sysexit from %VGv to %VGv\n", pRegFrame->eip, pRegFrame->edx));
+        Log2(("PATMSysCall: sysexit from %VRv to %VRv\n", pRegFrame->eip, pRegFrame->edx));
 
         pRegFrame->cs          = ((pCtx->SysEnter.cs + 16) & ~X86_SEL_RPL) | 3;
@@ -466 +466 @@
  * @param   pRelBranchPatch     Relative duplicated function address
  */
-PATMDECL(int) PATMAddBranchToLookupCache(PVM pVM, RTRCPTR pJumpTableGC, RTRCPTR pBranchTarget, RTGCUINTPTR pRelBranchPatch)
+PATMDECL(int) PATMAddBranchToLookupCache(PVM pVM, RTRCPTR pJumpTableGC, RTRCPTR pBranchTarget, RTRCUINTPTR pRelBranchPatch)
 {
     PPATCHJUMPTABLE pJumpTable;
 
-    Log(("PATMAddBranchToLookupCache: Adding (%VGv->%VGv (%VGv)) to table %VGv\n", pBranchTarget, pRelBranchPatch + pVM->patm.s.pPatchMemGC, pRelBranchPatch, pJumpTableGC));
+    Log(("PATMAddBranchToLookupCache: Adding (%VRv->%VRv (%VRv)) to table %VRv\n", pBranchTarget, pRelBranchPatch + pVM->patm.s.pPatchMemGC, pRelBranchPatch, pJumpTableGC));
 
     AssertReturn(PATMIsPatchGCAddr(pVM, pJumpTableGC), VERR_INVALID_PARAMETER);
@@ -523 +523 @@
 
 
+#if defined(VBOX_WITH_STATISTICS) || defined(LOG_ENABLED)
 /**
  * Return the name of the patched instruction
@@ -660 +661 @@
     return pszInstr;
 }
+#endif

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

@@ -601 +601 @@
                 PGMGstGetPage(pVM, pvFault, &fPageGst, &GCPhys);
                 Log(("Page out of sync: %VGv eip=%08x PdeSrc.n.u1User=%d fPageGst=%08llx GCPhys=%VGp scan=%d\n",
-                     pvFault, pRegFrame->eip, PdeSrc.n.u1User, fPageGst, GCPhys, CSAMDoesPageNeedScanning(pVM, (RTGCPTR)pRegFrame->eip)));
+                     pvFault, pRegFrame->eip, PdeSrc.n.u1User, fPageGst, GCPhys, CSAMDoesPageNeedScanning(pVM, (RTRCPTR)pRegFrame->eip)));
 #  endif /* LOG_ENABLED */
 
@@ -617 +617 @@
 #   ifdef CSAM_DETECT_NEW_CODE_PAGES
                             ||  (   !PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip)
-                                 && CSAMDoesPageNeedScanning(pVM, (RTGCPTR)pRegFrame->eip))   /* any new code we encounter here */
+                                 && CSAMDoesPageNeedScanning(pVM, (RTRCPTR)pRegFrame->eip))   /* any new code we encounter here */
 #   endif /* CSAM_DETECT_NEW_CODE_PAGES */
                            )
                         {
                             LogFlow(("CSAMExecFault %VGv\n", pRegFrame->eip));
-                            rc = CSAMExecFault(pVM, (RTGCPTR)pRegFrame->eip);
+                            rc = CSAMExecFault(pVM, (RTRCPTR)pRegFrame->eip);
                             if (rc != VINF_SUCCESS)
                             {
@@ -678 +678 @@
                         /** @todo not correct for pages that contain both code and data!! */
                         Log2(("CSAMMarkPage %VGv; scanned=%d\n", pvFault, true));
-                        CSAMMarkPage(pVM, pvFault, true);
+                        CSAMMarkPage(pVM, (RTRCPTR)pvFault, true);
                     }
                 }
@@ -1531 +1531 @@
                                 if (    ((PdeSrc.u & PteSrc.u) & (X86_PTE_RW | X86_PTE_US))
                                     ||  iPTDst == ((GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK)   /* always sync GCPtrPage */
-                                    ||  !CSAMDoesPageNeedScanning(pVM, (RTGCPTR)GCPtrCurPage)
+                                    ||  !CSAMDoesPageNeedScanning(pVM, (RTRCPTR)GCPtrCurPage)
                                     ||  (   (pPage = pgmPhysGetPage(&pVM->pgm.s, PteSrc.u & GST_PTE_PG_MASK))
                                          && PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
@@ -2279 +2279 @@
                         PPGMPAGE pPage;
                         if (    ((PdeSrc.u & pPTSrc->a[iPTSrc].u) & (X86_PTE_RW | X86_PTE_US))
-                            ||  !CSAMDoesPageNeedScanning(pVM, (RTGCPTR)((iPDSrc << GST_PD_SHIFT) | (iPTSrc << PAGE_SHIFT)))
+                            ||  !CSAMDoesPageNeedScanning(pVM, (RTRCPTR)((iPDSrc << GST_PD_SHIFT) | (iPTSrc << PAGE_SHIFT)))
                             ||  (   (pPage = pgmPhysGetPage(&pVM->pgm.s, PteSrc.u & GST_PTE_PG_MASK))
                                  &&  PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
@@ -2395 +2395 @@
                          */
                         else if (    !PdeSrc.n.u1User
-                                 &&  CSAMDoesPageNeedScanning(pVM, (RTGCPTR)(GCPtr | (iPTDst << SHW_PT_SHIFT))))
+                                 &&  CSAMDoesPageNeedScanning(pVM, (RTRCPTR)(GCPtr | (iPTDst << SHW_PT_SHIFT))))
                             PteDst.u = 0;
 # endif
@@ -2614 +2614 @@
         /** @todo not correct for pages that contain both code and data!! */
         Log(("CSAMMarkPage %VGv; scanned=%d\n", GCPtrPage, true));
-        CSAMMarkPage(pVM, (RTGCPTR)GCPtrPage, true);
+        CSAMMarkPage(pVM, (RTRCPTR)GCPtrPage, true);
     }
 # endif

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -617 +617 @@
             /* We can safely emulate control/debug register move instructions in patched code. */
             if (    !PATMIsPatchGCAddr(pVM, (RTRCPTR)PC)
-                &&  !CSAMIsKnownDangerousInstr(pVM, PC))
+                &&  !CSAMIsKnownDangerousInstr(pVM, (RTRCPTR)PC))
                 break;
         case OP_INVLPG: