Changeset 41764 in vbox for trunk/include/VBox/vmm

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/include/VBox/vmm

Files:

• cpumdis.h (modified) (1 diff)
• dbgf.h (modified) (2 diffs)

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