Changeset 13837 in vbox for trunk/src/recompiler

Timestamp:

Nov 5, 2008 2:54:02 AM (16 years ago)

Author:

vboxsync

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

38828

Message:

s/%Vr\([acfs]\)/%Rr\1/g - since I'm upsetting everyone anyway, better make the most of it...

Location:

trunk/src/recompiler

Files:

• VBoxREMWrapper.cpp (modified) (2 diffs)
• VBoxRecompiler.c (modified) (28 diffs)

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -1844 +1844 @@
                     RTUINTPTR Value;
                     rc = RTLdrGetSymbolEx(g_ModREM2, g_pvREM2, (RTUINTPTR)g_pvREM2, g_aExports[i].pszName, &Value);
-                    AssertMsgRC(rc, ("%s rc=%Vrc\n", g_aExports[i].pszName, rc));
+                    AssertMsgRC(rc, ("%s rc=%Rrc\n", g_aExports[i].pszName, rc));
                     if (RT_FAILURE(rc))
                         break;
@@ -1859 +1859 @@
         g_ModREM2 = NIL_RTLDRMOD;
     }
-    LogRel(("REM: failed loading '%s', rc=%Vrc\n", szPath, rc));
+    LogRel(("REM: failed loading '%s', rc=%Rrc\n", szPath, rc));
     return rc;
 }

trunk/src/recompiler/VBoxRecompiler.c

@@ -801 +801 @@
                         break;
                     }
-                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_DEBUG rc=%Vrc iBP=%d GCPtrPC=%VGv\n", rc, iBP, GCPtrPC));
+                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_DEBUG rc=%Rrc iBP=%d GCPtrPC=%VGv\n", rc, iBP, GCPtrPC));
                 break;
             }
@@ -942 +942 @@
              */
             case EXCP_RC:
-                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_RC rc=%Vrc\n", pVM->rem.s.rc));
+                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_RC rc=%Rrc\n", pVM->rem.s.rc));
                 rc = pVM->rem.s.rc;
                 pVM->rem.s.rc = VERR_INTERNAL_ERROR;
@@ -967 +967 @@
     }
 
-    Log2(("REMR3EmulateInstruction: returns %Vrc (cs:eip=%04x:%VGv)\n",
+    Log2(("REMR3EmulateInstruction: returns %Rrc (cs:eip=%04x:%VGv)\n",
           rc, pVM->rem.s.Env.segs[R_CS].selector, pVM->rem.s.Env.eip));
     return rc;
@@ -1055 +1055 @@
                     break;
                 }
-            Log2(("REMR3Run: cpu_exec -> EXCP_DEBUG rc=%Vrc iBP=%d GCPtrPC=%VGv\n", rc, iBP, GCPtrPC));
+            Log2(("REMR3Run: cpu_exec -> EXCP_DEBUG rc=%Rrc iBP=%d GCPtrPC=%VGv\n", rc, iBP, GCPtrPC));
 #endif
             break;
@@ -1090 +1090 @@
          */
         case EXCP_RC:
-            Log2(("REMR3Run: cpu_exec -> EXCP_RC rc=%Vrc\n", pVM->rem.s.rc));
+            Log2(("REMR3Run: cpu_exec -> EXCP_RC rc=%Rrc\n", pVM->rem.s.rc));
             rc = pVM->rem.s.rc;
             pVM->rem.s.rc = VERR_INTERNAL_ERROR;
@@ -1105 +1105 @@
     }
 
-    Log2(("REMR3Run: returns %Vrc (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:%VGv)\n", rc, pVM->rem.s.Env.segs[R_CS].selector, pVM->rem.s.Env.eip));
     return rc;
 }
@@ -1509 +1509 @@
     rc = PGMChangeMode(pVM, env->cr[0], env->cr[4], env->efer);
     if (rc != VINF_SUCCESS)
-        cpu_abort(env, "PGMChangeMode(, %RX64, %RX64, %RX64) -> %Vrc\n", env->cr[0], env->cr[4], env->efer, rc);
+        cpu_abort(env, "PGMChangeMode(, %RX64, %RX64, %RX64) -> %Rrc\n", env->cr[0], env->cr[4], env->efer, rc);
 #else
     rc = PGMChangeMode(pVM, env->cr[0], env->cr[4], 0);
     if (rc != VINF_SUCCESS)
-        cpu_abort(env, "PGMChangeMode(, %RX64, %RX64, %RX64) -> %Vrc\n", env->cr[0], env->cr[4], 0LL, rc);
+        cpu_abort(env, "PGMChangeMode(, %RX64, %RX64, %RX64) -> %Rrc\n", env->cr[0], env->cr[4], 0LL, rc);
 #endif
 }
@@ -3271 +3271 @@
     uint32_t u32 = 0;
     int rc = IOMMMIORead((PVM)pvVM, GCPhys, &u32, 1);
-    AssertMsg(rc == VINF_SUCCESS, ("rc=%Vrc\n", rc)); NOREF(rc);
+    AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
     Log2(("remR3MMIOReadU8: GCPhys=%VGp -> %02x\n", GCPhys, u32));
     return u32;
@@ -3281 +3281 @@
     uint32_t u32 = 0;
     int rc = IOMMMIORead((PVM)pvVM, GCPhys, &u32, 2);
-    AssertMsg(rc == VINF_SUCCESS, ("rc=%Vrc\n", rc)); NOREF(rc);
+    AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
     Log2(("remR3MMIOReadU16: GCPhys=%VGp -> %04x\n", GCPhys, u32));
     return u32;
@@ -3291 +3291 @@
     uint32_t u32 = 0;
     int rc = IOMMMIORead((PVM)pvVM, GCPhys, &u32, 4);
-    AssertMsg(rc == VINF_SUCCESS, ("rc=%Vrc\n", rc)); NOREF(rc);
+    AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
     Log2(("remR3MMIOReadU32: GCPhys=%VGp -> %08x\n", GCPhys, u32));
     return u32;
@@ -3301 +3301 @@
     Log2(("remR3MMIOWriteU8: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
     int rc = IOMMMIOWrite((PVM)pvVM, GCPhys, u32, 1);
-    AssertMsg(rc == VINF_SUCCESS, ("rc=%Vrc\n", rc)); NOREF(rc);
+    AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
 }
 
@@ -3309 +3309 @@
     Log2(("remR3MMIOWriteU16: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
     int rc = IOMMMIOWrite((PVM)pvVM, GCPhys, u32, 2);
-    AssertMsg(rc == VINF_SUCCESS, ("rc=%Vrc\n", rc)); NOREF(rc);
+    AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
 }
 
@@ -3317 +3317 @@
     Log2(("remR3MMIOWriteU32: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
     int rc = IOMMMIOWrite((PVM)pvVM, GCPhys, u32, 4);
-    AssertMsg(rc == VINF_SUCCESS, ("rc=%Vrc\n", rc)); NOREF(rc);
+    AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
 }
 
@@ -4013 +4013 @@
 void remR3RaiseRC(PVM pVM, int rc)
 {
-    Log(("remR3RaiseRC: rc=%Vrc\n", rc));
+    Log(("remR3RaiseRC: rc=%Rrc\n", rc));
     Assert(pVM->rem.s.fInREM);
     VM_ASSERT_EMT(pVM);
@@ -4061 +4061 @@
         rc = PDMGetInterrupt(env->pVM, &u8Interrupt);
 
-    LogFlow(("cpu_get_pic_interrupt: u8Interrupt=%d rc=%Vrc\n", u8Interrupt, rc));
+    LogFlow(("cpu_get_pic_interrupt: u8Interrupt=%d rc=%Rrc\n", u8Interrupt, rc));
     if (RT_SUCCESS(rc))
     {
@@ -4077 +4077 @@
 {
     int rc = PDMApicSetBase(env->pVM, val);
-    LogFlow(("cpu_set_apic_base: val=%#llx rc=%Vrc\n", val, rc)); NOREF(rc);
+    LogFlow(("cpu_set_apic_base: val=%#llx rc=%Rrc\n", val, rc)); NOREF(rc);
 }
 
@@ -4089 +4089 @@
         return u64;
     }
-    LogFlow(("cpu_get_apic_base: returns 0 (rc=%Vrc)\n", rc));
+    LogFlow(("cpu_get_apic_base: returns 0 (rc=%Rrc)\n", rc));
     return 0;
 }
@@ -4096 +4096 @@
 {
     int rc = PDMApicSetTPR(env->pVM, val);
-    LogFlow(("cpu_set_apic_tpr: val=%#x rc=%Vrc\n", val, rc)); NOREF(rc);
+    LogFlow(("cpu_set_apic_tpr: val=%#x rc=%Rrc\n", val, rc)); NOREF(rc);
 }
 
@@ -4108 +4108 @@
         return u8;
     }
-    LogFlow(("cpu_get_apic_tpr: returns 0 (rc=%Vrc)\n", rc));
+    LogFlow(("cpu_get_apic_tpr: returns 0 (rc=%Rrc)\n", rc));
     return 0;
 }
@@ -4123 +4123 @@
     }
     /** @todo: exception ? */
-    LogFlow(("cpu_apic_rdms returns 0 (rc=%Vrc)\n", rc));
+    LogFlow(("cpu_apic_rdms returns 0 (rc=%Rrc)\n", rc));
     return value;
 }
@@ -4131 +4131 @@
     int rc = PDMApicWriteMSR(env->pVM, 0 /* cpu */, reg, value);
     /** @todo: exception if error ? */
-    LogFlow(("cpu_apic_wrmsr: rc=%Vrc\n", rc)); NOREF(rc);
+    LogFlow(("cpu_apic_wrmsr: rc=%Rrc\n", rc)); NOREF(rc);
 }
 /* -+- I/O Ports -+- */
@@ -4148 +4148 @@
     if (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST)
     {
-        Log(("cpu_outb: addr=%#06x val=%#x -> %Vrc\n", addr, val, rc));
+        Log(("cpu_outb: addr=%#06x val=%#x -> %Rrc\n", addr, val, rc));
         remR3RaiseRC(env->pVM, rc);
         return;
@@ -4163 +4163 @@
     if (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST)
     {
-        Log(("cpu_outw: addr=%#06x val=%#x -> %Vrc\n", addr, val, rc));
+        Log(("cpu_outw: addr=%#06x val=%#x -> %Rrc\n", addr, val, rc));
         remR3RaiseRC(env->pVM, rc);
         return;
@@ -4178 +4178 @@
     if (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST)
     {
-        Log(("cpu_outl: addr=%#06x val=%#x -> %Vrc\n", addr, val, rc));
+        Log(("cpu_outl: addr=%#06x val=%#x -> %Rrc\n", addr, val, rc));
         remR3RaiseRC(env->pVM, rc);
         return;
@@ -4197 +4197 @@
     if (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST)
     {
-        Log(("cpu_inb: addr=%#06x -> %#x rc=%Vrc\n", addr, u32, rc));
+        Log(("cpu_inb: addr=%#06x -> %#x rc=%Rrc\n", addr, u32, rc));
         remR3RaiseRC(env->pVM, rc);
         return (int)u32;
@@ -4216 +4216 @@
     if (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST)
     {
-        Log(("cpu_inw: addr=%#06x -> %#x rc=%Vrc\n", addr, u32, rc));
+        Log(("cpu_inw: addr=%#06x -> %#x rc=%Rrc\n", addr, u32, rc));
         remR3RaiseRC(env->pVM, rc);
         return (int)u32;
@@ -4237 +4237 @@
     if (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST)
     {
-        Log(("cpu_inl: addr=%#06x -> %#x rc=%Vrc\n", addr, u32, rc));
+        Log(("cpu_inl: addr=%#06x -> %#x rc=%Rrc\n", addr, u32, rc));
         remR3RaiseRC(env->pVM, rc);
         return (int)u32;
@@ -4341 +4341 @@
      * Bitch about it.
      */
-    RTLogPrintf("internal REM fatal error: rc=%Vrc %s\n", rc, pszTip);
-    AssertReleaseMsgFailed(("internal REM fatal error: rc=%Vrc %s\n", rc, pszTip));
+    RTLogPrintf("internal REM fatal error: rc=%Rrc %s\n", rc, pszTip);
+    AssertReleaseMsgFailed(("internal REM fatal error: rc=%Rrc %s\n", rc, pszTip));
 
     /*