Changeset 42365 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jul 24, 2012 1:31:36 PM (12 years ago)

Author:

vboxsync

Message:

dbgmodcontainer.cpp: A bug fix and a hack.

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp (modified) (2 diffs)

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

@@ -480 +480 @@
         RTUINTPTR uCurRvaLast = uCurRva + RT_MAX(pThis->paSegs[iSeg].cb, 1) - 1;
         if (   uRva      <= uCurRvaLast
-            && uRvaLast  >= uCurRva)
+            && uRvaLast  >= uCurRva
+            && (cb != 0 || pThis->paSegs[iSeg].cb != 0)) /* HACK ALERT! Allow empty segments to share space (bios/watcom). */
             AssertMsgFailedReturn(("uRva=%RTptr uRvaLast=%RTptr (cb=%RTptr) \"%s\";\n"
                                    "uRva=%RTptr uRvaLast=%RTptr (cb=%RTptr) \"%s\" iSeg=%#x\n",
@@ -565 +566 @@
         for (;;)
         {
-            uint32_t    iSeg   = iFirst + (iFirst - iLast) / 2;
+            uint32_t    iSeg   = iFirst + (iLast - iFirst) / 2;
             RTUINTPTR   offSeg = uRva - paSeg[iSeg].off;
             if (offSeg < paSeg[iSeg].cb)
             {
+#if 0 /* Enable if we change the above test. */
+                if (offSeg == 0 && paSeg[iSeg].cb == 0)
+                    while (   iSeg > 0
+                           && paSeg[iSeg - 1].cb  == 0
+                           && paSeg[iSeg - 1].off == uRva)
+                        iSeg--;
+#endif
+
                 if (poffSeg)
                     *poffSeg = offSeg;