Changeset 9341 in vbox

Timestamp:

Jun 3, 2008 8:22:06 AM (17 years ago)

Author:

vboxsync

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

31556

Message:

Format specifiers again...

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (2 diffs)
• PATM/PATMPatch.cpp (modified) (1 diff)
• VMMAll/PGMAllBth.h (modified) (3 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (2 diffs)
• VMMAll/PGMAllPool.cpp (modified) (1 diff)
• VMMAll/TRPMAll.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -1152 +1152 @@
     if (PATMIsPatchGCAddr(pVM, pCtx->eip))
     {
-        Log(("emR3RawExecuteInstruction: In patch block. eip=%VGv\n", pCtx->eip));
+        Log(("emR3RawExecuteInstruction: In patch block. eip=%VRv\n", pCtx->eip));
 
         RTGCPTR pNewEip;
@@ -2546 +2546 @@
             default:
                 if (PATMIsPatchGCAddr(pVM, pCtx->eip) && !(pCtx->eflags.u32 & X86_EFL_TF))
-                    LogIt(NULL, 0, LOG_GROUP_PATM, ("Patch code interrupted at %VGv for reason %Vrc\n", CPUMGetGuestEIP(pVM), rc));
+                    LogIt(NULL, 0, LOG_GROUP_PATM, ("Patch code interrupted at %VRv for reason %Vrc\n", (RTRCPTR)CPUMGetGuestEIP(pVM), rc));
                 break;
         }

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

@@ -935 +935 @@
     PATCHGEN_EPILOG(pPatch, size);
 
-    Log(("pfnHelperCallGC %VGv\n", pVM->patm.s.pfnHelperCallGC));
-    Log(("pfnHelperRetGC  %VGv\n", pVM->patm.s.pfnHelperRetGC));
-    Log(("pfnHelperJumpGC %VGv\n", pVM->patm.s.pfnHelperJumpGC));
-    Log(("pfnHelperIretGC  %VGv\n", pVM->patm.s.pfnHelperIretGC));
+    Log(("pfnHelperCallGC %VRv\n", pVM->patm.s.pfnHelperCallGC));
+    Log(("pfnHelperRetGC  %VRv\n", pVM->patm.s.pfnHelperRetGC));
+    Log(("pfnHelperJumpGC %VRv\n", pVM->patm.s.pfnHelperJumpGC));
+    Log(("pfnHelperIretGC %VRv\n", pVM->patm.s.pfnHelperIretGC));
 
     return VINF_SUCCESS;

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

@@ -600 +600 @@
                 uint64_t   fPageGst;
                 PGMGstGetPage(pVM, pvFault, &fPageGst, &GCPhys);
-                Log(("Page out of sync: %p eip=%08x PdeSrc.n.u1User=%d fPageGst=%08llx GCPhys=%VGp scan=%d\n",
+                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)));
 #  endif /* LOG_ENABLED */
@@ -677 +677 @@
                          */
                         /** @todo not correct for pages that contain both code and data!! */
-                        Log2(("CSAMMarkPage %p; scanned=%d\n", pvFault, true));
+                        Log2(("CSAMMarkPage %VGv; scanned=%d\n", pvFault, true));
                         CSAMMarkPage(pVM, pvFault, true);
                     }
@@ -775 +775 @@
                          */
                         AssertMsg((fPageShw & ~(X86_PTE_A | X86_PTE_D | X86_PTE_AVL_MASK)) == (fPageGst & ~(X86_PTE_A | X86_PTE_D | X86_PTE_AVL_MASK)),
-                                  ("Page flags mismatch! pvFault=%p GCPhys=%VGp fPageShw=%08llx fPageGst=%08llx\n", pvFault, GCPhys, fPageShw, fPageGst));
+                                  ("Page flags mismatch! pvFault=%VGv GCPhys=%VGp fPageShw=%08llx fPageGst=%08llx\n", pvFault, GCPhys, fPageShw, fPageGst));
                     }
                     else

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

@@ -2263 +2263 @@
             {
                 case VINF_SUCCESS:
-Log(("PGMPhysInterpretedRead: pvDst=%p pvSrc=%p cb=%d\n", pvDst, (uint8_t *)pvSrc + (GCPtrSrc & PAGE_OFFSET_MASK), cb));
+                    Log(("PGMPhysInterpretedRead: pvDst=%p pvSrc=%p cb=%d\n", pvDst, (uint8_t *)pvSrc + (GCPtrSrc & PAGE_OFFSET_MASK), cb));
                     memcpy(pvDst, (uint8_t *)pvSrc + (GCPtrSrc & PAGE_OFFSET_MASK), cb);
                     break;
@@ -2299 +2299 @@
         {
             /** @todo we should check reserved bits ... */
-AssertMsgFailed(("cb=%d cb1=%d cb2=%d GCPtrSrc=%VGv\n", cb, cb1, cb2, GCPtrSrc));
+            AssertMsgFailed(("cb=%d cb1=%d cb2=%d GCPtrSrc=%VGv\n", cb, cb1, cb2, GCPtrSrc));
             void *pvSrc1;
             rc = PGM_GCPHYS_2_PTR(pVM, GCPhys1, &pvSrc1);

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

@@ -759 +759 @@
     PPGMPOOL        pPool = pVM->pgm.s.CTXSUFF(pPool);
     PPGMPOOLPAGE    pPage = (PPGMPOOLPAGE)pvUser;
-    LogFlow(("pgmPoolAccessHandler: pvFault=%p pPage=%p:{.idx=%d} GCPhysFault=%VGp\n", pvFault, pPage, pPage->idx, GCPhysFault));
+    LogFlow(("pgmPoolAccessHandler: pvFault=%VGv pPage=%p:{.idx=%d} GCPhysFault=%VGp\n", pvFault, pPage, pPage->idx, GCPhysFault));
 
     /*

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

@@ -371 +371 @@
         Log(("TRPMForwardTrap-VM: eip=%04X:%04X iGate=%d\n", pRegFrame->cs, pRegFrame->eip, iGate));
     else
-        Log(("TRPMForwardTrap: eip=%04X:%VGv iGate=%d\n", pRegFrame->cs, pRegFrame->eip, iGate));
+        Log(("TRPMForwardTrap: eip=%04X:%VRv iGate=%d\n", pRegFrame->cs, pRegFrame->eip, iGate));
 
     switch (iGate) {
@@ -558 +558 @@
                        )
                     {
-                        Log(("Invalid ring 0 stack %04X:%VGv\n", ss_r0, esp_r0));
+                        Log(("Invalid ring 0 stack %04X:%VRv\n", ss_r0, esp_r0));
                         goto failure;
                     }
@@ -571 +571 @@
                         ||  SELMToFlatEx(pVM, fakeflags, ss_r0, (RTGCPTR)esp_r0, NULL, SELMTOFLAT_FLAGS_CPL1, (PRTGCPTR)&pTrapStackGC, NULL) != VINF_SUCCESS)
                     {
-                        AssertMsgFailed(("Invalid stack %04X:%VGv??? (VM=%d)\n", ss_r0, esp_r0, eflags.Bits.u1VM));
+                        AssertMsgFailed(("Invalid stack %04X:%VRv??? (VM=%d)\n", ss_r0, esp_r0, eflags.Bits.u1VM));
                         goto failure;
                     }
@@ -659 +659 @@
 #ifdef DEBUG
                     for (int j=idx;j<0;j++)
-                        Log4(("Stack %VGv pos %02d: %08x\n", &pTrapStack[j], j, pTrapStack[j]));
+                        Log4(("Stack %VRv pos %02d: %08x\n", &pTrapStack[j], j, pTrapStack[j]));
 
                     Log4(("eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n"
@@ -670 +670 @@
 #endif
 
-                    Log(("PATM Handler %VGv Adjusted stack %08X new EFLAGS=%08X idx=%d dpl=%d cpl=%d\n", pVM->trpm.s.aGuestTrapHandler[iGate], esp_r0, eflags.u32, idx, dpl, cpl));
+                    Log(("PATM Handler %VRv Adjusted stack %08X new EFLAGS=%08X idx=%d dpl=%d cpl=%d\n", pVM->trpm.s.aGuestTrapHandler[iGate], esp_r0, eflags.u32, idx, dpl, cpl));
 
                     /* Make sure the internal guest context structure is up-to-date. */