Changeset 19334 in vbox for trunk/include

Timestamp:

May 4, 2009 4:03:57 PM (16 years ago)

Author:

vboxsync

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

46812

Message:

DBGF,SELM,DBGC,++: Refactored the selector info querying and usage, mainly for fixing VM_ASSERT_EMT issues cropping up after from #3170, but also for moving the external interface to DBGF.

Location:

trunk/include/VBox

Files:

• dbgf.h (modified) (2 diffs)
• dbgfsel.h (added)
• selm.h (modified) (3 diffs)

trunk/include/VBox/dbgf.h

@@ -35 +35 @@
 #include <VBox/vmm.h>
 #include <VBox/log.h>                   /* LOG_ENABLED */
+#include <VBox/dbgfsel.h>
 
 #include <iprt/stdarg.h>
@@ -814 +815 @@
 
 
+/** @name DBGFR3SelQueryInfo flags.
+ * @{ */
+/** Get the info from the guest descriptor table. */
+#define DBGFSELQI_FLAGS_DT_GUEST        UINT32_C(0)
+/** Get the info from the shadow descriptor table.
+ * Only works in raw-mode.  */
+#define DBGFSELQI_FLAGS_DT_SHADOW       UINT32_C(1)
+/** @} */
+VMMR3DECL(int) DBGFR3SelQueryInfo(PVM pVM, VMCPUID idCpu, RTSEL Sel, uint32_t fFlags, PDBGFSELINFO pSelInfo);
+
+
 /**
  * Guest OS digger interface identifier.

trunk/include/VBox/selm.h

@@ -35 +35 @@
 #include <VBox/x86.h>
 #include <VBox/dis.h>
+#include <VBox/dbgfsel.h>
 
 
@@ -85 +86 @@
 VMMDECL(int)        SELMGetLDTFromSel(PVM pVM, RTSEL SelLdt, PRTGCPTR ppvLdt, unsigned *pcbLimit);
 
-/**
- * Selector information structure.
- */
-typedef struct SELMSELINFO
-{
-    /** The base address. */
-    RTGCPTR         GCPtrBase;
-    /** The limit (-1). */
-    RTGCUINTPTR     cbLimit;
-    /** The raw descriptor. */
-    union
-    {
-        X86DESC     Raw;
-        X86DESC64   Raw64;
-    };
-    /** The selector. */
-    RTSEL           Sel;
-    /** Set if the selector is used by the hypervisor. */
-    bool            fHyper;
-    /** Set if the selector is a real mode segment. */
-    bool            fRealMode;
-} SELMSELINFO;
-/** Pointer to a SELM selector information struct. */
-typedef SELMSELINFO *PSELMSELINFO;
-/** Pointer to a const SELM selector information struct. */
-typedef const SELMSELINFO *PCSELMSELINFO;
-
-VMMDECL(int)        SELMSelInfoValidateCS(PCSELMSELINFO pSelInfo, RTSEL SelCPL);
-
-/** @def SELMSelInfoIsExpandDown
- * Tests whether the selector info describes an expand-down selector or now.
- *
- * @returns true / false.
- * @param   pSelInfo        The selector info.
- *
- * @remark  Realized as a macro for reasons of speed/lazyness and to avoid
- *          dragging in VBox/x86.h for now.
- */
-#define SELMSelInfoIsExpandDown(pSelInfo) \
-    (   (pSelInfo)->Raw.Gen.u1DescType \
-     && ((pSelInfo)->Raw.Gen.u4Type & (X86_SEL_TYPE_DOWN | X86_SEL_TYPE_CODE)) == X86_SEL_TYPE_DOWN)
-
 
 #ifdef IN_RING3
@@ -140 +99 @@
 VMMR3DECL(int)      SELMR3UpdateFromCPUM(PVM pVM, PVMCPU pVCpu);
 VMMR3DECL(int)      SELMR3SyncTSS(PVM pVM, PVMCPU pVCpu);
-VMMR3DECL(int)      SELMR3GetSelectorInfo(PVM pVM, PVMCPU pVCpu, RTSEL Sel, PSELMSELINFO pSelInfo);
-VMMR3DECL(int)      SELMR3GetShadowSelectorInfo(PVM pVM, RTSEL Sel, PSELMSELINFO pSelInfo);
+VMMR3DECL(int)      SELMR3GetSelectorInfo(PVM pVM, PVMCPU pVCpu, RTSEL Sel, PDBGFSELINFO pSelInfo);
+VMMR3DECL(int)      SELMR3GetShadowSelectorInfo(PVM pVM, RTSEL Sel, PDBGFSELINFO pSelInfo);
 VMMR3DECL(void)     SELMR3DisableMonitoring(PVM pVM);
 VMMR3DECL(void)     SELMR3DumpDescriptor(X86DESC  Desc, RTSEL Sel, const char *pszMsg);