Changeset 2890

Timestamp:

Nov 21, 2006, 5:33:25 PM (19 years ago)

Author:

bird

Message:

LX bugfixing. the unit test succeeds, but there are still things todo.

Location:

trunk/kLdr

Files:

• kLdrModLX.c (modified) (16 diffs)
• tstkLdrMod.c (modified) (8 diffs)

trunk/kLdr/kLdrModLX.c

@@ -182 +182 @@
     uint32_t i;
     int rc;
+    int fCanOptimizeMapping;
+    uint32_t NextRVA;
     *ppModLX = NULL;
 
@@ -323 +325 @@
     pModLX->pMod = pMod;
     pModLX->pvMapping = 0;
-    pModLX->cbMapped = Hdr.e32_mpages * Hdr.e32_pagesize;
+    pModLX->cbMapped = 0;
     pModLX->f32Reserved = 0;
 
@@ -404 +406 @@
         }
     }
-    pModLX->cbMapped = pMod->cSegments
-                     ? pModLX->paObjs[pMod->cSegments - 1].o32_base + pModLX->paObjs[pMod->cSegments - 1].o32_size
-                       - pModLX->paObjs[pMod->cSegments - 1].o32_size
-                     : 0;
+
+    /*
+     * Check if we can optimize the mapping by using a different
+     * object alignment. The linker typically uses 64KB alignment,
+     * we can easily get away with page alignment in most cases.
+     */
+    fCanOptimizeMapping = !(Hdr.e32_mflags & (E32NOINTFIX | E32SYSDLL));
+    NextRVA = 0;
 
     /*
@@ -420 +426 @@
         pMod->aSegments[i].cchName = 0;
         pMod->aSegments[i].offFile = -1;
-        pMod->aSegments[i].cbFile = 0;
+        pMod->aSegments[i].cbFile = -1;
 
         /* size and addresses */
@@ -426 +432 @@
         pMod->aSegments[i].cb          = pModLX->paObjs[i].o32_size;
         pMod->aSegments[i].LinkAddress = pModLX->paObjs[i].o32_base;
-        pMod->aSegments[i].RVA         = pModLX->paObjs[i].o32_base - pModLX->paObjs[0].o32_base;
-        pMod->aSegments[i].cbMapped    = KLDR_ALIGN_Z(pModLX->paObjs[i].o32_size, 16);
-        if (i + 1 < pMod->cSegments)
-            pMod->aSegments[i].cbMapped = pModLX->paObjs[i + 1].o32_base - pModLX->paObjs[i].o32_base;
+        pMod->aSegments[i].RVA         = NextRVA;
+        if (fCanOptimizeMapping)
+            pMod->aSegments[i].cbMapped = KLDR_ALIGN_Z(pModLX->paObjs[i].o32_size, OBJPAGELEN);
+        else
+            pMod->aSegments[i].cbMapped = i + 1 < pMod->cSegments
+                                        ? pModLX->paObjs[i + 1].o32_base - pModLX->paObjs[i].o32_base
+                                        : KLDR_ALIGN_Z(pModLX->paObjs[i].o32_size, OBJPAGELEN);
+        NextRVA += pMod->aSegments[i].cbMapped;
 
         /* protection */
@@ -475 +485 @@
     }
 
+    /* set the mapping size */
+    pModLX->cbMapped = NextRVA;
+
     /*
      * We're done.
@@ -488 +501 @@
     PKLDRMODLX pModLX = (PKLDRMODLX)pMod->pvData;
     int rc = 0;
-    KLDRMODLX_ASSERT(pModLX->pvMapping);
+    KLDRMODLX_ASSERT(!pModLX->pvMapping);
 
     if (pMod->pRdr)
@@ -922 +935 @@
     kldrModLXResolveBaseAddress(pModLX, &BaseAddress);
 
-    return -1;
+    return 0;
 }
 
@@ -1193 +1206 @@
                 case VALID:
                     if (pMap->o32_pagesize == OBJPAGELEN)
-                        rc = kLdrRdrRead(pRdr, pbPage, OBJPAGELEN, pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift);
+                        rc = kLdrRdrRead(pRdr, pbPage, OBJPAGELEN,
+                                         pModLX->Hdr.e32_datapage + (pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift));
                     else if (pMap->o32_pagesize < OBJPAGELEN)
                     {
-                        rc = kLdrRdrRead(pRdr, pbPage, pMap->o32_pagesize, pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift);
+                        rc = kLdrRdrRead(pRdr, pbPage, pMap->o32_pagesize,
+                                         pModLX->Hdr.e32_datapage + (pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift));
                         kLdrHlpMemSet(pbPage + pMap->o32_pagesize, 0, OBJPAGELEN - pMap->o32_pagesize);
                     }
@@ -1220 +1235 @@
 
                     /* read it and ensure 4 extra zero bytes. */
-                    rc = kLdrRdrRead(pRdr, pbTmpPage, pMap->o32_pagesize, pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift);
+                    rc = kLdrRdrRead(pRdr, pbTmpPage, pMap->o32_pagesize,
+                                     pModLX->Hdr.e32_datapage + (pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift));
                     if (rc)
                         break;
@@ -1709 +1725 @@
 {
     PKLDRMODLX pModLX = (PKLDRMODLX)pMod->pvData;
+    int rc, rc2;
 
     /*
@@ -1716 +1733 @@
         return KLDR_ERR_NOT_MAPPED;
 
-    /* the file provider does it all */
-    return kLdrRdrRefresh(pMod->pRdr, (void *)pModLX->pvMapping, pMod->cSegments, pMod->aSegments);
+    /*
+     * Before doing anything we'll have to make all pages writable.
+     */
+    rc = kldrModLXDoProtect(pModLX, (void *)pModLX->pvMapping, 1 /* unprotect */);
+    if (rc)
+        return rc;
+
+    /*
+     * Load the bits again.
+     */
+    rc = kldrModLXDoLoadBits(pModLX, (void *)pModLX->pvMapping);
+
+    /*
+     * Restore protection.
+     */
+    rc2 = kldrModLXDoProtect(pModLX, (void *)pModLX->pvMapping, 0 /* protect */);
+    if (!rc && rc2)
+        rc = rc2;
+    return rc;
 }
 
@@ -2061 +2095 @@
                         if (iModule >= pModLX->Hdr.e32_impmodcnt)
                             return KLDR_ERR_BAD_FIXUP;
+#if 1
+                        if (u.prlc->nr_flags & NRICHAIN)
+                            return KLDR_ERR_BAD_FIXUP;
+#endif
 
                         /* . */
@@ -2105 +2143 @@
                             return KLDR_ERR_BAD_FIXUP;
 #if 1
-                        if (u.prlc->nr_flags & NRCHAIN)
+                        if (u.prlc->nr_flags & NRICHAIN)
                             return KLDR_ERR_BAD_FIXUP;
 #endif
@@ -2160 +2198 @@
                  * Deal with the 'source' (i.e. the place that should be modified (very logical).
                  */
-                if (!(u.prlc->nr_flags & NRCHAIN))
+                if (!(u.prlc->nr_stype & NRCHAIN))
                 {
                     rc = kldrModLXDoReloc(pbPage, u.prlc->r32_soff, uValue, fKind);
@@ -2176 +2214 @@
                             return rc;
                     }
+                    pb = (const uint8_t *)poffSrc;
                 }
                 else

trunk/kLdr/tstkLdrMod.c

@@ -79 +79 @@
 
 
+/**
+ * Verbose memcmp().
+ */
+static int TestMemComp(const void *pv1, const void *pv2, size_t cb)
+{
+    size_t          off;
+    const uint8_t  *pb1 = (const uint8_t *)pv1;
+    const uint8_t  *pb2 = (const uint8_t *)pv2;
+    if (!memcmp(pb1, pb2, cb))
+        return 0;
+    printf("Mismatching blocks pv1=%p pv2=%p cb=%#x:\n", pv1, pv2, cb);
+    for (off = 0; off < cb; off++)
+    {
+        if (pb1[off] == pb2[off])
+            continue;
+        printf("%08x %02x != %02x\n", off, pb1[off], pb2[off]);
+    }
+    return memcmp(pb1, pb2, cb); /* lazy */
+}
+
 
 /**
@@ -97 +117 @@
     if (rc)
         return Failure("failed to get image bits, rc=%d (a)", rc);
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (a)");
 
@@ -109 +129 @@
     if (rc)
         return Failure("failed to relocate, rc=%d (b2)");
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (b)");
 
@@ -123 +143 @@
     if (rc)
         return Failure("failed to get image bits, rc=%d (c1)", rc);
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (c1)");
 
@@ -134 +154 @@
     if (rc)
         return Failure("failed to get image bits, rc=%d (c2)", rc);
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (c2)");
 
@@ -145 +165 @@
     if (rc)
         return Failure("failed to get image bits, rc=%d (c3)", rc);
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (c3)");
 
@@ -156 +176 @@
     if (rc)
         return Failure("failed to get image bits, rc=%d (c4)", rc);
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (c4)");
 
@@ -167 +187 @@
     if (rc)
         return Failure("failed to get image bits, rc=%d (c5)", rc);
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (c5)");