Changeset 398 in kBuild for trunk/src/kDepIDB

Timestamp:

Jan 13, 2006 4:00:35 AM (19 years ago)

Author:

bird

Message:

Bugfixing.

File:

• trunk/src/kDepIDB/kDepIDB.c (modified) (9 diffs)

trunk/src/kDepIDB/kDepIDB.c

@@ -45 +45 @@
 #define OFFSETOF(type, member)  ( (int)(void *)&( ((type *)(void *)0)->member) )
 
+/*#define DEBUG*/
+#ifdef DEBUG
+#define dprintf(a)              printf a
+#define dump(pb, cb, offBase)   hexdump(pb,cb,offBase)
+#else
+#define dprintf(a)              do {} while (0)
+#define dump(pb, cb, offBase)   do {} while (0)
+#endif 
 
 
@@ -53 +61 @@
 static const char *argv0 = "";
 
+#ifdef DEBUG
+/**
+ * Performs a hexdump.
+ */
+static void hexdump(const uint8_t *pb, size_t cb, size_t offBase)
+{
+    static const char   szHex[16] = "0123456789abcdef";
+
+    const unsigned      cchWidth = 16;
+    size_t              off = 0;
+    while (off < cb)
+    {
+        unsigned i;
+        printf("%s%0*x %04x:", off ? "\n" : "", sizeof(pb) * 2, offBase + off, off);
+        for (i = 0; i < cchWidth && off + i < cb ; i++)
+            printf(off + i < cb ? !(i & 7) && i ? "-%02x" : " %02x" : "   ", pb[i]);
+
+        while (i++ < cchWidth)
+                printf("   ");
+        printf(" ");
+
+        for (i = 0; i < cchWidth && off + i < cb; i++)
+        {
+            const uint8_t u8 = pb[i];
+            printf("%c", u8 < 127 && u8 >= 32 ? u8 : '.', 1);
+        }
+        off += cchWidth;
+        pb  += cchWidth;
+    }
+    printf("\n");
+}
+#endif 
 
 /**
@@ -66 +106 @@
 static int ScanStream(uint8_t *pbStream, size_t cbStream, const char *pszPrefix, size_t cchPrefix)
 {
-    register char chFirst = *pszPrefix;
-    while (cbStream > cchPrefix + 2)
-    {
-        if (    *pbStream != chFirst
-            ||  memcmp(pbStream, pszPrefix, cchPrefix))
-        {
-            pbStream++;
-            cbStream--;
+    const uint8_t  *pbCur = pbStream;
+    size_t          cbLeft = cbStream;
+    register char   chFirst = *pszPrefix;
+    while (cbLeft > cchPrefix + 2)
+    {
+        if (    *pbCur != chFirst
+            ||  memcmp(pbCur, pszPrefix, cchPrefix))
+        {
+            pbCur++;
+            cbLeft--;
         }
         else
         {
             size_t cchDep;
-            pbStream += cchPrefix;
-            cchDep = strlen(pbStream);
-            depAdd(pbStream, cchDep);
-
-            pbStream += cchDep;
-            cbStream -= cchDep + cchPrefix;
+            pbCur += cchPrefix;
+            cchDep = strlen(pbCur);
+            depAdd(pbCur, cchDep);
+            dprintf(("%05x: '%s'\n", pbCur - pbStream, pbCur));
+
+            pbCur += cchDep;
+            cbLeft -= cchDep + cchPrefix;
         }
     }
@@ -206 +249 @@
     if (pHdr->iStartPage >= pHdr->cPages && pHdr->iStartPage <= 0)
     {
-        fprintf(stderr, "%s: error: Bad PDB 2.0 header - cbPage * cPages != cbFile.\n", argv0);
+        fprintf(stderr, "%s: error: Bad PDB 2.0 header - iStartPage=%u cPages=%u.\n", argv0, 
+                pHdr->iStartPage, pHdr->cPages);
+        return 1;
+    }
+    if (pHdr->iRootPages >= pHdr->cPages && pHdr->iRootPages <= 0)
+    {
+        fprintf(stderr, "%s: error: Bad PDB 2.0 header - iRootPages=%u cPage=%u.\n", argv0,
+                pHdr->iStartPage, pHdr->cPages);
         return 1;
     }
     return 0;
+}
+
+static size_t Pdb70Align(PPDB70HDR pHdr, size_t cb)
+{
+    if (cb == ~(uint32_t)0 || !cb)
+        return 0;
+    return ((cb + pHdr->cbPage - 1) / pHdr->cbPage) * pHdr->cbPage;
 }
 
@@ -221 +278 @@
 static void *Pdb70AllocAndRead(PPDB70HDR pHdr, size_t cb, PPDB70PAGE paiPageMap)
 {
-    size_t cPages = Pdb70Pages(pHdr, cb);
-    uint8_t *pbBuf = malloc(cPages * pHdr->cbPage + 1);
+    const size_t    cbPage = pHdr->cbPage;
+    size_t          cPages = Pdb70Pages(pHdr, cb);
+    uint8_t *pbBuf = malloc(cPages * cbPage + 1);
     if (pbBuf)
     {
@@ -229 +287 @@
         {
             size_t off = paiPageMap[iPage];
-            off *= pHdr->cbPage;
-            memcpy(pbBuf + iPage * pHdr->cbPage, (uint8_t *)pHdr + off, pHdr->cbPage);
+            if (off < pHdr->cPages)
+            {
+                off *= cbPage;
+                memcpy(pbBuf + iPage * cbPage, (uint8_t *)pHdr + off, cbPage);
+                dump(pbBuf + iPage * cbPage, cbPage, off);
+            }
+            else
+            {
+                fprintf(stderr, "%s: warning: Invalid page index %u (max %u)!\n", argv0, 
+                        (unsigned)off, pHdr->cPages);
+                memset(pbBuf + iPage * cbPage, 0, cbPage);
+            }
+
             iPage++;
         }
-        pbBuf[cPages * pHdr->cbPage] = '\0';
+        pbBuf[cPages * cbPage] = '\0';
     }
     else
-        fprintf(stderr, "%s: error: failed to allocate %d bytes\n", argv0, cPages * pHdr->cbPage + 1);
+        fprintf(stderr, "%s: error: failed to allocate %u bytes\n", argv0, cPages * cbPage + 1);
     return pbBuf;
 }
@@ -288 +357 @@
     while (iStream-- > 0)
         if (pRoot->aStreams[iStream].cbStream != ~(uint32_t)0)
-            paiPageMap += Pdb70Pages(pHdr, pRoot->aStreams[iStream].cbStream) / pHdr->cbPage;
+            paiPageMap += Pdb70Pages(pHdr, pRoot->aStreams[iStream].cbStream);
 
     if (pcbStream)
@@ -301 +370 @@
     unsigned    iStream;
     int         rc = 0;
+    dprintf(("pdb70\n"));
 
     /*
@@ -318 +388 @@
     for (iStream = 0; iStream < pRoot->cStreams && !rc; iStream++)
     {
-        uint8_t *pbStream;
+        const size_t cbStream = Pdb70Align(pHdr, pRoot->aStreams[iStream].cbStream);
+        uint8_t     *pbStream;
         if (    pRoot->aStreams[iStream].cbStream == ~(uint32_t)0
             ||  !pRoot->aStreams[iStream].cbStream)
             continue;
+        dprintf(("Stream #%d: %#x bytes (%#x aligned)\n", iStream, pRoot->aStreams[iStream].cbStream, cbStream));
         pbStream = (uint8_t *)Pdb70AllocAndReadStream(pHdr, pRoot, iStream, NULL);
         if (pbStream)
         {
-            rc = ScanStream(pbStream, pRoot->aStreams[iStream].cbStream, "/mr/inversedeps/", sizeof("/mr/inversedeps/") - 1);
+            rc = ScanStream(pbStream, cbStream, "/mr/inversedeps/", sizeof("/mr/inversedeps/") - 1);
             free(pbStream);
         }