Changeset 60263 in vbox for trunk/src/VBox/Runtime/common/dbg

Timestamp:

Mar 31, 2016 12:26:24 AM (9 years ago)

Author:

vboxsync

Message:

dbgmodcodeview.cpp: two CV8 bugfixes.

File:

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

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

@@ -786 +786 @@
         AssertReturn(pvNew, VERR_NO_MEMORY);
         pThis->pchSrcStrings     = (char *)pvNew;
-        pThis->cbSrcStrings      = cbSrcStrings;
         pThis->cbSrcStringsAlloc = cbSrcStrings + 1;
     }
     memcpy(pThis->pchSrcStrings, pvSrcStrings, cbSrcStrings);
     pThis->pchSrcStrings[cbSrcStrings] = '\0';
+    pThis->cbSrcStrings = cbSrcStrings;
+    Log2(("    saved %#x bytes of CV8 source strings\n", cbSrcStrings));
 
     if (LogIs3Enabled())
@@ -827 +828 @@
         AssertReturn(pvNew, VERR_NO_MEMORY);
         pThis->pbSrcInfo      = (uint8_t *)pvNew;
-        pThis->cbSrcInfo      = cbSrcInfo;
         pThis->cbSrcInfoAlloc = cbSrcInfo + sizeof(RTCV8SRCINFO);
     }
     memcpy(pThis->pbSrcInfo, pvSrcInfo, cbSrcInfo);
     memset(&pThis->pbSrcInfo[cbSrcInfo], 0, sizeof(RTCV8SRCINFO));
+    pThis->cbSrcInfo = cbSrcInfo;
+    Log2(("    saved %#x bytes of CV8 source file info\n", cbSrcInfo));
 
     if (LogIs3Enabled())
@@ -902 +904 @@
                                     ? &pThis->pchSrcStrings[pSrcInfo->offSourceName] : "unknown.c";
             pszName = rtDbgModCvAddSanitizedStringToCache(pszName, RTSTR_MAX);
-            Log2(("RTDbgModCv:     #%u lines, %#x bytes, %#x=%s\n", pSrcHdr->cLines, pSrcHdr->cb, pSrcHdr->offSourceInfo, pszName));
+            Log2(("RTDbgModCv:     #%u lines, %#x bytes, %#x=%s\n", pSrcHdr->cLines, pSrcHdr->cb, pSrcInfo->offSourceName, pszName));
 
             if (pszName)