Changeset 13838 in vbox

Timestamp:

Nov 5, 2008 3:16:55 AM (16 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src

Files:

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

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

@@ -494 +494 @@
                 rc = VERR_NO_MEMORY;
                 ExFreePool(pvBalloon);
-                AssertMsgFailed(("IoAllocateMdl %VGv %x failed!!\n", pvBalloon, VMMDEV_MEMORY_BALLOON_CHUNK_SIZE));
+                AssertMsgFailed(("IoAllocateMdl %p %x failed!!\n", pvBalloon, VMMDEV_MEMORY_BALLOON_CHUNK_SIZE));
                 goto end;
             }

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

@@ -242 +242 @@
     void *pvRemote = NULL;
 
-    LogFlowMember (("Console::AttachUSBDevice: Proxying USB device '%s' %Vuuid...\n", Address.c_str(), &Uuid));
+    LogFlowMember (("Console::AttachUSBDevice: Proxying USB device '%s' %Ruuid...\n", Address.c_str(), &Uuid));
     PVMREQ pReq;
     vrc = VMR3ReqCall (mpVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
@@ -255 +255 @@
     else
     {
-        Log (("Console::AttachUSBDevice: Failed to create proxy device for '%s' %Vuuid, vrc=%Rrc\n", Address.c_str(),
+        Log (("Console::AttachUSBDevice: Failed to create proxy device for '%s' %Ruuid, vrc=%Rrc\n", Address.c_str(),
         &Uuid, vrc));
         AssertRC (vrc);
@@ -301 +301 @@
 
             RTUUID Uuid = aDevice->id();
-            LogFlowMember (("Console::DetachUSBDevice: Detaching USB proxy device %Vuuid...\n", &Uuid));
+            LogFlowMember (("Console::DetachUSBDevice: Detaching USB proxy device %Ruuid...\n", &Uuid));
             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))
-                return SyntaxError("bad tap file descriptor: %s (error %VRc)\n", argv[curArg], rc);
+                return SyntaxError("bad tap file descriptor: %s (error %Rrc)\n", argv[curArg], rc);
             g_aNetDevs[i].fHaveFd = true;
         }
@@ -722 +722 @@
                 rc = RTStrToInt32Ex(argv[curArg], NULL, 0, &portVRDP);
                 if (RT_FAILURE(rc))
-                    return SyntaxError("cannot vrpd port: %s (%VRc)\n", argv[curArg], rc);
+                    return SyntaxError("cannot vrpd port: %s (%Rrc)\n", argv[curArg], rc);
                 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());
-                RTPrintf("%s%lS (UUID: %Vuuid)\n",
+                RTPrintf("%s%lS (UUID: %Ruuid)\n",
                          j == 0 ? "Usage:        " : "              ",
                          name.raw(), &machineIds[j]);
@@ -6503 +6503 @@
                 machine->COMGETTER(Name)(name.asOutParam());
                 machine->COMGETTER(Id)(uuid.asOutParam());
-                RTPrintf("%s%lS (UUID: %Vuuid)\n",
+                RTPrintf("%s%lS (UUID: %Ruuid)\n",
                          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++)
             {
-                RTPrintf("%-4d: Phys=%VHp Reserved=%p\n", iPage, aPages0[iPage].Phys, aPages0[iPage].uReserved);
+                RTPrintf("%-4d: Phys=%RHp Reserved=%p\n", iPage, aPages0[iPage].Phys, aPages0[iPage].uReserved);
                 if (aPages0[iPage].uReserved != 0)
                 {
@@ -75 +75 @@
                 {
                     rcRet++;
-                    RTPrintf("tstLow: error: aPages0[%d].Phys=%VHp!\n", iPage, aPages0[iPage].Phys);
+                    RTPrintf("tstLow: error: aPages0[%d].Phys=%RHp!\n", iPage, aPages0[iPage].Phys);
                 }
             }
@@ -113 +113 @@
                 for (unsigned iPage = 0; iPage < cPages; iPage++)
                 {
-                    RTPrintf("%-4d::%-4d: Phys=%VHp Reserved=%p\n", cPages, iPage, aPages1[iPage].Phys, aPages1[iPage].uReserved);
+                    RTPrintf("%-4d::%-4d: Phys=%RHp Reserved=%p\n", cPages, iPage, aPages1[iPage].Phys, aPages1[iPage].uReserved);
                     if (aPages1[iPage].uReserved != 0)
                     {
@@ -123 +123 @@
                     {
                         rcRet++;
-                        RTPrintf("tstLow: error: aPages1[%d].Phys=%VHp!\n", iPage, aPages1[iPage].Phys);
+                        RTPrintf("tstLow: error: aPages1[%d].Phys=%RHp!\n", iPage, aPages1[iPage].Phys);
                     }
                 }

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

@@ -1524 +1524 @@
     {
         Log(("RTFileSetTimes failed with %Rrc\n", rc));
-        Log(("AccessTime       %VX64\n", RTTimeSpecGetNano(&pSFDEntry->AccessTime)));
-        Log(("ModificationTime %VX64\n", RTTimeSpecGetNano(&pSFDEntry->ModificationTime)));
-        Log(("ChangeTime       %VX64\n", RTTimeSpecGetNano(&pSFDEntry->ChangeTime)));
-        Log(("BirthTime        %VX64\n", RTTimeSpecGetNano(&pSFDEntry->AccessTime)));
+        Log(("AccessTime       %RX64\n", RTTimeSpecGetNano(&pSFDEntry->AccessTime)));
+        Log(("ModificationTime %RX64\n", RTTimeSpecGetNano(&pSFDEntry->ModificationTime)));
+        Log(("ChangeTime       %RX64\n", RTTimeSpecGetNano(&pSFDEntry->ChangeTime)));
+        Log(("BirthTime        %RX64\n", RTTimeSpecGetNano(&pSFDEntry->AccessTime)));
         /* temporary hack */
         rc = VINF_SUCCESS;

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2080 +2080 @@
     if (!device)
         return setError (E_INVALIDARG,
-            tr ("USB device with UUID {%Vuuid} is not attached to this machine"),
+            tr ("USB device with UUID {%Ruuid} is not attached to this machine"),
             Guid (aId).raw());
 
@@ -2111 +2111 @@
 #else   /* !VBOX_WITH_USB */
     return setError (E_INVALIDARG,
-        tr ("USB device with UUID {%Vuuid} is not attached to this machine"),
+        tr ("USB device with UUID {%Ruuid} is not attached to this machine"),
         Guid (aId).raw());
 #endif  /* !VBOX_WITH_USB */
@@ -3529 +3529 @@
 #ifdef VBOX_WITH_USB
     Guid Uuid (aId);
-    LogFlowThisFunc (("aId={%Vuuid} aError=%p\n", Uuid.raw(), aError));
+    LogFlowThisFunc (("aId={%Ruuid} aError=%p\n", Uuid.raw(), aError));
 
     AutoCaller autoCaller (this);
@@ -3541 +3541 @@
     while (it != mUSBDevices.end())
     {
-        LogFlowThisFunc (("it={%Vuuid}\n", (*it)->id().raw()));
+        LogFlowThisFunc (("it={%Ruuid}\n", (*it)->id().raw()));
         if ((*it)->id() == Uuid)
         {
@@ -5513 +5513 @@
     CheckComRCReturnRC (autoVMCaller.rc());
 
-    LogFlowThisFunc (("Proxying USB device '%s' {%Vuuid}...\n",
+    LogFlowThisFunc (("Proxying USB device '%s' {%Ruuid}...\n",
                       Address.raw(), Uuid.ptr()));
 
@@ -5534 +5534 @@
     if (VBOX_FAILURE (vrc))
     {
-        LogWarningThisFunc (("Failed to create proxy device for '%s' {%Vuuid} (%Rrc)\n",
+        LogWarningThisFunc (("Failed to create proxy device for '%s' {%Ruuid} (%Rrc)\n",
                              Address.raw(), Uuid.ptr(), vrc));
 
@@ -5603 +5603 @@
         AutoWriteLock alock (that);
         that->mUSBDevices.push_back (device);
-        LogFlowFunc (("Attached device {%Vuuid}\n", device->id().raw()));
+        LogFlowFunc (("Attached device {%Ruuid}\n", device->id().raw()));
 
         /* notify callbacks */
@@ -5638 +5638 @@
     AssertReturn (PDMR3USBHasHub (mpVM), E_FAIL);
 
-    LogFlowThisFunc (("Detaching USB proxy device {%Vuuid}...\n",
+    LogFlowThisFunc (("Detaching USB proxy device {%Ruuid}...\n",
                       (*aIt)->id().raw()));
 
@@ -5700 +5700 @@
         /* Remove the device from the collection */
         that->mUSBDevices.erase (*aIt);
-        LogFlowFunc (("Detached device {%Vuuid}\n", device->id().raw()));
+        LogFlowFunc (("Detached device {%Ruuid}\n", device->id().raw()));
 
         /* notify callbacks */

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -1325 +1325 @@
     memcpy (rawuuid, ((Guid &)uuid).ptr (), sizeof (rawuuid));
 
-    LogFlow(("ConsoleVRDPServer::Authenticate: uuid = %Vuuid, guestJudgement = %d, pszUser = %s, pszPassword = %s, pszDomain = %s, u32ClientId = %d\n",
+    LogFlow(("ConsoleVRDPServer::Authenticate: uuid = %Ruuid, guestJudgement = %d, pszUser = %s, pszPassword = %s, pszDomain = %s, u32ClientId = %d\n",
              rawuuid, guestJudgement, pszUser, pszPassword, pszDomain, u32ClientId));
 
@@ -1433 +1433 @@
     memcpy (rawuuid, ((Guid &)uuid).ptr (), sizeof (rawuuid));
 
-    LogFlow(("ConsoleVRDPServer::AuthDisconnect: uuid = %Vuuid, u32ClientId = %d\n",
+    LogFlow(("ConsoleVRDPServer::AuthDisconnect: uuid = %Ruuid, u32ClientId = %d\n",
              rawuuid, u32ClientId));
 

trunk/src/VBox/Main/HardDisk2Impl.cpp

@@ -631 +631 @@
     }
 
-    LogFlowThisFunc (("m.location='%ls', mm.format=%ls, m.id={%Vuuid}\n",
+    LogFlowThisFunc (("m.location='%ls', mm.format=%ls, m.id={%Ruuid}\n",
                       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 "
-                        "with UUID {%Vuuid}. No differencing hard disks "
+                        "with UUID {%Ruuid}. No differencing hard disks "
                         "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
-            location = Utf8StrFmt ("%s{%Vuuid}.vdi", location.raw(), id.raw());
+            location = Utf8StrFmt ("%s{%Ruuid}.vdi", location.raw(), id.raw());
         }
         else
@@ -2369 +2369 @@
                 {
                     lastAccessError = Utf8StrFmt (
-                        tr ("UUID {%Vuuid} of the hard disk '%ls' "
-                            "does not match the value {%Vuuid} stored in the "
+                        tr ("UUID {%Ruuid} of the hard disk '%ls' "
+                            "does not match the value {%Ruuid} stored in the "
                             "media registry ('%ls')"),
                         &uuid, m.locationFull.raw(), m.id.raw(),
@@ -2405 +2405 @@
                     {
                         lastAccessError = Utf8StrFmt (
-                            tr ("Parent hard disk with UUID {%Vuuid} of the "
+                            tr ("Parent hard disk with UUID {%Ruuid} of the "
                                 "hard disk '%ls' is not found in the media "
                                 "registry ('%ls')"),
@@ -2441 +2441 @@
                     {
                         lastAccessError = Utf8StrFmt (
-                            tr ("Parent UUID {%Vuuid} of the hard disk '%ls' "
-                                "does not match UUID {%Vuuid} of its parent "
+                            tr ("Parent UUID {%Ruuid} of the hard disk '%ls' "
+                                "does not match UUID {%Ruuid} of its parent "
                                 "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,
-                tr ("Host network interface with UUID {%Vuuid} does not exist"),
+                tr ("Host network interface with UUID {%Ruuid} does not exist"),
                 Guid (aId).raw());
 
@@ -2662 +2662 @@
 
         aGUID = Guid (Utf8Str (pCfgGuidString + 1));
-        LogFlowFunc (("Network connection GUID = {%Vuuid}\n", aGUID.raw()));
+        LogFlowFunc (("Network connection GUID = {%Ruuid}\n", aGUID.raw()));
         Assert (!aGUID.isEmpty());
     }
@@ -2677 +2677 @@
 {
     LogFlowFuncEnter();
-    LogFlowFunc (("Network connection GUID = {%Vuuid}\n", aGUID.raw()));
+    LogFlowFunc (("Network connection GUID = {%Ruuid}\n", aGUID.raw()));
 
     AssertReturn (aClient, VERR_INVALID_POINTER);
@@ -2942 +2942 @@
                         if (RT_FAILURE (vrc)) break;
 
-                        LogFlowFunc (("Network connection GUID = {%Vuuid}\n", guid.raw()));
+                        LogFlowFunc (("Network connection GUID = {%Ruuid}\n", guid.raw()));
 
                         /* initialize the object returned to the caller by
@@ -2977 +2977 @@
         {
             LogFlowFunc (("RemoveHostNetworkInterface:\n"));
-            LogFlowFunc (("Network connection GUID = {%Vuuid}\n", d->guid.raw()));
+            LogFlowFunc (("Network connection GUID = {%Ruuid}\n", d->guid.raw()));
 
             /* write message and parameters */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -577 +577 @@
         /* fetch the current error info */
         mData->mAccessError = com::ErrorInfo();
-        LogWarning (("Machine {%Vuuid} is inaccessible! [%ls]\n",
+        LogWarning (("Machine {%Ruuid} is inaccessible! [%ls]\n",
                      mData->mUuid.raw(),
                      mData->mAccessError.getText().raw()));
@@ -1321 +1321 @@
             /* the default snapshots folder is {UUID}, for backwards
              * compatibility and to resolve conflicts */
-            snapshotFolder = Utf8StrFmt ("{%Vuuid}", mData->mUuid.raw());
+            snapshotFolder = Utf8StrFmt ("{%Ruuid}", mData->mUuid.raw());
         }
     }
@@ -4675 +4675 @@
             {
                 throw setError (E_FAIL,
-                    tr ("Machine UUID {%Vuuid} in '%ls' doesn't match its "
+                    tr ("Machine UUID {%Ruuid} in '%ls' doesn't match its "
                         "UUID {%s} in the registry file '%ls'"),
                     id.raw(), mData->mConfigFileFull.raw(),
@@ -5296 +5296 @@
             if (mType == IsSnapshotMachine)
                 return setError (E_FAIL,
-                    tr ("Immutable hard disk '%ls' with UUID {%Vuuid} cannot be "
-                        "directly attached to snapshot with UUID {%Vuuid} "
+                    tr ("Immutable hard disk '%ls' with UUID {%Ruuid} cannot be "
+                        "directly attached to snapshot with UUID {%Ruuid} "
                         "of the virtual machine '%ls' ('%ls')"),
                     hd->locationFull().raw(), uuid.raw(),
@@ -5304 +5304 @@
 
             return setError (E_FAIL,
-                tr ("Immutable hard disk '%ls' with UUID {%Vuuid} cannot be "
+                tr ("Immutable hard disk '%ls' with UUID {%Ruuid} cannot be "
                     "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,
-                tr ("Hard disk '%ls' with UUID {%Vuuid} cannot be directly "
+                tr ("Hard disk '%ls' with UUID {%Ruuid} cannot be directly "
                     "attached to the virtual machine '%ls' ('%ls') "
                     "because it has %d differencing child hard disks"),
@@ -5325 +5325 @@
         {
             return setError (E_FAIL,
-                tr ("Hard disk '%ls' with UUID {%Vuuid} is already attached "
+                tr ("Hard disk '%ls' with UUID {%Ruuid} is already attached "
                     "to the virtual machine '%ls' ('%ls')"),
                 hd->locationFull().raw(), uuid.raw(),
@@ -7673 +7673 @@
                      E_FAIL);
 #elif defined(RT_OS_OS2)
-    Utf8Str ipcSem = Utf8StrFmt ("\\SEM32\\VBOX\\VM\\{%Vuuid}",
+    Utf8Str ipcSem = Utf8StrFmt ("\\SEM32\\VBOX\\VM\\{%Ruuid}",
                                  aMachine->mData->mUuid.raw());
     mIPCSemName = ipcSem;
@@ -8284 +8284 @@
     if (mData->mMachineState == MachineState_Paused)
     {
-        stateFilePath = Utf8StrFmt ("%ls%c{%Vuuid}.sav",
+        stateFilePath = Utf8StrFmt ("%ls%c{%Ruuid}.sav",
                                     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)
-        stateFilePath = Utf8StrFmt ("%ls%c{%Vuuid}.sav",
+        stateFilePath = Utf8StrFmt ("%ls%c{%Ruuid}.sav",
                                     mUserData->mSnapshotFolderFull.raw(),
                                     RTPATH_DELIMITER,
@@ -10024 +10024 @@
                 Utf8Str snapStateFilePath = curSnapshot->stateFilePath();
 
-                Utf8Str stateFilePath = Utf8StrFmt ("%ls%c{%Vuuid}.sav",
+                Utf8Str stateFilePath = Utf8StrFmt ("%ls%c{%Ruuid}.sav",
                     mUserData->mSnapshotFolderFull.raw(),
                     RTPATH_DELIMITER, mData->mUuid.raw());

trunk/src/VBox/Main/MediumImpl.cpp

@@ -942 +942 @@
                                         const Guid &aId)
 {
-    LogFlowThisFunc (("aLocation='%ls', aId={%Vuuid}\n", aLocation, aId.raw()));
+    LogFlowThisFunc (("aLocation='%ls', aId={%Ruuid}\n", aLocation, aId.raw()));
 
     AssertReturn (aVirtualBox, E_INVALIDARG);
@@ -1031 +1031 @@
     }
 
-    LogFlowThisFunc (("m.location='%ls', m.id={%Vuuid}\n",
+    LogFlowThisFunc (("m.location='%ls', m.id={%Ruuid}\n",
                       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;
-        vrc = client.create (Utf8StrFmt ("VirtualBox\\SVCHelper\\{%Vuuid}",
+        vrc = client.create (Utf8StrFmt ("VirtualBox\\SVCHelper\\{%Ruuid}",
                                          id.raw()));
         if (RT_FAILURE (vrc))
@@ -2242 +2242 @@
         {
             case DataChanged:
-                LogFlow (("OnMachineDataChange: id={%Vuuid}\n", id.ptr()));
+                LogFlow (("OnMachineDataChange: id={%Ruuid}\n", id.ptr()));
                 aCallback->OnMachineDataChange (id);
                 break;
 
             case StateChanged:
-                LogFlow (("OnMachineStateChange: id={%Vuuid}, state=%d\n",
+                LogFlow (("OnMachineStateChange: id={%Ruuid}, state=%d\n",
                           id.ptr(), state));
                 aCallback->OnMachineStateChange (id, state);
@@ -2253 +2253 @@
 
             case Registered:
-                LogFlow (("OnMachineRegistered: id={%Vuuid}, registered=%d\n",
+                LogFlow (("OnMachineRegistered: id={%Ruuid}, registered=%d\n",
                           id.ptr(), registered));
                 aCallback->OnMachineRegistered (id, registered);
@@ -2333 +2333 @@
     void handleCallback (const ComPtr <IVirtualBoxCallback> &aCallback)
     {
-        LogFlow (("OnExtraDataChange: machineId={%Vuuid}, key='%ls', val='%ls'\n",
+        LogFlow (("OnExtraDataChange: machineId={%Ruuid}, key='%ls', val='%ls'\n",
                   machineId.ptr(), key.raw(), val.raw()));
         aCallback->OnExtraDataChange (machineId, key, val);
@@ -2367 +2367 @@
     void handleCallback (const ComPtr <IVirtualBoxCallback> &aCallback)
     {
-        LogFlow (("OnSessionStateChange: machineId={%Vuuid}, sessionState=%d\n",
+        LogFlow (("OnSessionStateChange: machineId={%Ruuid}, sessionState=%d\n",
                   machineId.ptr(), sessionState));
         aCallback->OnSessionStateChange (machineId, sessionState);
@@ -2401 +2401 @@
         {
             case Taken:
-                LogFlow (("OnSnapshotTaken: machineId={%Vuuid}, snapshotId={%Vuuid}\n",
+                LogFlow (("OnSnapshotTaken: machineId={%Ruuid}, snapshotId={%Ruuid}\n",
                           machineId.ptr(), snapshotId.ptr()));
                 aCallback->OnSnapshotTaken (machineId, snapshotId);
@@ -2407 +2407 @@
 
             case Discarded:
-                LogFlow (("OnSnapshotDiscarded: machineId={%Vuuid}, snapshotId={%Vuuid}\n",
+                LogFlow (("OnSnapshotDiscarded: machineId={%Ruuid}, snapshotId={%Ruuid}\n",
                           machineId.ptr(), snapshotId.ptr()));
                 aCallback->OnSnapshotDiscarded (machineId, snapshotId);
@@ -2413 +2413 @@
 
             case Changed:
-                LogFlow (("OnSnapshotChange: machineId={%Vuuid}, snapshotId={%Vuuid}\n",
+                LogFlow (("OnSnapshotChange: machineId={%Ruuid}, snapshotId={%Ruuid}\n",
                           machineId.ptr(), snapshotId.ptr()));
                 aCallback->OnSnapshotChange (machineId, snapshotId);
@@ -2461 +2461 @@
     void handleCallback (const ComPtr <IVirtualBoxCallback> &aCallback)
     {
-        LogFlow (("OnGuestPropertyChange: machineId={%Vuuid}, name='%ls', value='%ls', flags='%ls'\n",
+        LogFlow (("OnGuestPropertyChange: machineId={%Ruuid}, name='%ls', value='%ls', flags='%ls'\n",
                   machineId.ptr(), name.raw(), value.raw(), flags.raw()));
         aCallback->OnGuestPropertyChange (machineId, name, value, flags);
@@ -2588 +2588 @@
     {
         setError (E_INVALIDARG,
-            tr ("Could not find a registered machine with UUID {%Vuuid}"),
+            tr ("Could not find a registered machine with UUID {%Ruuid}"),
             aId.raw());
     }
@@ -2659 +2659 @@
     {
         if (aId)
-            setError (rc, tr ("Could not find a hard disk with UUID {%Vuuid} "
+            setError (rc, tr ("Could not find a hard disk with UUID {%Ruuid} "
                               "in the media registry ('%ls')"),
                       aId->raw(), mData.mCfgFile.mName.raw());
@@ -2730 +2730 @@
     {
         if (aId)
-            setError (rc, tr ("Could not find a CD/DVD image with UUID {%Vuuid} "
+            setError (rc, tr ("Could not find a CD/DVD image with UUID {%Ruuid} "
                               "in the media registry ('%ls')"),
                       aId->raw(), mData.mCfgFile.mName.raw());
@@ -2802 +2802 @@
     {
         if (aId)
-            setError (rc, tr ("Could not find a floppy image with UUID {%Vuuid} "
+            setError (rc, tr ("Could not find a floppy image with UUID {%Ruuid} "
                               "in the media registry ('%ls')"),
                       aId->raw(), mData.mCfgFile.mName.raw());
@@ -2908 +2908 @@
             AutoReadLock mediaLock (hardDisk);
             aConflict = Utf8StrFmt (
-                tr ("hard disk '%ls' with UUID {%Vuuid}"),
+                tr ("hard disk '%ls' with UUID {%Ruuid}"),
                 hardDisk->locationFull().raw(), hardDisk->id().raw());
             return S_OK;
@@ -2922 +2922 @@
             AutoReadLock mediaLock (image);
             aConflict = Utf8StrFmt (
-                tr ("CD/DVD image '%ls' with UUID {%Vuuid}"),
+                tr ("CD/DVD image '%ls' with UUID {%Ruuid}"),
                 image->locationFull().raw(), image->id().raw());
             return S_OK;
@@ -2936 +2936 @@
             AutoReadLock mediaLock (image);
             aConflict = Utf8StrFmt (
-                tr ("floppy image '%ls' with UUID {%Vuuid}"),
+                tr ("floppy image '%ls' with UUID {%Ruuid}"),
                 image->locationFull().raw(), image->id().raw());
             return S_OK;
@@ -3243 +3243 @@
 
             return setError (E_INVALIDARG,
-                tr ("Registered machine with UUID {%Vuuid} ('%ls') already exists"),
+                tr ("Registered machine with UUID {%Ruuid} ('%ls') already exists"),
                 aMachine->id().raw(), m->settingsFileFull().raw());
         }
@@ -3306 +3306 @@
     {
         return setError (E_INVALIDARG,
-            tr ("Cannot register the hard disk '%ls' with UUID {%Vuuid} "
+            tr ("Cannot register the hard disk '%ls' with UUID {%Ruuid} "
                 "because a %s already exists in the media registry ('%ls')"),
             aHardDisk->locationFull().raw(), aHardDisk->id().raw(),
@@ -3421 +3421 @@
     {
         return setError (E_INVALIDARG,
-            tr ("Cannot register the CD/DVD image '%ls' with UUID {%Vuuid} "
+            tr ("Cannot register the CD/DVD image '%ls' with UUID {%Ruuid} "
                 "because a %s already exists in the media registry ('%ls')"),
             aImage->locationFull().raw(), aImage->id().raw(),
@@ -3522 +3522 @@
     {
         return setError (E_INVALIDARG,
-            tr ("Cannot register the floppy image '%ls' with UUID {%Vuuid} "
+            tr ("Cannot register the floppy image '%ls' with UUID {%Ruuid} "
                 "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))
     {
-        LogFlow(("REMR3BreakpointSet: Address=%VGv\n", Address));
+        LogFlow(("REMR3BreakpointSet: Address=%RGv\n", Address));
         return VINF_SUCCESS;
     }
-    LogFlow(("REMR3BreakpointSet: Address=%VGv - failed!\n", Address));
+    LogFlow(("REMR3BreakpointSet: Address=%RGv - failed!\n", Address));
     return VERR_REM_NO_MORE_BP_SLOTS;
 }
@@ -712 +712 @@
     if (!cpu_breakpoint_remove(&pVM->rem.s.Env, Address))
     {
-        LogFlow(("REMR3BreakpointClear: Address=%VGv\n", Address));
+        LogFlow(("REMR3BreakpointClear: Address=%RGv\n", Address));
         return VINF_SUCCESS;
     }
-    LogFlow(("REMR3BreakpointClear: Address=%VGv - not found!\n", Address));
+    LogFlow(("REMR3BreakpointClear: Address=%RGv - not found!\n", Address));
     return VERR_REM_BP_NOT_FOUND;
 }
@@ -801 +801 @@
                         break;
                     }
-                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_DEBUG rc=%Rrc iBP=%d GCPtrPC=%VGv\n", rc, iBP, GCPtrPC));
+                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_DEBUG rc=%Rrc iBP=%d GCPtrPC=%RGv\n", rc, iBP, GCPtrPC));
                 break;
             }
@@ -967 +967 @@
     }
 
-    Log2(("REMR3EmulateInstruction: returns %Rrc (cs:eip=%04x:%VGv)\n",
-          rc, pVM->rem.s.Env.segs[R_CS].selector, pVM->rem.s.Env.eip));
+    Log2(("REMR3EmulateInstruction: returns %Rrc (cs:eip=%04x:%RGv)\n",
+          rc, pVM->rem.s.Env.segs[R_CS].selector, (RTGCPTR)pVM->rem.s.Env.eip));
     return rc;
 }
@@ -987 +987 @@
 REMR3DECL(int) REMR3Run(PVM pVM)
 {
-    Log2(("REMR3Run: (cs:eip=%04x:%VGv)\n", pVM->rem.s.Env.segs[R_CS].selector, pVM->rem.s.Env.eip));
+    Log2(("REMR3Run: (cs:eip=%04x:%RGv)\n", pVM->rem.s.Env.segs[R_CS].selector, (RTGCPTR)pVM->rem.s.Env.eip));
     Assert(pVM->rem.s.fInREM);
 
@@ -1055 +1055 @@
                     break;
                 }
-            Log2(("REMR3Run: cpu_exec -> EXCP_DEBUG rc=%Rrc iBP=%d GCPtrPC=%VGv\n", rc, iBP, GCPtrPC));
+            Log2(("REMR3Run: cpu_exec -> EXCP_DEBUG rc=%Rrc iBP=%d GCPtrPC=%RGv\n", rc, iBP, GCPtrPC));
 #endif
             break;
@@ -1105 +1105 @@
     }
 
-    Log2(("REMR3Run: returns %Rrc (cs:eip=%04x:%VGv)\n", rc, pVM->rem.s.Env.segs[R_CS].selector, pVM->rem.s.Env.eip));
+    Log2(("REMR3Run: returns %Rrc (cs:eip=%04x:%RGv)\n", rc, pVM->rem.s.Env.segs[R_CS].selector, (RTGCPTR)pVM->rem.s.Env.eip));
     return rc;
 }
@@ -1373 +1373 @@
     if (pVM->rem.s.fIgnoreInvlPg || pVM->rem.s.fIgnoreAll)
         return;
-    Log(("remR3FlushPage: GCPtr=%VGv\n", GCPtr));
+    Log(("remR3FlushPage: GCPtr=%RGv\n", GCPtr));
     Assert(pVM->rem.s.fInREM || pVM->rem.s.fInStateSync);
 
@@ -1392 +1392 @@
     if (RT_FAILURE(rc))
     {
-        AssertMsgFailed(("remR3FlushPage %VGv failed with %d!!\n", GCPtr, rc));
+        AssertMsgFailed(("remR3FlushPage %RGv failed with %d!!\n", GCPtr, rc));
         VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
     }
@@ -1576 +1576 @@
     }
 #endif
-    Log(("remR3NotifyTrap: uTrap=%x error=%x next_eip=%VGv eip=%VGv cr2=%VGv\n", uTrap, uErrorCode, pvNextEIP, env->eip, env->cr[2]));
+    Log(("remR3NotifyTrap: uTrap=%x error=%x next_eip=%RGv eip=%RGv cr2=%RGv\n", uTrap, uErrorCode, (RTGCPTR)pvNextEIP, (RTGCPTR)env->eip, (RTGCPTR)env->cr[2]));
     if(   uTrap < 0x20
        && (env->cr[0] & X86_CR0_PE)
@@ -1586 +1586 @@
         if(pVM->rem.s.uPendingException == uTrap && ++pVM->rem.s.cPendingExceptions > 512)
         {
-            LogRel(("VERR_REM_TOO_MANY_TRAPS -> uTrap=%x error=%x next_eip=%VGv eip=%VGv cr2=%VGv\n", uTrap, uErrorCode, pvNextEIP, env->eip, env->cr[2]));
+            LogRel(("VERR_REM_TOO_MANY_TRAPS -> uTrap=%x error=%x next_eip=%RGv eip=%RGv cr2=%RGv\n", uTrap, uErrorCode, (RTGCPTR)pvNextEIP, (RTGCPTR)env->eip, (RTGCPTR)env->cr[2]));
             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++)
         {
-            Log2(("REMR3State: invlpg %VGv\n", pVM->rem.s.aGCPtrInvalidatedPages[i]));
+            Log2(("REMR3State: invlpg %RGv\n", pVM->rem.s.aGCPtrInvalidatedPages[i]));
             tlb_flush_page(&pVM->rem.s.Env, pVM->rem.s.aGCPtrInvalidatedPages[i]);
         }
@@ -2064 +2064 @@
         rc = TRPMResetTrap(pVM);
         AssertRC(rc);
-        Log2(("REMR3State: trap=%02x errcd=%VGv cr2=%VGv nexteip=%VGv%s\n", pVM->rem.s.Env.exception_index, pVM->rem.s.Env.error_code,
-              pVM->rem.s.Env.cr[2], pVM->rem.s.Env.exception_next_eip, pVM->rem.s.Env.exception_is_int ? " software" : ""));
+        Log2(("REMR3State: trap=%02x errcd=%RGv cr2=%RGv nexteip=%RGv%s\n", pVM->rem.s.Env.exception_index, (RTGCPTR)pVM->rem.s.Env.error_code,
+              (RTGCPTR)pVM->rem.s.Env.cr[2], (RTGCPTR)pVM->rem.s.Env.exception_next_eip, pVM->rem.s.Env.exception_is_int ? " software" : ""));
     }
 
@@ -2554 +2554 @@
     for (i = 0; i < pVM->rem.s.cInvalidatedPages; i++)
     {
-        Log2(("REMR3ReplayInvalidatedPages: invlpg %VGv\n", pVM->rem.s.aGCPtrInvalidatedPages[i]));
+        Log2(("REMR3ReplayInvalidatedPages: invlpg %RGv\n", pVM->rem.s.aGCPtrInvalidatedPages[i]));
         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)
 {
-    Log(("REMR3NotifyPhysRamRegister: GCPhys=%VGp cb=%d fFlags=%d\n", GCPhys, cb, fFlags));
+    Log(("REMR3NotifyPhysRamRegister: GCPhys=%RGp cb=%d fFlags=%d\n", GCPhys, cb, fFlags));
     VM_ASSERT_EMT(pVM);
 
@@ -2739 +2739 @@
 REMR3DECL(void) REMR3NotifyPhysRamChunkRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, RTHCUINTPTR pvRam, unsigned fFlags)
 {
-    Log(("REMR3NotifyPhysRamChunkRegister: GCPhys=%VGp cb=%d pvRam=%p fFlags=%d\n", GCPhys, cb, pvRam, fFlags));
+    Log(("REMR3NotifyPhysRamChunkRegister: GCPhys=%RGp cb=%d pvRam=%p fFlags=%d\n", GCPhys, cb, pvRam, fFlags));
     VM_ASSERT_EMT(pVM);
 
@@ -2771 +2771 @@
     PVM pVM = cpu_single_env->pVM;
 
-    LogFlow(("remR3GrowDynRange %VGp\n", physaddr));
+    LogFlow(("remR3GrowDynRange %RGp\n", (RTGCPHYS)physaddr));
     const RTGCPHYS GCPhys = physaddr;
     rc = PGM3PhysGrowRange(pVM, &GCPhys);
@@ -2777 +2777 @@
         return;
 
-    LogRel(("\nUnable to allocate guest RAM chunk at %VGp\n", physaddr));
-    cpu_abort(cpu_single_env, "Unable to allocate guest RAM chunk at %VGp\n", physaddr);
+    LogRel(("\nUnable to allocate guest RAM chunk at %RGp\n", (RTGCPHYS)physaddr));
+    cpu_abort(cpu_single_env, "Unable to allocate guest RAM chunk at %RGp\n", (RTGCPHYS)physaddr);
     AssertFatalFailed();
 }
@@ -2797 +2797 @@
 REMR3DECL(void) REMR3NotifyPhysRomRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, void *pvCopy, bool fShadow)
 {
-    Log(("REMR3NotifyPhysRomRegister: GCPhys=%VGp cb=%d pvCopy=%p fShadow=%RTbool\n", GCPhys, cb, pvCopy, fShadow));
+    Log(("REMR3NotifyPhysRomRegister: GCPhys=%RGp cb=%d pvCopy=%p fShadow=%RTbool\n", GCPhys, cb, pvCopy, fShadow));
     VM_ASSERT_EMT(pVM);
 
@@ -2835 +2835 @@
 REMR3DECL(void) REMR3NotifyPhysReserve(PVM pVM, RTGCPHYS GCPhys, RTUINT cb)
 {
-    Log(("REMR3NotifyPhysReserve: GCPhys=%VGp cb=%d\n", GCPhys, cb));
+    Log(("REMR3NotifyPhysReserve: GCPhys=%RGp cb=%d\n", GCPhys, cb));
     VM_ASSERT_EMT(pVM);
 
@@ -2872 +2872 @@
 REMR3DECL(void) REMR3NotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler)
 {
-    Log(("REMR3NotifyHandlerPhysicalRegister: enmType=%d GCPhys=%VGp cb=%VGp fHasHCHandler=%d\n",
+    Log(("REMR3NotifyHandlerPhysicalRegister: enmType=%d GCPhys=%RGp cb=%RGp fHasHCHandler=%d\n",
           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)
 {
-    Log(("REMR3NotifyHandlerPhysicalDeregister: enmType=%d GCPhys=%VGp cb=%VGp fHasHCHandler=%RTbool fRestoreAsRAM=%RTbool RAM=%08x\n",
+    Log(("REMR3NotifyHandlerPhysicalDeregister: enmType=%d GCPhys=%RGp cb=%RGp fHasHCHandler=%RTbool fRestoreAsRAM=%RTbool RAM=%08x\n",
           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)
 {
-    Log(("REMR3NotifyHandlerPhysicalModify: enmType=%d GCPhysOld=%VGp GCPhysNew=%VGp cb=%VGp fHasHCHandler=%RTbool fRestoreAsRAM=%RTbool\n",
+    Log(("REMR3NotifyHandlerPhysicalModify: enmType=%d GCPhysOld=%RGp GCPhysNew=%RGp cb=%RGp fHasHCHandler=%RTbool fRestoreAsRAM=%RTbool\n",
           enmType, GCPhysOld, GCPhysNew, cb, fHasHCHandler, fRestoreAsRAM));
     VM_ASSERT_EMT(pVM);
@@ -3034 +3034 @@
     {
         target_ulong ret = pTLBEntry->addend + addr;
-        AssertMsg2("remR3PhysGetPhysicalAddressCode: addr=%VGv addr_code=%VGv addend=%VGp ret=%VGp\n",
-                   (RTGCPTR)addr, (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, ret);
+        AssertMsg2("remR3PhysGetPhysicalAddressCode: addr=%RGv addr_code=%RGv addend=%RGp ret=%RGp\n",
+                   (RTGCPTR)addr, (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, (RTGCPHYS)ret);
         return ret;
     }
-    LogRel(("\nTrying to execute code with memory type addr_code=%VGv addend=%VGp at %VGv! (iHandlerMemType=%#x iMMIOMemType=%#x)\n"
+    LogRel(("\nTrying to execute code with memory type addr_code=%RGv addend=%RGp at %RGv! (iHandlerMemType=%#x iMMIOMemType=%#x)\n"
             "*** 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());
-    cpu_abort(env, "Trying to execute code with memory type addr_code=%VGv addend=%VGp at %VGv. (iHandlerMemType=%#x iMMIOMemType=%#x)\n",
+    cpu_abort(env, "Trying to execute code with memory type addr_code=%RGv addend=%RGp at %RGv. (iHandlerMemType=%#x iMMIOMemType=%#x)\n",
               (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, (RTGCPTR)addr, pVM->rem.s.iHandlerMemType, pVM->rem.s.iMMIOMemType);
     AssertFatalFailed();
@@ -3055 +3055 @@
  * Useful for finding non-guest-ram reads/writes.  */
 #if 0 //1 /* disable if it becomes bothersome... */
-# define VBOX_CHECK_ADDR(GCPhys) AssertMsg(PGMPhysIsGCPhysValid(cpu_single_env->pVM, (GCPhys)), ("%VGp\n", (GCPhys)))
+# define VBOX_CHECK_ADDR(GCPhys) AssertMsg(PGMPhysIsGCPhysValid(cpu_single_env->pVM, (GCPhys)), ("%RGp\n", (GCPhys)))
 #else
 # define VBOX_CHECK_ADDR(GCPhys) do { } while (0)
@@ -3272 +3272 @@
     int rc = IOMMMIORead((PVM)pvVM, GCPhys, &u32, 1);
     AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
-    Log2(("remR3MMIOReadU8: GCPhys=%VGp -> %02x\n", GCPhys, u32));
+    Log2(("remR3MMIOReadU8: GCPhys=%RGp -> %02x\n", GCPhys, u32));
     return u32;
 }
@@ -3282 +3282 @@
     int rc = IOMMMIORead((PVM)pvVM, GCPhys, &u32, 2);
     AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
-    Log2(("remR3MMIOReadU16: GCPhys=%VGp -> %04x\n", GCPhys, u32));
+    Log2(("remR3MMIOReadU16: GCPhys=%RGp -> %04x\n", GCPhys, u32));
     return u32;
 }
@@ -3292 +3292 @@
     int rc = IOMMMIORead((PVM)pvVM, GCPhys, &u32, 4);
     AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
-    Log2(("remR3MMIOReadU32: GCPhys=%VGp -> %08x\n", GCPhys, u32));
+    Log2(("remR3MMIOReadU32: GCPhys=%RGp -> %08x\n", GCPhys, u32));
     return u32;
 }
@@ -3299 +3299 @@
 static void     remR3MMIOWriteU8(void *pvVM, target_phys_addr_t GCPhys, uint32_t u32)
 {
-    Log2(("remR3MMIOWriteU8: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
+    Log2(("remR3MMIOWriteU8: GCPhys=%RGp u32=%#x\n", GCPhys, u32));
     int rc = IOMMMIOWrite((PVM)pvVM, GCPhys, u32, 1);
     AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
@@ -3307 +3307 @@
 static void     remR3MMIOWriteU16(void *pvVM, target_phys_addr_t GCPhys, uint32_t u32)
 {
-    Log2(("remR3MMIOWriteU16: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
+    Log2(("remR3MMIOWriteU16: GCPhys=%RGp u32=%#x\n", GCPhys, u32));
     int rc = IOMMMIOWrite((PVM)pvVM, GCPhys, u32, 2);
     AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
@@ -3315 +3315 @@
 static void     remR3MMIOWriteU32(void *pvVM, target_phys_addr_t GCPhys, uint32_t u32)
 {
-    Log2(("remR3MMIOWriteU32: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
+    Log2(("remR3MMIOWriteU32: GCPhys=%RGp u32=%#x\n", GCPhys, u32));
     int rc = IOMMMIOWrite((PVM)pvVM, GCPhys, u32, 4);
     AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
@@ -3328 +3328 @@
 static uint32_t remR3HandlerReadU8(void *pvVM, target_phys_addr_t GCPhys)
 {
-    Log2(("remR3HandlerReadU8: GCPhys=%VGp\n", GCPhys));
+    Log2(("remR3HandlerReadU8: GCPhys=%RGp\n", GCPhys));
     uint8_t u8;
     PGMPhysRead((PVM)pvVM, GCPhys, &u8, sizeof(u8));
@@ -3336 +3336 @@
 static uint32_t remR3HandlerReadU16(void *pvVM, target_phys_addr_t GCPhys)
 {
-    Log2(("remR3HandlerReadU16: GCPhys=%VGp\n", GCPhys));
+    Log2(("remR3HandlerReadU16: GCPhys=%RGp\n", GCPhys));
     uint16_t u16;
     PGMPhysRead((PVM)pvVM, GCPhys, &u16, sizeof(u16));
@@ -3344 +3344 @@
 static uint32_t remR3HandlerReadU32(void *pvVM, target_phys_addr_t GCPhys)
 {
-    Log2(("remR3HandlerReadU32: GCPhys=%VGp\n", GCPhys));
+    Log2(("remR3HandlerReadU32: GCPhys=%RGp\n", GCPhys));
     uint32_t u32;
     PGMPhysRead((PVM)pvVM, GCPhys, &u32, sizeof(u32));
@@ -3352 +3352 @@
 static void     remR3HandlerWriteU8(void *pvVM, target_phys_addr_t GCPhys, uint32_t u32)
 {
-    Log2(("remR3HandlerWriteU8: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
+    Log2(("remR3HandlerWriteU8: GCPhys=%RGp u32=%#x\n", GCPhys, u32));
     PGMPhysWrite((PVM)pvVM, GCPhys, &u32, sizeof(uint8_t));
 }
@@ -3358 +3358 @@
 static void     remR3HandlerWriteU16(void *pvVM, target_phys_addr_t GCPhys, uint32_t u32)
 {
-    Log2(("remR3HandlerWriteU16: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
+    Log2(("remR3HandlerWriteU16: GCPhys=%RGp u32=%#x\n", GCPhys, u32));
     PGMPhysWrite((PVM)pvVM, GCPhys, &u32, sizeof(uint16_t));
 }
@@ -3364 +3364 @@
 static void     remR3HandlerWriteU32(void *pvVM, target_phys_addr_t GCPhys, uint32_t u32)
 {
-    Log2(("remR3HandlerWriteU32: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
+    Log2(("remR3HandlerWriteU32: GCPhys=%RGp u32=%#x\n", GCPhys, u32));
     PGMPhysWrite((PVM)pvVM, GCPhys, &u32, sizeof(uint32_t));
 }
@@ -3725 +3725 @@
          * Do the disassembling.
          */
-        RTLogPrintf("Guest Code: PC=%VGp #VGp (%VGp) bytes fFlags=%d\n", uCode, cb, cb, fFlags);
+        RTLogPrintf("Guest Code: PC=%RGp %#RGp (%RGp) bytes fFlags=%d\n", uCode, cb, cb, fFlags);
         RTSEL cs = cpu_single_env->segs[R_CS].selector;
         RTGCUINTPTR eip = uCode - cpu_single_env->segs[R_CS].base;
@@ -3739 +3739 @@
                                         &cbInstr);
             if (RT_SUCCESS(rc))
-                RTLogPrintf("%VGp %s\n", uCode, szBuf);
+                RTLogPrintf("%RGp %s\n", uCode, szBuf);
             else
             {
-                RTLogPrintf("%VGp %04x:%VGp: %s\n", uCode, cs, eip, szBuf);
+                RTLogPrintf("%RGp %04x:%RGv: %s\n", uCode, cs, eip, szBuf);
                 cbInstr = 1;
             }

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -683 +683 @@
     if (!cpu_breakpoint_insert(&pVM->rem.s.Env, Address))
     {
-        LogFlow(("REMR3BreakpointSet: Address=%VGv\n", Address));
+        LogFlow(("REMR3BreakpointSet: Address=%RGv\n", Address));
         return VINF_SUCCESS;
     }
-    LogFlow(("REMR3BreakpointSet: Address=%VGv - failed!\n", Address));
+    LogFlow(("REMR3BreakpointSet: Address=%RGv - failed!\n", Address));
     return VERR_REM_NO_MORE_BP_SLOTS;
 }
@@ -704 +704 @@
     if (!cpu_breakpoint_remove(&pVM->rem.s.Env, Address))
     {
-        LogFlow(("REMR3BreakpointClear: Address=%VGv\n", Address));
+        LogFlow(("REMR3BreakpointClear: Address=%RGv\n", Address));
         return VINF_SUCCESS;
     }
-    LogFlow(("REMR3BreakpointClear: Address=%VGv - not found!\n", Address));
+    LogFlow(("REMR3BreakpointClear: Address=%RGv - not found!\n", Address));
     return VERR_REM_BP_NOT_FOUND;
 }
@@ -794 +794 @@
                         break;
                     }
-                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_DEBUG rc=%Rrc iBP=%d GCPtrPC=%VGv\n", rc, iBP, GCPtrPC));
+                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_DEBUG rc=%Rrc iBP=%d GCPtrPC=%RGv\n", rc, iBP, GCPtrPC));
                 break;
             }
@@ -960 +960 @@
     }
 
-    Log2(("REMR3EmulateInstruction: returns %Rrc (cs:eip=%04x:%VGv)\n",
-          rc, pVM->rem.s.Env.segs[R_CS].selector, pVM->rem.s.Env.eip));
+    Log2(("REMR3EmulateInstruction: returns %Rrc (cs:eip=%04x:%RGv)\n",
+          rc, pVM->rem.s.Env.segs[R_CS].selector, (RTGCPTR)pVM->rem.s.Env.eip));
     return rc;
 }
@@ -981 +981 @@
 {
     int rc;
-    Log2(("REMR3Run: (cs:eip=%04x:%VGv)\n", pVM->rem.s.Env.segs[R_CS].selector, pVM->rem.s.Env.eip));
+    Log2(("REMR3Run: (cs:eip=%04x:%RGv)\n", pVM->rem.s.Env.segs[R_CS].selector, (RTGCPTR)pVM->rem.s.Env.eip));
     Assert(pVM->rem.s.fInREM);
 
@@ -1049 +1049 @@
                     break;
                 }
-            Log2(("REMR3Run: cpu_exec -> EXCP_DEBUG rc=%Rrc iBP=%d GCPtrPC=%VGv\n", rc, iBP, GCPtrPC));
+            Log2(("REMR3Run: cpu_exec -> EXCP_DEBUG rc=%Rrc iBP=%d GCPtrPC=%RGv\n", rc, iBP, GCPtrPC));
 #endif
             break;
@@ -1089 +1089 @@
     }
 
-    Log2(("REMR3Run: returns %Rrc (cs:eip=%04x:%VGv)\n", rc, pVM->rem.s.Env.segs[R_CS].selector, pVM->rem.s.Env.eip));
+    Log2(("REMR3Run: returns %Rrc (cs:eip=%04x:%RGv)\n", rc, pVM->rem.s.Env.segs[R_CS].selector, (RTGCPTR)pVM->rem.s.Env.eip));
     return rc;
 }
@@ -1361 +1361 @@
     if (pVM->rem.s.fIgnoreInvlPg || pVM->rem.s.fIgnoreAll)
         return;
-    Log(("remR3FlushPage: GCPtr=%VGv\n", GCPtr));
+    Log(("remR3FlushPage: GCPtr=%RGv\n", GCPtr));
     Assert(pVM->rem.s.fInREM || pVM->rem.s.fInStateSync);
 
@@ -1380 +1380 @@
     if (RT_FAILURE(rc))
     {
-        AssertMsgFailed(("remR3FlushPage %VGv failed with %d!!\n", GCPtr, rc));
+        AssertMsgFailed(("remR3FlushPage %RGv failed with %d!!\n", GCPtr, rc));
         VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
     }
@@ -1566 +1566 @@
     }
 #endif
-    Log(("remR3NotifyTrap: uTrap=%x error=%x next_eip=%VGv eip=%VGv cr2=%VGv\n", uTrap, uErrorCode, pvNextEIP, env->eip, env->cr[2]));
+    Log(("remR3NotifyTrap: uTrap=%x error=%x next_eip=%RGv eip=%RGv cr2=%RGv\n", uTrap, uErrorCode, (RTGCPTR)pvNextEIP, (RTGCPTR)env->eip, (RTGCPTR)env->cr[2]));
     if(   uTrap < 0x20
        && (env->cr[0] & X86_CR0_PE)
@@ -1576 +1576 @@
         if(pVM->rem.s.uPendingException == uTrap && ++pVM->rem.s.cPendingExceptions > 512)
         {
-            LogRel(("VERR_REM_TOO_MANY_TRAPS -> uTrap=%x error=%x next_eip=%VGv eip=%VGv cr2=%VGv\n", uTrap, uErrorCode, pvNextEIP, env->eip, env->cr[2]));
+            LogRel(("VERR_REM_TOO_MANY_TRAPS -> uTrap=%x error=%x next_eip=%RGv eip=%RGv cr2=%RGv\n", uTrap, uErrorCode, (RTGCPTR)pvNextEIP, (RTGCPTR)env->eip, (RTGCPTR)env->cr[2]));
             remR3RaiseRC(env->pVM, VERR_REM_TOO_MANY_TRAPS);
             return VERR_REM_TOO_MANY_TRAPS;
@@ -1744 +1744 @@
         for (i = 0; i < pVM->rem.s.cInvalidatedPages; i++)
         {
-            Log2(("REMR3State: invlpg %VGv\n", pVM->rem.s.aGCPtrInvalidatedPages[i]));
+            Log2(("REMR3State: invlpg %RGv\n", pVM->rem.s.aGCPtrInvalidatedPages[i]));
             tlb_flush_page(&pVM->rem.s.Env, pVM->rem.s.aGCPtrInvalidatedPages[i]);
         }
@@ -2061 +2061 @@
         rc = TRPMResetTrap(pVM);
         AssertRC(rc);
-        Log2(("REMR3State: trap=%02x errcd=%VGv cr2=%VGv nexteip=%VGv%s\n", pVM->rem.s.Env.exception_index, pVM->rem.s.Env.error_code,
-              pVM->rem.s.Env.cr[2], pVM->rem.s.Env.exception_next_eip, pVM->rem.s.Env.exception_is_int ? " software" : ""));
+        Log2(("REMR3State: trap=%02x errcd=%RGv cr2=%RGv nexteip=%RGv%s\n", pVM->rem.s.Env.exception_index, (RTGCPTR)pVM->rem.s.Env.error_code,
+              (RTGCPTR)pVM->rem.s.Env.cr[2], (RTGCPTR)pVM->rem.s.Env.exception_next_eip, pVM->rem.s.Env.exception_is_int ? " software" : ""));
     }
 
@@ -2558 +2558 @@
     for (i = 0; i < pVM->rem.s.cInvalidatedPages; i++)
     {
-        Log2(("REMR3ReplayInvalidatedPages: invlpg %VGv\n", pVM->rem.s.aGCPtrInvalidatedPages[i]));
+        Log2(("REMR3ReplayInvalidatedPages: invlpg %RGv\n", pVM->rem.s.aGCPtrInvalidatedPages[i]));
         tlb_flush_page(&pVM->rem.s.Env, pVM->rem.s.aGCPtrInvalidatedPages[i]);
     }
@@ -2676 +2676 @@
     uint32_t cbBitmap;
     int rc;
-    Log(("REMR3NotifyPhysRamRegister: GCPhys=%VGp cb=%d fFlags=%d\n", GCPhys, cb, fFlags));
+    Log(("REMR3NotifyPhysRamRegister: GCPhys=%RGp cb=%d fFlags=%d\n", GCPhys, cb, fFlags));
     VM_ASSERT_EMT(pVM);
 
@@ -2746 +2746 @@
 REMR3DECL(void) REMR3NotifyPhysRamChunkRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, RTHCUINTPTR pvRam, unsigned fFlags)
 {
-    Log(("REMR3NotifyPhysRamChunkRegister: GCPhys=%VGp cb=%d pvRam=%p fFlags=%d\n", GCPhys, cb, pvRam, fFlags));
+    Log(("REMR3NotifyPhysRamChunkRegister: GCPhys=%RGp cb=%d pvRam=%p fFlags=%d\n", GCPhys, cb, pvRam, fFlags));
     VM_ASSERT_EMT(pVM);
 
@@ -2773 +2773 @@
  * @param   physaddr    The physical address.
  */
-void remR3GrowDynRange(unsigned long physaddr)
+void remR3GrowDynRange(unsigned long physaddr) /** @todo Needs fixing for MSC... */
 {
     int rc;
@@ -2779 +2779 @@
     const RTGCPHYS GCPhys = physaddr;
 
-    LogFlow(("remR3GrowDynRange %VGp\n", physaddr));
+    LogFlow(("remR3GrowDynRange %RGp\n", (RTGCPTR)physaddr));
     rc = PGM3PhysGrowRange(pVM, &GCPhys);
     if (RT_SUCCESS(rc))
         return;
 
-    LogRel(("\nUnable to allocate guest RAM chunk at %VGp\n", physaddr));
-    cpu_abort(cpu_single_env, "Unable to allocate guest RAM chunk at %VGp\n", physaddr);
+    LogRel(("\nUnable to allocate guest RAM chunk at %RGp\n", (RTGCPTR)physaddr));
+    cpu_abort(cpu_single_env, "Unable to allocate guest RAM chunk at %RGp\n", (RTGCPTR)physaddr);
     AssertFatalFailed();
 }
@@ -2804 +2804 @@
 REMR3DECL(void) REMR3NotifyPhysRomRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, void *pvCopy, bool fShadow)
 {
-    Log(("REMR3NotifyPhysRomRegister: GCPhys=%VGp cb=%d pvCopy=%p fShadow=%RTbool\n", GCPhys, cb, pvCopy, fShadow));
+    Log(("REMR3NotifyPhysRomRegister: GCPhys=%RGp cb=%d pvCopy=%p fShadow=%RTbool\n", GCPhys, cb, pvCopy, fShadow));
     VM_ASSERT_EMT(pVM);
 
@@ -2842 +2842 @@
 REMR3DECL(void) REMR3NotifyPhysReserve(PVM pVM, RTGCPHYS GCPhys, RTUINT cb)
 {
-    Log(("REMR3NotifyPhysReserve: GCPhys=%VGp cb=%d\n", GCPhys, cb));
+    Log(("REMR3NotifyPhysReserve: GCPhys=%RGp cb=%d\n", GCPhys, cb));
     VM_ASSERT_EMT(pVM);
 
@@ -2879 +2879 @@
 REMR3DECL(void) REMR3NotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler)
 {
-    Log(("REMR3NotifyHandlerPhysicalRegister: enmType=%d GCPhys=%VGp cb=%VGp fHasHCHandler=%d\n",
+    Log(("REMR3NotifyHandlerPhysicalRegister: enmType=%d GCPhys=%RGp cb=%RGp fHasHCHandler=%d\n",
           enmType, GCPhys, cb, fHasHCHandler));
     VM_ASSERT_EMT(pVM);
@@ -2913 +2913 @@
 REMR3DECL(void) REMR3NotifyHandlerPhysicalDeregister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM)
 {
-    Log(("REMR3NotifyHandlerPhysicalDeregister: enmType=%d GCPhys=%VGp cb=%VGp fHasHCHandler=%RTbool fRestoreAsRAM=%RTbool RAM=%08x\n",
+    Log(("REMR3NotifyHandlerPhysicalDeregister: enmType=%d GCPhys=%RGp cb=%RGp fHasHCHandler=%RTbool fRestoreAsRAM=%RTbool RAM=%08x\n",
           enmType, GCPhys, cb, fHasHCHandler, fRestoreAsRAM, MMR3PhysGetRamSize(pVM)));
     VM_ASSERT_EMT(pVM);
@@ -2959 +2959 @@
 REMR3DECL(void) REMR3NotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM)
 {
-    Log(("REMR3NotifyHandlerPhysicalModify: enmType=%d GCPhysOld=%VGp GCPhysNew=%VGp cb=%VGp fHasHCHandler=%RTbool fRestoreAsRAM=%RTbool\n",
+    Log(("REMR3NotifyHandlerPhysicalModify: enmType=%d GCPhysOld=%RGp GCPhysNew=%RGp cb=%RGp fHasHCHandler=%RTbool fRestoreAsRAM=%RTbool\n",
           enmType, GCPhysOld, GCPhysNew, cb, fHasHCHandler, fRestoreAsRAM));
     VM_ASSERT_EMT(pVM);
@@ -3042 +3042 @@
     {
         target_ulong ret = pTLBEntry->addend + addr;
-        AssertMsg2("remR3PhysGetPhysicalAddressCode: addr=%VGv addr_code=%VGv addend=%VGp ret=%VGp\n",
+        AssertMsg2("remR3PhysGetPhysicalAddressCode: addr=%RGv addr_code=%RGv addend=%RGp ret=%RGp\n",
                    (RTGCPTR)addr, (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, ret);
         return ret;
     }
-    LogRel(("\nTrying to execute code with memory type addr_code=%VGv addend=%VGp at %VGv! (iHandlerMemType=%#x iMMIOMemType=%#x)\n"
+    LogRel(("\nTrying to execute code with memory type addr_code=%RGv addend=%RGp at %RGv! (iHandlerMemType=%#x iMMIOMemType=%#x)\n"
             "*** handlers\n",
             (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, (RTGCPTR)addr, pVM->rem.s.iHandlerMemType, pVM->rem.s.iMMIOMemType));
@@ -3054 +3054 @@
     LogRel(("*** phys\n"));
     DBGFR3Info(pVM, "phys", NULL, DBGFR3InfoLogRelHlp());
-    cpu_abort(env, "Trying to execute code with memory type addr_code=%VGv addend=%VGp at %VGv. (iHandlerMemType=%#x iMMIOMemType=%#x)\n",
+    cpu_abort(env, "Trying to execute code with memory type addr_code=%RGv addend=%RGp at %RGv. (iHandlerMemType=%#x iMMIOMemType=%#x)\n",
               (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, (RTGCPTR)addr, pVM->rem.s.iHandlerMemType, pVM->rem.s.iMMIOMemType);
     AssertFatalFailed();
@@ -3063 +3063 @@
  * Useful for finding non-guest-ram reads/writes.  */
 #if 0 //1 /* disable if it becomes bothersome... */
-# define VBOX_CHECK_ADDR(GCPhys) AssertMsg(PGMPhysIsGCPhysValid(cpu_single_env->pVM, (GCPhys)), ("%VGp\n", (GCPhys)))
+# define VBOX_CHECK_ADDR(GCPhys) AssertMsg(PGMPhysIsGCPhysValid(cpu_single_env->pVM, (GCPhys)), ("%RGp\n", (GCPhys)))
 #else
 # define VBOX_CHECK_ADDR(GCPhys) do { } while (0)
@@ -3328 +3328 @@
     int rc = IOMMMIORead((PVM)pvVM, GCPhys, &u32, 1);
     AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
-    Log2(("remR3MMIOReadU8: GCPhys=%VGp -> %02x\n", GCPhys, u32));
+    Log2(("remR3MMIOReadU8: GCPhys=%RGp -> %02x\n", GCPhys, u32));
     return u32;
 }
@@ -3338 +3338 @@
     int rc = IOMMMIORead((PVM)pvVM, GCPhys, &u32, 2);
     AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
-    Log2(("remR3MMIOReadU16: GCPhys=%VGp -> %04x\n", GCPhys, u32));
+    Log2(("remR3MMIOReadU16: GCPhys=%RGp -> %04x\n", GCPhys, u32));
     return u32;
 }
@@ -3348 +3348 @@
     int rc = IOMMMIORead((PVM)pvVM, GCPhys, &u32, 4);
     AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
-    Log2(("remR3MMIOReadU32: GCPhys=%VGp -> %08x\n", GCPhys, u32));
+    Log2(("remR3MMIOReadU32: GCPhys=%RGp -> %08x\n", GCPhys, u32));
     return u32;
 }
@@ -3356 +3356 @@
 {
     int rc;
-    Log2(("remR3MMIOWriteU8: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
+    Log2(("remR3MMIOWriteU8: GCPhys=%RGp u32=%#x\n", GCPhys, u32));
     rc = IOMMMIOWrite((PVM)pvVM, GCPhys, u32, 1);
     AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
@@ -3365 +3365 @@
 {
     int rc;
-    Log2(("remR3MMIOWriteU16: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
+    Log2(("remR3MMIOWriteU16: GCPhys=%RGp u32=%#x\n", GCPhys, u32));
     rc = IOMMMIOWrite((PVM)pvVM, GCPhys, u32, 2);
     AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
@@ -3374 +3374 @@
 {
     int rc;
-    Log2(("remR3MMIOWriteU32: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
+    Log2(("remR3MMIOWriteU32: GCPhys=%RGp u32=%#x\n", GCPhys, u32));
     rc = IOMMMIOWrite((PVM)pvVM, GCPhys, u32, 4);
     AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
@@ -3388 +3388 @@
 {
     uint8_t u8;
-    Log2(("remR3HandlerReadU8: GCPhys=%VGp\n", GCPhys));
+    Log2(("remR3HandlerReadU8: GCPhys=%RGp\n", GCPhys));
     PGMPhysRead((PVM)pvVM, GCPhys, &u8, sizeof(u8));
     return u8;
@@ -3396 +3396 @@
 {
     uint16_t u16;
-    Log2(("remR3HandlerReadU16: GCPhys=%VGp\n", GCPhys));
+    Log2(("remR3HandlerReadU16: GCPhys=%RGp\n", GCPhys));
     PGMPhysRead((PVM)pvVM, GCPhys, &u16, sizeof(u16));
     return u16;
@@ -3404 +3404 @@
 {
     uint32_t u32;
-    Log2(("remR3HandlerReadU32: GCPhys=%VGp\n", GCPhys));
+    Log2(("remR3HandlerReadU32: GCPhys=%RGp\n", GCPhys));
     PGMPhysRead((PVM)pvVM, GCPhys, &u32, sizeof(u32));
     return u32;
@@ -3411 +3411 @@
 static void     remR3HandlerWriteU8(void *pvVM, target_phys_addr_t GCPhys, uint32_t u32)
 {
-    Log2(("remR3HandlerWriteU8: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
+    Log2(("remR3HandlerWriteU8: GCPhys=%RGp u32=%#x\n", GCPhys, u32));
     PGMPhysWrite((PVM)pvVM, GCPhys, &u32, sizeof(uint8_t));
 }
@@ -3417 +3417 @@
 static void     remR3HandlerWriteU16(void *pvVM, target_phys_addr_t GCPhys, uint32_t u32)
 {
-    Log2(("remR3HandlerWriteU16: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
+    Log2(("remR3HandlerWriteU16: GCPhys=%RGp u32=%#x\n", GCPhys, u32));
     PGMPhysWrite((PVM)pvVM, GCPhys, &u32, sizeof(uint16_t));
 }
@@ -3423 +3423 @@
 static void     remR3HandlerWriteU32(void *pvVM, target_phys_addr_t GCPhys, uint32_t u32)
 {
-    Log2(("remR3HandlerWriteU32: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
+    Log2(("remR3HandlerWriteU32: GCPhys=%RGp u32=%#x\n", GCPhys, u32));
     PGMPhysWrite((PVM)pvVM, GCPhys, &u32, sizeof(uint32_t));
 }
@@ -3792 +3792 @@
          * Do the disassembling.
          */
-        RTLogPrintf("Guest Code: PC=%VGp #VGp (%VGp) bytes fFlags=%d\n", uCode, cb, cb, fFlags);
+        RTLogPrintf("Guest Code: PC=%RGp %#VGp (%RGp) bytes fFlags=%d\n", uCode, cb, cb, fFlags);
         cs = cpu_single_env->segs[R_CS].selector;
         eip = uCode - cpu_single_env->segs[R_CS].base;
@@ -3806 +3806 @@
                                         &cbInstr);
             if (RT_SUCCESS(rc))
-                RTLogPrintf("%VGp %s\n", uCode, szBuf);
+                RTLogPrintf("%RGp %s\n", uCode, szBuf);
             else
             {
-                RTLogPrintf("%VGp %04x:%VGp: %s\n", uCode, cs, eip, szBuf);
+                RTLogPrintf("%RGp %04x:%RGp: %s\n", uCode, cs, eip, szBuf);
                 cbInstr = 1;
             }