Changeset 2979 for trunk

Timestamp:

Mar 4, 2007, 12:27:30 AM (18 years ago)

Author:

bird

Message:

name resolution. fixed some fixup bugs, works for wlink dlls now.

File:

• trunk/kLdr/kLdrModLX.c (modified) (15 diffs)

trunk/kLdr/kLdrModLX.c

@@ -4 +4 @@
  * kLdr - The Module Interpreter for the Linear eXecutable (LX) Format.
  *
- * Copyright (c) 2006 knut st. osmundsen <bird@anduin.net>
+ * Copyright (c) 2006-2007 knut st. osmundsen <bird@anduin.net>
  *
  *
@@ -119 +119 @@
 static const uint8_t *kldrModLXDoNameTableLookupByOrdinal(const uint8_t *pbNameTable, int32_t cbNameTable, uint32_t iOrdinal);
 static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pchSymbol, uint32_t cchSymbol, uint32_t *piSymbol);
-#if 0
 static const uint8_t *kldrModLXDoNameTableLookupByName(const uint8_t *pbNameTable, int32_t cbNameTable,
-                                                       char *pchSymbol, size_t cchSymbol);
-#endif
+                                                       const char *pchSymbol, size_t cchSymbol);
 static int kldrModLXDoLoadBits(PKLDRMODLX pModLX, void *pvBits);
 static int kldrModLXDoIterDataUnpacking(uint8_t *pbDst, const uint8_t *pbSrc, int cbSrc);
@@ -595 +593 @@
      * (The entry table is made up of bundles of similar exports.)
      */
-    iOrdinal = 0;
+    iOrdinal = 1;
     pBundle = (const struct b32_bundle *)pModLX->pbEntryTab;
-    while (!pBundle->b32_cnt && iOrdinal <= iSymbol)
+    while (pBundle->b32_cnt && iOrdinal <= iSymbol)
     {
         static const size_t s_cbEntry[] = { 0, 3, 5, 5, 7 };
@@ -609 +607 @@
             uint32_t offObject;
             const struct e32_entry *pEntry = (const struct e32_entry *)((uintptr_t)(pBundle + 1)
-                                                                        + iSymbol - (iOrdinal - pBundle->b32_cnt));
+                                                                        +   (iSymbol - (iOrdinal - pBundle->b32_cnt))
+                                                                          * s_cbEntry[pBundle->b32_type]);
 
             /*
@@ -676 +675 @@
             pBundle = (const struct b32_bundle *)((const uint8_t *)pBundle + 2);
         else
-            pBundle = (const struct b32_bundle *)((const uint8_t *)pBundle + s_cbEntry[pBundle->b32_type] * pBundle->b32_cnt);
+            pBundle = (const struct b32_bundle *)((const uint8_t *)(pBundle + 1) + s_cbEntry[pBundle->b32_type] * pBundle->b32_cnt);
     }
 
@@ -698 +697 @@
      * First do a hash table lookup.
      */
-
-
-
-    /*
-
-    */
-
-    return -1;
+    /** @todo hash name table for speed. */
+
+    /*
+     * Search the name tables.
+     */
+    const uint8_t *pbName = kldrModLXDoNameTableLookupByName(pModLX->pbResNameTab,
+                                                             pModLX->pbLoaderSectionLast - pModLX->pbResNameTab + 1,
+                                                             pchSymbol, cchSymbol);
+    if (!pbName)
+    {
+        if (!pModLX->pbNonResNameTab)
+        {
+            /* lazy load it */
+            /** @todo non-resident name table. */
+        }
+        if (pModLX->pbNonResNameTab)
+            pbName = kldrModLXDoNameTableLookupByName(pModLX->pbResNameTab,
+                                                      pModLX->pbNonResNameTabLast - pModLX->pbResNameTab + 1,
+                                                      pchSymbol, cchSymbol);
+    }
+    if (!pbName)
+        return KLDR_ERR_SYMBOL_NOT_FOUND;
+
+    *piSymbol = *(const uint16_t *)(pbName + 1 + *pbName);
+    return 0;
 }
 
@@ -737 +753 @@
     return hash;
 }
+#endif
 
 
@@ -750 +767 @@
  */
 static const uint8_t *kldrModLXDoNameTableLookupByName(const uint8_t *pbNameTable, int32_t cbNameTable,
-                                                       char *pchSymbol, size_t cchSymbol)
+                                                       const char *pchSymbol, size_t cchSymbol)
 {
     /*
@@ -780 +797 @@
     return NULL;
 }
-#endif
 
 
@@ -2101 +2117 @@
 
                             /* calculate the symbol info. */
-                            uValue = offTrgObject + pMod->aSegments[iSeg].MapAddress;
+                            uValue = offTrgObject + NewBaseAddress + pMod->aSegments[iTrgObject].RVA;
                         }
                         else
-                            uValue = pMod->aSegments[iSeg].MapAddress;
+                            uValue = NewBaseAddress + pMod->aSegments[iTrgObject].RVA;
                         if (    (u.prlc->nr_stype & NRALIAS)
-                            ||  (pMod->aSegments[iSeg].fFlags & KLDRSEG_FLAG_16BIT))
-                            iSelector = pMod->aSegments[iSeg].Sel16bit;
+                            ||  (pMod->aSegments[iTrgObject].fFlags & KLDRSEG_FLAG_16BIT))
+                            iSelector = pMod->aSegments[iTrgObject].Sel16bit;
                         else
-                            iSelector = pMod->aSegments[iSeg].SelFlat;
+                            iSelector = pMod->aSegments[iTrgObject].SelFlat;
                         fKind = 0;
                         break;
@@ -2235 +2251 @@
 
                 /*
-                 * Deal with the 'source' (i.e. the place that should be modified (very logical).
+                 * Deal with the 'source' (i.e. the place that should be modified - very logical).
                  */
                 if (!(u.prlc->nr_stype & NRCHAIN))
@@ -2249 +2265 @@
                             &&  off >= 0
                             &&  off <= OBJPAGELEN - 4)
-                        *(uint32_t *)&pbPage[off] = uValue - (PageAddress + off);
+                        *(uint32_t *)&pbPage[off] = uValue - (PageAddress + off + 4);
                     else
                     {
@@ -2285 +2301 @@
                             int off = *poffSrc++;
                             if (off >= 0 && off <= OBJPAGELEN - 4)
-                                *(uint32_t *)&pbPage[off] = uValue - (PageAddress + off);
+                                *(uint32_t *)&pbPage[off] = uValue - (PageAddress + off + 4);
                             else
                             {
@@ -2334 +2350 @@
                             int iSelector, KLDRADDR uValue, uint32_t fKind)
 {
-    static const uint8_t s_acb[16] =
-    {
-        1, /* 0: NRSBYT */
-        0,
-        2, /* 2: NRSSEG - selector */
-        4, /* 3: NRSPTR - 16:16 */
-        0,
-        2, /* 5: NRSOFF - 16-bit offset */
-        6, /* 6: NRPTR48 - 16:32 */
-        4, /* 7: NROFF32 - 32-bit offset */
-        4, /* 8: NRSOFF32 - 32-bit offset self relative */
-        0, 0, 0, 0, 0, 0, 0
-    };
 #pragma pack(1) /* just to be sure */
     union
@@ -2414 +2417 @@
             break;
         case NRSOFF32:
-            uData.off32 = (uint32_t)uValue - (PageAddress + off);
+            uData.off32 = (uint32_t)uValue - (PageAddress + off + 4);
             cb = 4;
             break;