Changeset 13838

Timestamp:

11/05/08 04:16:55 (2 months ago)

Author:

vboxsync

Message:

Some more %V* -> %R* changes while at it.

Files:

• trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp (modified) (1 diff)
• trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.cpp (modified) (3 diffs)
• trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp (modified) (2 diffs)
• trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (2 diffs)
• trunk/src/VBox/HostDrivers/Support/testcase/tstLow.cpp (modified) (4 diffs)
• trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp (modified) (1 diff)
• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (9 diffs)
• trunk/src/VBox/Main/ConsoleVRDPServer.cpp (modified) (2 diffs)
• trunk/src/VBox/Main/HardDisk2Impl.cpp (modified) (6 diffs)
• trunk/src/VBox/Main/HostImpl.cpp (modified) (5 diffs)
• trunk/src/VBox/Main/MachineImpl.cpp (modified) (11 diffs)
• trunk/src/VBox/Main/MediumImpl.cpp (modified) (2 diffs)
• trunk/src/VBox/Main/VirtualBoxImpl.cpp (modified) (20 diffs)
• trunk/src/recompiler/VBoxRecompiler.c (modified) (40 diffs)
• trunk/src/recompiler_new/VBoxRecompiler.c (modified) (40 diffs)

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp

@@ -494 +494 @@
-                rc = VERR_NO_MEMORY;
-                ExFreePool(pvBalloon);
-VGv
+p
-                goto end;
-            }

trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.cpp

@@ -242 +242 @@
-    void *pvRemote = NULL;
-
-V
+R
-    PVMREQ pReq;
-    vrc = VMR3ReqCall (mpVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
@@ -255 +255 @@
-    else
-    {
-V
+R
-        &Uuid, vrc));
-        AssertRC (vrc);
@@ -301 +301 @@
-
-            RTUUID Uuid = aDevice->id();
-V
+R
-            PVMREQ pReq;
-            vrc = VMR3ReqCall (mpVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)pRhConfig->pfnDestroyProxyDevice,

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -709 +709 @@
-            rc = RTStrToInt32Ex(argv[curArg], NULL, 0, &g_aNetDevs[i].fd);
-            if (RT_FAILURE(rc))
-VR
+Rr
-            g_aNetDevs[i].fHaveFd = true;
-        }
@@ -722 +722 @@
-                rc = RTStrToInt32Ex(argv[curArg], NULL, 0, &portVRDP);
-                if (RT_FAILURE(rc))
-VR
+Rr
-                if (portVRDP < 0 || portVRDP >= 0x10000)
-                    return SyntaxError("vrdp port number is out of range: %RI32\n", portVRDP);

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -2813 +2813 @@
-                machine->COMGETTER(Name)(name.asOutParam());
-                machine->COMGETTER(Id)(uuid.asOutParam());
-V
+R
-                         j == 0 ? "Usage:        " : "              ",
-                         name.raw(), &machineIds[j]);
@@ -6503 +6503 @@
-                machine->COMGETTER(Name)(name.asOutParam());
-                machine->COMGETTER(Id)(uuid.asOutParam());
-V
+R
-                         j == 0 ? "In use by VMs:        " : "                      ",
-                         name.raw(), &machineIds[j]);

trunk/src/VBox/HostDrivers/Support/testcase/tstLow.cpp

@@ -65 +65 @@
-            for (unsigned iPage = 0; iPage < RT_ELEMENTS(aPages0); iPage++)
-            {
-V
+R
-                if (aPages0[iPage].uReserved != 0)
-                {
@@ -75 +75 @@
-                {
-                    rcRet++;
-V
+R
-                }
-            }
@@ -113 +113 @@
-                for (unsigned iPage = 0; iPage < cPages; iPage++)
-                {
-V
+R
-                    if (aPages1[iPage].uReserved != 0)
-                    {
@@ -123 +123 @@
-                    {
-                        rcRet++;
-V
+R
-                    }
-                }

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -1524 +1524 @@
-    {
-        Log(("RTFileSetTimes failed with %Rrc\n", rc));
-V
-V
-V
-V
+R
+R
+R
+R
-        /* temporary hack */
-        rc = VINF_SUCCESS;

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2080 +2080 @@
-    if (!device)
-        return setError (E_INVALIDARG,
-V
+R
-            Guid (aId).raw());
-
@@ -2111 +2111 @@
-#else   /* !VBOX_WITH_USB */
-    return setError (E_INVALIDARG,
-V
+R
-        Guid (aId).raw());
-#endif  /* !VBOX_WITH_USB */
@@ -3529 +3529 @@
-#ifdef VBOX_WITH_USB
-    Guid Uuid (aId);
-V
+R
-
-    AutoCaller autoCaller (this);
@@ -3541 +3541 @@
-    while (it != mUSBDevices.end())
-    {
-V
+R
-        if ((*it)->id() == Uuid)
-        {
@@ -5513 +5513 @@
-    CheckComRCReturnRC (autoVMCaller.rc());
-
-V
+R
-                      Address.raw(), Uuid.ptr()));
-
@@ -5534 +5534 @@
-    if (VBOX_FAILURE (vrc))
-    {
-V
+R
-                             Address.raw(), Uuid.ptr(), vrc));
-
@@ -5603 +5603 @@
-        AutoWriteLock alock (that);
-        that->mUSBDevices.push_back (device);
-V
+R
-
-        /* notify callbacks */
@@ -5638 +5638 @@
-    AssertReturn (PDMR3USBHasHub (mpVM), E_FAIL);
-
-V
+R
-                      (*aIt)->id().raw()));
-
@@ -5700 +5700 @@
-        /* Remove the device from the collection */
-        that->mUSBDevices.erase (*aIt);
-V
+R
-
-        /* notify callbacks */

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -1325 +1325 @@
-    memcpy (rawuuid, ((Guid &)uuid).ptr (), sizeof (rawuuid));
-
-V
+R
-             rawuuid, guestJudgement, pszUser, pszPassword, pszDomain, u32ClientId));
-
@@ -1433 +1433 @@
-    memcpy (rawuuid, ((Guid &)uuid).ptr (), sizeof (rawuuid));
-
-V
+R
-             rawuuid, u32ClientId));
-

trunk/src/VBox/Main/HardDisk2Impl.cpp

@@ -631 +631 @@
-    }
-
-V
+R
-                      m.location.raw(), mm.format.raw(), m.id.raw()));
-    LogFlowThisFunc (("m.locationFull='%ls'\n", m.locationFull.raw()));
@@ -1828 +1828 @@
-                return setError (E_FAIL,
-                    tr ("Hard disk '%ls' is attached to a virtual machine "
-V
+R
-                        "based on it may be created until it is detached"),
-                    m.location.raw(), it->machineId.raw());
@@ -2197 +2197 @@
-
-            /// @todo NEWMEDIA use the default extension for the given VD backend
-V
+R
-        }
-        else
@@ -2369 +2369 @@
-                {
-                    lastAccessError = Utf8StrFmt (
-V
-V
+R
+R
-                            "media registry ('%ls')"),
-                        &uuid, m.locationFull.raw(), m.id.raw(),
@@ -2405 +2405 @@
-                    {
-                        lastAccessError = Utf8StrFmt (
-V
+R
-                                "hard disk '%ls' is not found in the media "
-                                "registry ('%ls')"),
@@ -2441 +2441 @@
-                    {
-                        lastAccessError = Utf8StrFmt (
-V
-V
+R
+R
-                                "hard disk stored in the media registry ('%ls')"),
-                            &uuid, m.locationFull.raw(),

trunk/src/VBox/Main/HostImpl.cpp

@@ -1367 +1367 @@
-        if (FAILED (coll->FindById (aId, iface.asOutParam())))
-            return setError (E_FAIL,
-V
+R
-                Guid (aId).raw());
-
@@ -2662 +2662 @@
-
-        aGUID = Guid (Utf8Str (pCfgGuidString + 1));
-V
+R
-        Assert (!aGUID.isEmpty());
-    }
@@ -2677 +2677 @@
-{
-    LogFlowFuncEnter();
-V
+R
-
-    AssertReturn (aClient, VERR_INVALID_POINTER);
@@ -2942 +2942 @@
-                        if (RT_FAILURE (vrc)) break;
-
-V
+R
-
-                        /* initialize the object returned to the caller by
@@ -2977 +2977 @@
-        {
-            LogFlowFunc (("RemoveHostNetworkInterface:\n"));
-V
+R
-
-            /* write message and parameters */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -577 +577 @@
-        /* fetch the current error info */
-        mData->mAccessError = com::ErrorInfo();
-V
+R
-                     mData->mUuid.raw(),
-                     mData->mAccessError.getText().raw()));
@@ -1321 +1321 @@
-            /* the default snapshots folder is {UUID}, for backwards
-             * compatibility and to resolve conflicts */
-V
+R
-        }
-    }
@@ -4675 +4675 @@
-            {
-                throw setError (E_FAIL,
-V
+R
-                        "UUID {%s} in the registry file '%ls'"),
-                    id.raw(), mData->mConfigFileFull.raw(),
@@ -5296 +5296 @@
-            if (mType == IsSnapshotMachine)
-                return setError (E_FAIL,
-V
-V
+R
+R
-                        "of the virtual machine '%ls' ('%ls')"),
-                    hd->locationFull().raw(), uuid.raw(),
@@ -5304 +5304 @@
-
-            return setError (E_FAIL,
-V
+R
-                    "directly attached to the virtual machine '%ls' ('%ls')"),
-                hd->locationFull().raw(), uuid.raw(),
@@ -5312 +5312 @@
-        if (mType != IsSnapshotMachine && hd->children().size() != 0)
-            return setError (E_FAIL,
-V
+R
-                    "attached to the virtual machine '%ls' ('%ls') "
-                    "because it has %d differencing child hard disks"),
@@ -5325 +5325 @@
-        {
-            return setError (E_FAIL,
-V
+R
-                    "to the virtual machine '%ls' ('%ls')"),
-                hd->locationFull().raw(), uuid.raw(),
@@ -7673 +7673 @@
-                     E_FAIL);
-#elif defined(RT_OS_OS2)
-V
+R
-                                 aMachine->mData->mUuid.raw());
-    mIPCSemName = ipcSem;
@@ -8284 +8284 @@
-    if (mData->mMachineState == MachineState_Paused)
-    {
-V
+R
-                                    mUserData->mSnapshotFolderFull.raw(),
-                                    RTPATH_DELIMITER, mData->mUuid.raw());
@@ -8435 +8435 @@
-    /* stateFilePath is null when the machine is not online nor saved */
-    if (takingSnapshotOnline || mData->mMachineState == MachineState_Saved)
-V
+R
-                                    mUserData->mSnapshotFolderFull.raw(),
-                                    RTPATH_DELIMITER,
@@ -10024 +10024 @@
-                Utf8Str snapStateFilePath = curSnapshot->stateFilePath();
-
-V
+R
-                    mUserData->mSnapshotFolderFull.raw(),
-                    RTPATH_DELIMITER, mData->mUuid.raw());

trunk/src/VBox/Main/MediumImpl.cpp

@@ -942 +942 @@
-                                        const Guid &aId)
-{
-V
+R
-
-    AssertReturn (aVirtualBox, E_INVALIDARG);
@@ -1031 +1031 @@
-    }
-
-V
+R
-                      m.location.raw(), m.id.raw()));
-    LogFlowThisFunc (("m.locationFull='%ls'\n", m.locationFull.raw()));

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -2070 +2070 @@
-        id.create();
-        SVCHlpClient client;
-V
+R
-                                         id.raw()));
-        if (RT_FAILURE (vrc))
@@ -2242 +2242 @@
-        {
-            case DataChanged:
-V
+R
-                aCallback->OnMachineDataChange (id);
-                break;
-
-            case StateChanged:
-V
+R
-                          id.ptr(), state));
-                aCallback->OnMachineStateChange (id, state);
@@ -2253 +2253 @@
-
-            case Registered:
-V
+R
-                          id.ptr(), registered));
-                aCallback->OnMachineRegistered (id, registered);
@@ -2333 +2333 @@
-    void handleCallback (const ComPtr <IVirtualBoxCallback> &aCallback)
-    {
-V
+R
-                  machineId.ptr(), key.raw(), val.raw()));
-        aCallback->OnExtraDataChange (machineId, key, val);
@@ -2367 +2367 @@
-    void handleCallback (const ComPtr <IVirtualBoxCallback> &aCallback)
-    {
-V
+R
-                  machineId.ptr(), sessionState));
-        aCallback->OnSessionStateChange (machineId, sessionState);
@@ -2401 +2401 @@
-        {
-            case Taken:
-Vuuid}, snapshotId={%V
+Ruuid}, snapshotId={%R
-                          machineId.ptr(), snapshotId.ptr()));
-                aCallback->OnSnapshotTaken (machineId, snapshotId);
@@ -2407 +2407 @@
-
-            case Discarded:
-Vuuid}, snapshotId={%V
+Ruuid}, snapshotId={%R
-                          machineId.ptr(), snapshotId.ptr()));
-                aCallback->OnSnapshotDiscarded (machineId, snapshotId);
@@ -2413 +2413 @@
-
-            case Changed:
-Vuuid}, snapshotId={%V
+Ruuid}, snapshotId={%R
-                          machineId.ptr(), snapshotId.ptr()));
-                aCallback->OnSnapshotChange (machineId, snapshotId);
@@ -2461 +2461 @@
-    void handleCallback (const ComPtr <IVirtualBoxCallback> &aCallback)
-    {
-V
+R
-                  machineId.ptr(), name.raw(), value.raw(), flags.raw()));
-        aCallback->OnGuestPropertyChange (machineId, name, value, flags);
@@ -2588 +2588 @@
-    {
-        setError (E_INVALIDARG,
-V
+R
-            aId.raw());
-    }
@@ -2659 +2659 @@
-    {
-        if (aId)
-V
+R
-                              "in the media registry ('%ls')"),
-                      aId->raw(), mData.mCfgFile.mName.raw());
@@ -2730 +2730 @@
-    {
-        if (aId)
-V
+R
-                              "in the media registry ('%ls')"),
-                      aId->raw(), mData.mCfgFile.mName.raw());
@@ -2802 +2802 @@
-    {
-        if (aId)
-V
+R
-                              "in the media registry ('%ls')"),
-                      aId->raw(), mData.mCfgFile.mName.raw());
@@ -2908 +2908 @@
-            AutoReadLock mediaLock (hardDisk);
-            aConflict = Utf8StrFmt (
-V
+R
-                hardDisk->locationFull().raw(), hardDisk->id().raw());
-            return S_OK;
@@ -2922 +2922 @@
-            AutoReadLock mediaLock (image);
-            aConflict = Utf8StrFmt (
-V
+R
-                image->locationFull().raw(), image->id().raw());
-            return S_OK;
@@ -2936 +2936 @@
-            AutoReadLock mediaLock (image);
-            aConflict = Utf8StrFmt (
-V
+R
-                image->locationFull().raw(), image->id().raw());
-            return S_OK;
@@ -3243 +3243 @@
-
-            return setError (E_INVALIDARG,
-V
+R
-                aMachine->id().raw(), m->settingsFileFull().raw());
-        }
@@ -3306 +3306 @@
-    {
-        return setError (E_INVALIDARG,
-V
+R
-                "because a %s already exists in the media registry ('%ls')"),
-            aHardDisk->locationFull().raw(), aHardDisk->id().raw(),
@@ -3421 +3421 @@
-    {
-        return setError (E_INVALIDARG,
-V
+R
-                "because a %s already exists in the media registry ('%ls')"),
-            aImage->locationFull().raw(), aImage->id().raw(),
@@ -3522 +3522 @@
-    {
-        return setError (E_INVALIDARG,
-V
+R
-                "because a %s already exists in the media registry ('%ls')"),
-            aImage->locationFull().raw(), aImage->id().raw(),

trunk/src/recompiler/VBoxRecompiler.c

@@ -691 +691 @@
-    if (!cpu_breakpoint_insert(&pVM->rem.s.Env, Address))
-    {
-V
+R
-        return VINF_SUCCESS;
-    }
-V
+R
-    return VERR_REM_NO_MORE_BP_SLOTS;
-}
@@ -712 +712 @@
-    if (!cpu_breakpoint_remove(&pVM->rem.s.Env, Address))
-    {
-V
+R
-        return VINF_SUCCESS;
-    }
-V
+R
-    return VERR_REM_BP_NOT_FOUND;
-}
@@ -801 +801 @@
-                        break;
-                    }
-V
+R
-                break;
-            }
@@ -967 +967 @@
-    }
-
-V
-
+R
+(RTGCPTR)
-    return rc;
-}
@@ -987 +987 @@
-REMR3DECL(int) REMR3Run(PVM pVM)
-{
-VGv)\n", pVM->rem.s.Env.segs[R_CS].selector, 
+RGv)\n", pVM->rem.s.Env.segs[R_CS].selector, (RTGCPTR)
-    Assert(pVM->rem.s.fInREM);
-
@@ -1055 +1055 @@
-                    break;
-                }
-V
+R
-#endif
-            break;
@@ -1105 +1105 @@
-    }
-
-VGv)\n", rc, pVM->rem.s.Env.segs[R_CS].selector, 
+RGv)\n", rc, pVM->rem.s.Env.segs[R_CS].selector, (RTGCPTR)
-    return rc;
-}
@@ -1373 +1373 @@
-    if (pVM->rem.s.fIgnoreInvlPg || pVM->rem.s.fIgnoreAll)
-        return;
-V
+R
-    Assert(pVM->rem.s.fInREM || pVM->rem.s.fInStateSync);
-
@@ -1392 +1392 @@
-    if (RT_FAILURE(rc))
-    {
-V
+R
-        VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
-    }
@@ -1576 +1576 @@
-    }
-#endif
-VGv eip=%VGv cr2=%VGv\n", uTrap, uErrorCode, pvNextEIP, env->eip, 
+RGv eip=%RGv cr2=%RGv\n", uTrap, uErrorCode, (RTGCPTR)pvNextEIP, (RTGCPTR)env->eip, (RTGCPTR)
-    if(   uTrap < 0x20
-       && (env->cr[0] & X86_CR0_PE)
@@ -1586 +1586 @@
-        if(pVM->rem.s.uPendingException == uTrap && ++pVM->rem.s.cPendingExceptions > 512)
-        {
-VGv eip=%VGv cr2=%VGv\n", uTrap, uErrorCode, pvNextEIP, env->eip, 
+RGv eip=%RGv cr2=%RGv\n", uTrap, uErrorCode, (RTGCPTR)pvNextEIP, (RTGCPTR)env->eip, (RTGCPTR)
-            remR3RaiseRC(env->pVM, VERR_REM_TOO_MANY_TRAPS);
-            return VERR_REM_TOO_MANY_TRAPS;
@@ -1745 +1745 @@
-        for (i = 0; i < pVM->rem.s.cInvalidatedPages; i++)
-        {
-V
+R
-            tlb_flush_page(&pVM->rem.s.Env, pVM->rem.s.aGCPtrInvalidatedPages[i]);
-        }
@@ -2064 +2064 @@
-        rc = TRPMResetTrap(pVM);
-        AssertRC(rc);
-VGv cr2=%VGv nexteip=%VGv%s\n", pVM->rem.s.Env.exception_index, 
-pVM->rem.s.Env.cr[2], 
+RGv cr2=%RGv nexteip=%RGv%s\n", pVM->rem.s.Env.exception_index, (RTGCPTR)
+(RTGCPTR)pVM->rem.s.Env.cr[2], (RTGCPTR)
-    }
-
@@ -2554 +2554 @@
-    for (i = 0; i < pVM->rem.s.cInvalidatedPages; i++)
-    {
-V
+R
-        tlb_flush_page(&pVM->rem.s.Env, pVM->rem.s.aGCPtrInvalidatedPages[i]);
-    }
@@ -2669 +2669 @@
-REMR3DECL(void) REMR3NotifyPhysRamRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, unsigned fFlags)
-{
-V
+R
-    VM_ASSERT_EMT(pVM);
-
@@ -2739 +2739 @@
-REMR3DECL(void) REMR3NotifyPhysRamChunkRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, RTHCUINTPTR pvRam, unsigned fFlags)
-{
-V
+R
-    VM_ASSERT_EMT(pVM);
-
@@ -2771 +2771 @@
-    PVM pVM = cpu_single_env->pVM;
-
-VGp\n", 
+RGp\n", (RTGCPHYS)
-    const RTGCPHYS GCPhys = physaddr;
-    rc = PGM3PhysGrowRange(pVM, &GCPhys);
@@ -2777 +2777 @@
-        return;
-
-VGp\n", 
-VGp\n", 
+RGp\n", (RTGCPHYS)
+RGp\n", (RTGCPHYS)
-    AssertFatalFailed();
-}
@@ -2797 +2797 @@
-REMR3DECL(void) REMR3NotifyPhysRomRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, void *pvCopy, bool fShadow)
-{
-V
+R
-    VM_ASSERT_EMT(pVM);
-
@@ -2835 +2835 @@
-REMR3DECL(void) REMR3NotifyPhysReserve(PVM pVM, RTGCPHYS GCPhys, RTUINT cb)
-{
-V
+R
-    VM_ASSERT_EMT(pVM);
-
@@ -2872 +2872 @@
-REMR3DECL(void) REMR3NotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler)
-{
-VGp cb=%V
+RGp cb=%R
-          enmType, GCPhys, cb, fHasHCHandler));
-    VM_ASSERT_EMT(pVM);
@@ -2906 +2906 @@
-REMR3DECL(void) REMR3NotifyHandlerPhysicalDeregister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM)
-{
-VGp cb=%V
+RGp cb=%R
-          enmType, GCPhys, cb, fHasHCHandler, fRestoreAsRAM, MMR3PhysGetRamSize(pVM)));
-    VM_ASSERT_EMT(pVM);
@@ -2952 +2952 @@
-REMR3DECL(void) REMR3NotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM)
-{
-VGp GCPhysNew=%VGp cb=%V
+RGp GCPhysNew=%RGp cb=%R
-          enmType, GCPhysOld, GCPhysNew, cb, fHasHCHandler, fRestoreAsRAM));
-    VM_ASSERT_EMT(pVM);
@@ -3034 +3034 @@
-    {
-        target_ulong ret = pTLBEntry->addend + addr;
-VGv addr_code=%VGv addend=%VGp ret=%V
-
+RGv addr_code=%RGv addend=%RGp ret=%R
+(RTGCPHYS)
-        return ret;
-    }
-VGv addend=%VGp at %V
+RGv addend=%RGp at %R
-            "*** handlers\n",
-            (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, (RTGCPTR)addr, pVM->rem.s.iHandlerMemType, pVM->rem.s.iMMIOMemType));
@@ -3046 +3046 @@
-    LogRel(("*** phys\n"));
-    DBGFR3Info(pVM, "phys", NULL, DBGFR3InfoLogRelHlp());
-VGv addend=%VGp at %V
+RGv addend=%RGp at %R
-              (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, (RTGCPTR)addr, pVM->rem.s.iHandlerMemType, pVM