Changeset 2850

Timestamp:

Nov 2, 2006, 3:28:29 AM (19 years ago)

Author:

bird

Message:

import resolving kldrDyldMod is nearly 100 complete now.

Location:

trunk/kLdr

Files:

• kLdr.h (modified) (2 diffs)
• kLdrDyldMod.c (modified) (2 diffs)

trunk/kLdr/kLdr.h

@@ -603 +603 @@
 /** Valid symbol kind mask. */
 #define KLDRSYMKIND_MASK                    0x00000033
+/** Weak symbol. */
+#define KLDRSYMKIND_WEAK                    0x00000100
 /** @} */
 
@@ -917 +919 @@
 /** The specified ARCH+CPU isn't compatible with image. */
 #define KLDR_ERR_ARCH_CPU_NOT_COMPATIBLE                    (KLDR_ERR_BASE + 45)
+/** Symbol not found. */
+#define KLDR_ERR_SYMBOL_NOT_FOUND                           (KLDR_ERR_BASE + 46)
 
 /** Encountered a bad fixup. */

trunk/kLdr/kLdrDyldMod.c

@@ -877 +877 @@
 
 
+/**
+ * @copydoc FNKLDRMODGETIMPORT
+ * pvUser points to the KLDRDYLDMOD.
+ */
+static int kldrDyldModFixupGetImportCallback(PKLDRMOD pMod, uint32_t iImport, uint32_t uSymbol, const char *pszSymbol,
+                                             PKLDRADDR puValue, uint32_t *pfKind, void *pvUser)
+{
+    int rc;
+    PKLDRDYLDMOD pDyldMod = (PKLDRDYLDMOD)pvUser;
+
+    if (iImport != NIL_KLDRMOD_IMPORT)
+    {
+        /* specific import module search. */
+        PKLDRDYLDMOD pPrereqMod;
+
+        KLDRDYLDMOD_ASSERT(iImport < pDyldMod->cPrereqs);
+        pPrereqMod = pDyldMod->papPrereqs[iImport];
+
+        KLDRDYLDMOD_ASSERT(pPrereqMod);
+        KLDRDYLDMOD_ASSERT(pPrereqMod->u32MagicHead == KLDRDYMOD_MAGIC);
+        KLDRDYLDMOD_ASSERT(pPrereqMod->u32MagicTail == KLDRDYMOD_MAGIC);
+        KLDRDYLDMOD_ASSERT(pPrereqMod->enmState < KLDRSTATE_TERMINATING);
+
+        rc = kLdrModQuerySymbol(pPrereqMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP,
+                                uSymbol, pszSymbol, puValue, pfKind);
+        if (rc)
+        {
+            if (pszSymbol)
+                kldrDyldFailure(rc, "%s[%d]->%s.%s", pDyldMod->pMod->pszName, iImport,
+                                pPrereqMod->pMod->pszName, pszSymbol);
+            else
+                kldrDyldFailure(rc, "%s[%d]->%s.%d", pDyldMod->pMod->pszName, iImport,
+                                pPrereqMod->pMod->pszName, uSymbol);
+        }
+    }
+    else
+    {
+        /* bind list search. */
+        unsigned fFound = 0;
+        PKLDRDYLDMOD pBindMod = g_pkLdrDyldBindHead;
+        rc = 0;
+        while (pBindMod)
+        {
+            uint32_t fKind;
+            KLDRADDR uValue;
+            rc = kLdrModQuerySymbol(pBindMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP,
+                                    uSymbol, pszSymbol, &uValue, &fKind);
+            if (    !rc
+                &&  (   !fFound
+                     || !(fKind & KLDRSYMKIND_WEAK)
+                    )
+               )
+            {
+                *pfKind = fKind;
+                *puValue = uValue;
+                fFound = 1;
+                if (!(fKind & KLDRSYMKIND_WEAK))
+                    break;
+            }
+
+            /* next */
+            pBindMod = pBindMod->Bind.pNext;
+        }
+        rc = fFound ? 0 : KLDR_ERR_SYMBOL_NOT_FOUND;
+        if (!fFound)
+        {
+            if (pszSymbol)
+                kldrDyldFailure(rc, "%s->%s", pDyldMod->pMod->pszName, pszSymbol);
+            else
+                kldrDyldFailure(rc, "%s->%d", pDyldMod->pMod->pszName, uSymbol);
+        }
+    }
+
+    return rc;
+}
+
 
 /**
@@ -895 +971 @@
 
     /* do the job */
-    rc = kLdrModFixupMapping(pMod->pMod, NULL, NULL);/// @todo fixme.
+    rc = kLdrModFixupMapping(pMod->pMod, kldrDyldModFixupGetImportCallback, pMod);/// @todo fixme.
     if (!rc)
         pMod->enmState = KLDRSTATE_FIXED_UP;