Changeset 4212 in vbox

Timestamp:

Aug 18, 2007 1:35:13 AM (17 years ago)

Author:

vboxsync

Message:

SELMSelInfoIsExpandDown

Location:

trunk

Files:

• include/VBox/selm.h (modified) (1 diff)
• src/VBox/Debugger/DBGConsole.cpp (modified) (4 diffs)
• src/VBox/VMM/DBGFAddr.cpp (modified) (1 diff)

trunk/include/VBox/selm.h

@@ -257 +257 @@
 SELMDECL(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)
+
 
 

trunk/src/VBox/Debugger/DBGConsole.cpp

@@ +1 @@
+/** $Id$ */
 /** @file
- *
- * Debugger Console.
+ * DBGC - Debugger Console.
  */
 
@@ -6235 +6235 @@
                 if (VBOX_SUCCESS(rc))
                 {
-                    RTGCUINTPTR cb;
-                    /** @todo Add SELMSelInfoIsExpandDown() */
-                    if (    (SelInfo.Raw.Gen.u4Type & X86_SEL_TYPE_DOWN)
-                        &&  SelInfo.Raw.Gen.u1DescType
-                        &&  (   SelInfo.Raw.Gen.u4Type == X86_SEL_TYPE_RO_DOWN
-                             || SelInfo.Raw.Gen.u4Type == X86_SEL_TYPE_RO_DOWN_ACC
-                             || SelInfo.Raw.Gen.u4Type == X86_SEL_TYPE_RW_DOWN
-                             || SelInfo.Raw.Gen.u4Type == X86_SEL_TYPE_RW_DOWN_ACC))
+                    RTGCUINTPTR cb; /* -1 byte */
+                    if (SELMSelInfoIsExpandDown(&SelInfo))
                     {
                         if (    !SelInfo.Raw.Gen.u1Granularity
@@ -6253 +6247 @@
                     else
                     {
-                        if (Address.off >= SelInfo.cbLimit)
+                        if (Address.off > SelInfo.cbLimit)
                             return VERR_OUT_OF_SELECTOR_BOUNDS;
                         cb = SelInfo.cbLimit - Address.off;
@@ -6261 +6255 @@
                         if (!pcbRead)
                             return VERR_OUT_OF_SELECTOR_BOUNDS;
-                        cbRead = cb;
+                        cbRead = cb + 1;
                     }
                 }

trunk/src/VBox/VMM/DBGFAddr.cpp

@@ -65 +65 @@
 
         /* check limit. */
-        if (    (SelInfo.Raw.Gen.u4Type & X86_SEL_TYPE_DOWN)
-            &&  SelInfo.Raw.Gen.u1DescType
-            &&  (   SelInfo.Raw.Gen.u4Type == X86_SEL_TYPE_RO_DOWN
-                 || SelInfo.Raw.Gen.u4Type == X86_SEL_TYPE_RO_DOWN_ACC
-                 || SelInfo.Raw.Gen.u4Type == X86_SEL_TYPE_RW_DOWN
-                 || SelInfo.Raw.Gen.u4Type == X86_SEL_TYPE_RW_DOWN_ACC))
+        if (SELMSelInfoIsExpandDown(&SelInfo))
         {
-            if (!SelInfo.Raw.Gen.u1Granularity && off > UINT32_C(0xffff))
+            if (    !SelInfo.Raw.Gen.u1Granularity
+                &&  off > UINT32_C(0xffff))
                 return VERR_OUT_OF_SELECTOR_BOUNDS;
             if (off <= SelInfo.cbLimit)