Changeset 41764 in vbox

Timestamp:

Jun 15, 2012 5:36:56 PM (13 years ago)

Author:

vboxsync

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

78581

Message:

VMM: Retired CPUMR3DisasmInstr in favor of DBGFR3DisasInstrLog.

Location:

trunk

Files:

• include/VBox/vmm/cpumdis.h (modified) (1 diff)
• include/VBox/vmm/dbgf.h (modified) (2 diffs)
• src/VBox/VMM/VMMR3/DBGFDisas.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/PATM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/cpumdis.h

@@ -39 +39 @@
 #ifdef IN_RING3
 VMMR3DECL(int) CPUMR3DisasmInstrCPU(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, RTGCPTR GCPtrPC, PDISCPUSTATE pCpu, const char *pszPrefix);
-
-# ifdef DEBUG
-/** @deprecated  Use DBGFR3DisasInstrCurrentLog().  */
-VMMR3DECL(void) CPUMR3DisasmInstr(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, RTGCPTR pc, const char *pszPrefix);
-# else
-/** @deprecated  Use DBGFR3DisasInstrCurrentLog(). */
-#  define CPUMR3DisasmInstr(pVM, pVCpu, pCtx, pc, pszPrefix)                   do {} while (0)
-# endif
-
-#endif /* IN_RING3 */
+#endif
 
 /** @} */

trunk/include/VBox/vmm/dbgf.h

@@ -914 +914 @@
 #endif
 
-VMMR3DECL(int) DBGFR3DisasInstrLogInternal(PVMCPU pVCpu, RTSEL Sel, RTGCPTR GCPtr);
+VMMR3DECL(int) DBGFR3DisasInstrLogInternal(PVMCPU pVCpu, RTSEL Sel, RTGCPTR GCPtr, const char *pszPrefix);
 
 /** @def DBGFR3DisasInstrLog
@@ -922 +922 @@
  */
 # ifdef LOG_ENABLED
-#  define DBGFR3DisasInstrLog(pVCpu, Sel, GCPtr) \
+#  define DBGFR3DisasInstrLog(pVCpu, Sel, GCPtr, pszPrefix) \
     do { \
         if (LogIsEnabled()) \
-            DBGFR3DisasInstrLogInternal(pVCpu, Sel, GCPtr); \
+            DBGFR3DisasInstrLogInternal(pVCpu, Sel, GCPtr, pszPrefix); \
     } while (0)
 # else
-#  define DBGFR3DisasInstrLog(pVCpu, Sel, GCPtr) do { } while (0)
+#  define DBGFR3DisasInstrLog(pVCpu, Sel, GCPtr, pszPrefix) do { } while (0)
 # endif
 #endif

trunk/src/VBox/VMM/VMMR3/DBGFDisas.cpp

@@ -639 +639 @@
         RTStrPrintf(szBuf, sizeof(szBuf), "DBGFR3DisasInstrCurrentLog failed with rc=%Rrc\n", rc);
     if (pszPrefix && *pszPrefix)
-        RTLogPrintf("%s-CPU%d: %s\n", pszPrefix, pVCpu->idCpu, szBuf);
+        RTLogPrintf("%s-CPU%u: %s\n", pszPrefix, pVCpu->idCpu, szBuf);
     else
         RTLogPrintf("%s\n", szBuf);
@@ -657 +657 @@
  *                          calculation of the actual instruction address.
  * @param   GCPtr           The code address relative to the base of Sel.
- */
-VMMR3DECL(int) DBGFR3DisasInstrLogInternal(PVMCPU pVCpu, RTSEL Sel, RTGCPTR GCPtr)
+ * @param   pszPrefix       Short prefix string to the disassembly string. (optional)
+ */
+VMMR3DECL(int) DBGFR3DisasInstrLogInternal(PVMCPU pVCpu, RTSEL Sel, RTGCPTR GCPtr, const char *pszPrefix)
 {
     char szBuf[256];
@@ -665 +666 @@
     if (RT_FAILURE(rc))
         RTStrPrintf(szBuf, sizeof(szBuf), "DBGFR3DisasInstrLog(, %RTsel, %RGv) failed with rc=%Rrc\n", Sel, GCPtr, rc);
-    RTLogPrintf("%s\n", szBuf);
+    if (pszPrefix && *pszPrefix)
+        RTLogPrintf("%s-CPU%u: %s\n", pszPrefix, pVCpu->idCpu, szBuf);
+    else
+        RTLogPrintf("%s\n", szBuf);
     return rc;
 }

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

@@ -6468 +6468 @@
 
     Log2(("pPatchBlockGC %RRv - pEip %RRv corresponding GC address %RRv\n", PATCHCODE_PTR_GC(&pPatch->patch), pEip, pNewEip));
-#ifdef LOG_ENABLED
-    CPUMR3DisasmInstr(pVM, pVCpu, pCtx, pNewEip, "PATCHRET: ");
-#endif
+    DBGFR3DisasInstrLog(pVCpu, pCtx->cs, pNewEip, "PATCHRET: ");
     if (pNewEip >= pPatch->patch.pPrivInstrGC && pNewEip < pPatch->patch.pPrivInstrGC + pPatch->patch.cbPatchJump)
     {