Changeset 59973 in vbox

Timestamp:

Mar 9, 2016 8:07:42 PM (9 years ago)

Author:

vboxsync

Message:

dbgmodecodeview.cpp: committed too much

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp (modified) (8 diffs)

trunk/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp

@@ -57 +57 @@
 #include <iprt/param.h>
 #include <iprt/path.h>
-#include <iprt/sort.h>
 #include <iprt/string.h>
 #include <iprt/strcache.h>
@@ -70 +69 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
+/**
+ * Directory sorting order.
+ */
+typedef enum RTCVDIRORDER
+{
+    RTCVDIRORDER_INVALID = 0,
+    /** Ordered by module. */
+    RTCVDIRORDER_BY_MOD,
+    /** Ordered by module, but 0 modules at the end. */
+    RTCVDIRORDER_BY_MOD_0,
+    /** Ordered by section, with global modules at the end. */
+    RTCVDIRORDER_BY_SST_MOD
+} RTCVDIRORDER;
+
+
 /**
  * File type.
@@ -109 +123 @@
     /** The offset of the subsection directory (relative to offBase). */
     uint32_t        offDir;
+    /** The directory order. */
+    RTCVDIRORDER    enmDirOrder;
     /** @}  */
 
@@ -1359 +1375 @@
 
 /**
- * @callback_method_impl{PFNRTSORTCMP,
- *      Used by rtDbgModCvLoadDirectory to sort the directory.}
- */
-static DECLCALLBACK(int) rtDbgModCvDirEntCmp(void const *pvElement1, void const *pvElement2, void *pvUser)
-{
-    PRTCVDIRENT32 pEntry1 = (PRTCVDIRENT32)pvElement1;
-    PRTCVDIRENT32 pEntry2 = (PRTCVDIRENT32)pvElement2;
-    if (pEntry1->iMod < pEntry2->iMod)
-        return -1;
-    if (pEntry1->iMod > pEntry2->iMod)
-        return 1;
-    if (pEntry1->uSubSectType < pEntry2->uSubSectType)
-        return -1;
-    if (pEntry1->uSubSectType > pEntry2->uSubSectType)
-        return 1;
-    return 0;
-}
-
-
-/**
  * Loads the directory into memory (RTDBGMODCV::paDirEnts and
  * RTDBGMODCV::cDirEnts).
@@ -1489 +1485 @@
     if (RT_SUCCESS(rc))
     {
-        uint32_t const cbDbgInfo    = pThis->cbDbgInfo;
-        uint32_t const cDirEnts     = pThis->cDirEnts;
-
         /*
-         * Just sort the directory in a way we like, no need to make
-         * complicated demands on the linker output.
+         * Basic info validation and determining the directory ordering.
          */
-        RTSortShell(pThis->paDirEnts, cDirEnts, sizeof(pThis->paDirEnts[0]), rtDbgModCvDirEntCmp, NULL);
-
-        /*
-         * Basic info validation.
-         */
+        bool           fWatcom      = 0;
         uint16_t       cGlobalMods  = 0;
         uint16_t       cNormalMods  = 0;
         uint16_t       iModLast     = 0;
+        uint32_t const cbDbgInfo    = pThis->cbDbgInfo;
+        uint32_t const cDirEnts     = pThis->cDirEnts;
         Log2(("RTDbgModCv: %u (%#x) directory entries:\n", cDirEnts, cDirEnts));
         for (uint32_t i = 0; i < cDirEnts; i++)
@@ -1547 +1537 @@
                     iModLast = pDirEnt->iMod;
                 }
+                else if (pDirEnt->iMod < iModLast)
+                    fWatcom = true;
                 cNormalMods++;
             }
@@ -1557 +1549 @@
         if (RT_SUCCESS(rc))
         {
-            Log(("CV dir stats: %u total, %u normal, %u special, iModLast=%#x (%u)\n",
-                 cDirEnts, cNormalMods, cGlobalMods, iModLast, iModLast));
-
-#if 0 /* skip this stuff */
+            if (fWatcom)
+                pThis->enmDirOrder = RTCVDIRORDER_BY_SST_MOD;
+            else if (pThis->paDirEnts[0].iMod == 0)
+                pThis->enmDirOrder = RTCVDIRORDER_BY_MOD_0;
+            else
+                pThis->enmDirOrder = RTCVDIRORDER_BY_MOD;
+            Log(("CV dir stats: %u total, %u normal, %u special, iModLast=%#x (%u), enmDirOrder=%d\n",
+                 cDirEnts, cNormalMods, cGlobalMods, iModLast, iModLast, pThis->enmDirOrder));
+
+
             /*
              * Validate the directory ordering.
              */
             uint16_t i = 0;
+
+            /* Old style with special modules up front. */
+            if (pThis->enmDirOrder == RTCVDIRORDER_BY_MOD_0)
+                while (i < cGlobalMods)
+                {
+                    if (pThis->paDirEnts[i].iMod != 0)
+                    {
+                        Log(("CV directory entry #%u: Expected iMod=%x instead of %x\n", i, 0, pThis->paDirEnts[i].iMod));
+                        rc = VERR_CV_BAD_FORMAT;
+                    }
+                    i++;
+                }
 
             /* Normal modules. */
@@ -1638 +1648 @@
                     i++;
                 }
-#endif
-        }
+        }
+
     }