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

Timestamp:

Oct 31, 2011 3:36:29 PM (14 years ago)

Author:

vboxsync

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

74616

Message:

IOM: Added flags for dropping into the vbox debugger on complicated MMIO accesses. DBGF: some namespace cleanups.

Location:

trunk/include/VBox/vmm

Files:

• dbgf.h (modified) (15 diffs)
• iom.h (modified) (1 diff)

trunk/include/VBox/vmm/dbgf.h

@@ -54 +54 @@
 
 
+#ifdef IN_RING3
+
 /**
  * Mixed address.
@@ -124 +126 @@
 VMMR3DECL(PDBGFADDRESS) DBGFR3AddrSub(PDBGFADDRESS pAddress, RTGCUINTPTR uSubtrahend);
 
+#endif /* IN_RING3 */
 
 
@@ -265 +268 @@
 typedef const DBGFEVENT *PCDBGFEVENT;
 
+#ifdef IN_RING3 /* The event API only works in ring-3. */
 
 /** @def DBGFSTOP
@@ -272 +276 @@
  * @param   pVM     VM Handle.
  */
-#ifdef VBOX_STRICT
-# define DBGFSTOP(pVM)  DBGFR3EventSrc(pVM, DBGFEVENT_DEV_STOP, __FILE__, __LINE__, __PRETTY_FUNCTION__, NULL)
-#else
-# define DBGFSTOP(pVM)  VINF_SUCCESS
-#endif
+# ifdef VBOX_STRICT
+#  define DBGFSTOP(pVM)  DBGFR3EventSrc(pVM, DBGFEVENT_DEV_STOP, __FILE__, __LINE__, __PRETTY_FUNCTION__, NULL)
+# else
+#  define DBGFSTOP(pVM)  VINF_SUCCESS
+# endif
 
 VMMR3DECL(int)  DBGFR3Init(PVM pVM);
@@ -296 +300 @@
 VMMR3DECL(int)  DBGFR3Step(PVM pVM, VMCPUID idCpu);
 VMMR3DECL(int)  DBGFR3PrgStep(PVMCPU pVCpu);
+
+#endif /* IN_RING3 */
+
 
 
@@ -377 +384 @@
 typedef const DBGFBP *PCDBGFBP;
 
-
+#ifdef IN_RING3 /* The breakpoint management API is only available in ring-3. */
 VMMR3DECL(int)  DBGFR3BpSet(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, uint32_t *piBp);
 VMMR3DECL(int)  DBGFR3BpSetReg(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable,
@@ -399 +406 @@
 
 VMMR3DECL(int)          DBGFR3BpEnum(PVM pVM, PFNDBGFBPENUM pfnCallback, void *pvUser);
+#endif /* IN_RING3 */
+
 VMMDECL(RTGCUINTREG)    DBGFBpGetDR7(PVM pVM);
 VMMDECL(RTGCUINTREG)    DBGFBpGetDR0(PVM pVM);
@@ -407 +416 @@
 
 
-
+#ifdef IN_RING3 /* The CPU mode API only works in ring-3. */
 VMMR3DECL(CPUMMODE)     DBGFR3CpuGetMode(PVM pVM, VMCPUID idCpu);
-
-
-
+#endif
+
+
+
+#ifdef IN_RING3 /* The info callbacks API only works in ring-3. */
 
 /**
@@ -551 +562 @@
 VMMR3DECL(PCDBGFINFOHLP)    DBGFR3InfoLogRelHlp(void);
 
-
-
+#endif /* IN_RING3 */
+
+
+#ifdef IN_RING3 /* The log contrl API only works in ring-3. */
 VMMR3DECL(int) DBGFR3LogModifyGroups(PVM pVM, const char *pszGroupSettings);
 VMMR3DECL(int) DBGFR3LogModifyFlags(PVM pVM, const char *pszFlagSettings);
 VMMR3DECL(int) DBGFR3LogModifyDestinations(PVM pVM, const char *pszDestSettings);
-
-
+#endif /* IN_RING3 */
+
+#ifdef IN_RING3 /* The debug information management APIs only works in ring-3. */
 
 /** Max length (including '\\0') of a symbol name. */
@@ -621 +635 @@
 /** The last special one. */
 #define DBGF_AS_LAST                DBGF_AS_GLOBAL
+#endif
 /** The number of special address space handles. */
 #define DBGF_AS_COUNT               (6U)
+#ifdef IN_RING3
 /** Converts an alias handle to an array index. */
 #define DBGF_AS_ALIAS_2_INDEX(hAlias) \
@@ -663 +679 @@
 VMMR3DECL(void)         DBGFR3LineFree(PDBGFLINE pLine);
 
+#endif /* IN_RING3 */
+
+#ifdef IN_RING3 /* The stack API only works in ring-3. */
 
 /**
@@ -795 +814 @@
 /** Set if the content of the frame is filled in by DBGFR3StackWalk() and can be used
  * to construct the next frame. */
-#define DBGFSTACKFRAME_FLAGS_ALL_VALID  RT_BIT(0)
+# define DBGFSTACKFRAME_FLAGS_ALL_VALID RT_BIT(0)
 /** This is the last stack frame we can read.
  * This flag is not set if the walk stop because of max dept or recursion. */
-#define DBGFSTACKFRAME_FLAGS_LAST       RT_BIT(1)
+# define DBGFSTACKFRAME_FLAGS_LAST      RT_BIT(1)
 /** This is the last record because we detected a loop. */
-#define DBGFSTACKFRAME_FLAGS_LOOP       RT_BIT(2)
+# define DBGFSTACKFRAME_FLAGS_LOOP      RT_BIT(2)
 /** This is the last record because we reached the maximum depth. */
-#define DBGFSTACKFRAME_FLAGS_MAX_DEPTH  RT_BIT(3)
+# define DBGFSTACKFRAME_FLAGS_MAX_DEPTH RT_BIT(3)
 /** 16-bit frame. */
-#define DBGFSTACKFRAME_FLAGS_16BIT      RT_BIT(4)
+# define DBGFSTACKFRAME_FLAGS_16BIT     RT_BIT(4)
 /** 32-bit frame. */
-#define DBGFSTACKFRAME_FLAGS_32BIT      RT_BIT(5)
+# define DBGFSTACKFRAME_FLAGS_32BIT     RT_BIT(5)
 /** 64-bit frame. */
-#define DBGFSTACKFRAME_FLAGS_64BIT      RT_BIT(6)
+# define DBGFSTACKFRAME_FLAGS_64BIT     RT_BIT(6)
 /** @} */
 
@@ -835 +854 @@
 VMMR3DECL(void)             DBGFR3StackWalkEnd(PCDBGFSTACKFRAME pFirstFrame);
 
-
-
+#endif /* IN_RING3 */
+
+
+#ifdef IN_RING3 /* The disassembly API only works in ring-3. */
 
 /** Flags to pass to DBGFR3DisasInstrEx().
@@ -900 +921 @@
  * @thread Any EMT.
  */
-#ifdef LOG_ENABLED
-# define DBGFR3DisasInstrLog(pVCpu, Sel, GCPtr) \
+# ifdef LOG_ENABLED
+#  define DBGFR3DisasInstrLog(pVCpu, Sel, GCPtr) \
     do { \
         if (LogIsEnabled()) \
             DBGFR3DisasInstrLogInternal(pVCpu, Sel, GCPtr); \
     } while (0)
-#else
-# define DBGFR3DisasInstrLog(pVCpu, Sel, GCPtr) do { } while (0)
+# else
+#  define DBGFR3DisasInstrLog(pVCpu, Sel, GCPtr) do { } while (0)
+# endif
 #endif
 
 
+#ifdef IN_RING3
 VMMR3DECL(int) DBGFR3MemScan(PVM pVM, VMCPUID idCpu, PCDBGFADDRESS pAddress, RTGCUINTPTR cbRange, RTGCUINTPTR uAlign,
                              const void *pvNeedle, size_t cbNeedle, PDBGFADDRESS pHitAddress);
@@ -916 +939 @@
 VMMR3DECL(int) DBGFR3MemReadString(PVM pVM, VMCPUID idCpu, PCDBGFADDRESS pAddress, char *pszBuf, size_t cbBuf);
 VMMR3DECL(int) DBGFR3MemWrite(PVM pVM, VMCPUID idCpu, PCDBGFADDRESS pAddress, void const *pvBuf, size_t cbRead);
+#endif
 
 

trunk/include/VBox/vmm/iom.h

@@ -120 +120 @@
 #define IOMMMIO_FLAGS_WRITE_MODE                        UINT32_C(0x00000070)
 
+/** Whether to do a DBGSTOP on complicated reads.
+ * What this includes depends on the read mode, but generally all misaligned
+ * reads as well as word and byte reads and maybe qword reads. */
+#define IOMMMIO_FLAGS_DBGSTOP_ON_COMPLICATED_READ       UINT32_C(0x00000100)
+/** Whether to do a DBGSTOP on complicated writes.
+ * This depends on the write mode, but generally all writes where we have to
+ * supply bytes (zero them or read them). */
+#define IOMMMIO_FLAGS_DBGSTOP_ON_COMPLICATED_WRITE      UINT32_C(0x00000200)
+
 /** Mask of valid flags. */
-#define IOMMMIO_FLAGS_VALID_MASK                        UINT32_C(0x00000073)
+#define IOMMMIO_FLAGS_VALID_MASK                        UINT32_C(0x00000373)
 /** @} */