Changeset 22105 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 8, 2009 2:54:59 PM (16 years ago)

Author:

vboxsync

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

50854

Message:

DBGF: Added DBGFSELQI_FLAGS_DT_ADJ_64BIT_MODE for making stack walking work - it's a gross hack. A more proper solution would mean adding more context to sel:off conversions, no time for that now.

Location:

trunk/src/VBox/VMM

Files:

• DBGFAddr.cpp (modified) (1 diff)
• DBGFMem.cpp (modified) (2 diffs)
• SELM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/DBGFAddr.cpp

@@ -69 +69 @@
     {
         DBGFSELINFO SelInfo;
-        int rc = DBGFR3SelQueryInfo(pVM, idCpu, Sel, DBGFSELQI_FLAGS_DT_GUEST, &SelInfo);
+        int rc = DBGFR3SelQueryInfo(pVM, idCpu, Sel, DBGFSELQI_FLAGS_DT_GUEST | DBGFSELQI_FLAGS_DT_ADJ_64BIT_MODE, &SelInfo);
         if (RT_FAILURE(rc))
             return rc;

trunk/src/VBox/VMM/DBGFMem.cpp

@@ -403 +403 @@
      */
     int rc;
-    if (!(fFlags & DBGFSELQI_FLAGS_DT_GUEST))
+    if (!(fFlags & DBGFSELQI_FLAGS_DT_SHADOW))
     {
         PVMCPU pVCpu = VMMGetCpuById(pVM, idCpu);
         VMCPU_ASSERT_EMT(pVCpu);
         rc = SELMR3GetSelectorInfo(pVM, pVCpu, Sel, pSelInfo);
+
+        /*
+         * 64-bit mode HACKS for making data and stack selectors wide open when
+         * queried. This is voodoo magic.
+         */
+        if (fFlags & DBGFSELQI_FLAGS_DT_ADJ_64BIT_MODE)
+        {
+            /* Expand 64-bit data and stack selectors. The check is a bit bogus... */
+            if (    RT_SUCCESS(rc)
+                &&  (pSelInfo->fFlags & (  DBGFSELINFO_FLAGS_LONG_MODE | DBGFSELINFO_FLAGS_REAL_MODE | DBGFSELINFO_FLAGS_PROT_MODE
+                                         | DBGFSELINFO_FLAGS_GATE      | DBGFSELINFO_FLAGS_HYPER
+                                         | DBGFSELINFO_FLAGS_INVALID   | DBGFSELINFO_FLAGS_NOT_PRESENT))
+                     == DBGFSELINFO_FLAGS_LONG_MODE
+                &&  pSelInfo->cbLimit != ~(RTGCPTR)0
+                &&  CPUMIsGuestIn64BitCode(pVCpu, CPUMGetGuestCtxCore(pVCpu)) )
+            {
+                pSelInfo->GCPtrBase = 0;
+                pSelInfo->cbLimit   = ~(RTGCPTR)0;
+            }
+            else if (   Sel == 0
+                     && CPUMIsGuestIn64BitCode(pVCpu, CPUMGetGuestCtxCore(pVCpu)))
+            {
+                pSelInfo->GCPtrBase = 0;
+                pSelInfo->cbLimit   = ~(RTGCPTR)0;
+                pSelInfo->Sel       = 0;
+                pSelInfo->SelGate   = 0;
+                pSelInfo->fFlags    = DBGFSELINFO_FLAGS_LONG_MODE;
+                pSelInfo->u.Raw64.Gen.u1Present  = 1;
+                pSelInfo->u.Raw64.Gen.u1Long     = 1;
+                pSelInfo->u.Raw64.Gen.u1DescType = 1;
+                rc = VINF_SUCCESS;
+            }
+        }
     }
     else
@@ -449 +482 @@
 {
     AssertReturn(idCpu < pVM->cCPUs, VERR_INVALID_PARAMETER);
-    AssertReturn(!(fFlags & ~(DBGFSELQI_FLAGS_DT_GUEST | DBGFSELQI_FLAGS_DT_SHADOW)), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~(DBGFSELQI_FLAGS_DT_GUEST | DBGFSELQI_FLAGS_DT_SHADOW | DBGFSELQI_FLAGS_DT_ADJ_64BIT_MODE)), VERR_INVALID_PARAMETER);
+    AssertReturn(    (fFlags & (DBGFSELQI_FLAGS_DT_SHADOW | DBGFSELQI_FLAGS_DT_ADJ_64BIT_MODE))
+                  !=           (DBGFSELQI_FLAGS_DT_SHADOW | DBGFSELQI_FLAGS_DT_ADJ_64BIT_MODE), VERR_INVALID_PARAMETER);
 
     /* Clear the return data here on this thread. */

trunk/src/VBox/VMM/SELM.cpp

@@ -2055 +2055 @@
     if (Desc.Gen.u1DescType)
     {
+        /*
+         * 64-bit code selectors are wide open, it's not possible to detect
+         * 64-bit data or stack selectors without also dragging in assumptions
+         * about current CS (i.e. that's we're executing in 64-bit mode).  So,
+         * the selinfo user needs to deal with this in the context the info is
+         * used unfortunately.
+         */
         if (    Desc.Gen.u1Long
             &&  !Desc.Gen.u1DefBig
             &&  (Desc.Gen.u4Type & X86_SEL_TYPE_CODE))
         {
-            /* 64-bit code selectors are wide open. It's not possible to
-               detect 64-bit data or stack selectors without also dragging
-               in assumptions about current CS. So, the selinfo user needs
-               to deal with this in the context the info is used unfortunately.
-               Note. We ignore the segment limit hacks that was added by AMD. */
+            /* Note! We ignore the segment limit hacks that was added by AMD. */
             pSelInfo->GCPtrBase = 0;
             pSelInfo->cbLimit   = ~(RTGCUINTPTR)0;