Changeset 2869 for trunk/kLdr/kLdrDyld.c

Timestamp:

Nov 12, 2006, 3:47:25 AM (19 years ago)

Author:

bird

Message:

the simple testcase works.

File:

• trunk/kLdr/kLdrDyld.c (modified) (13 diffs)

trunk/kLdr/kLdrDyld.c

@@ -75 +75 @@
  * successfully initialized. */
 PKLDRDYLDMOD    g_pkLdrDyldInitHead;
-/** Pointer to the tail module of the initalization list. */
+/** Pointer to the tail module of the initalization list.*/
 PKLDRDYLDMOD    g_pkLdrDyldInitTail;
-/** Pointer to the head module of the termination order list. */
+/** Pointer to the head module of the termination order list.
+ * This is a LIFO just like the the init list. */
 PKLDRDYLDMOD    g_pkLdrDyldTermHead;
 /** Pointer to the tail module of the termination order list. */
@@ -185 +186 @@
  * Initialize the dynamic loader.
  */
-int kldrDyInit(void)
+int kldrDyldInit(void)
 {
     kLdrDyldHead = kLdrDyldTail = NULL;
@@ -198 +199 @@
     g_cbkLdrDyldMainStack = 0;
 
-    return 0;
+    return kldrDyldFindInit();
 }
 
@@ -205 +206 @@
  * Terminate the dynamic loader.
  */
-void kldrDyTerm(void)
+void kldrDyldTerm(void)
 {
 
@@ -321 +322 @@
         g_cTotalLoadCalls++;
         g_cActiveLoadCalls++;
-        rc = kldrDyldDoLoad(pszDll, pszPrefix, pszSuffix, enmSearch, fFlags, phMod, pszErr, cchErr);
+        rc = kldrDyldDoLoad(pszDll, pszPrefix, pszSuffix, enmSearch, fFlags, &pMod, pszErr, cchErr);
         g_cActiveLoadCalls--;
         kldrDyldDoModuleTerminationAndGarabageCollection();
@@ -845 +846 @@
             if (cEntries < sizeof(s_aEntries) / sizeof(s_aEntries[0]))
             {
-                s_aEntries[cEntries++].pMod = pMod->papPrereqs[pMod->cPrereqs - s_aEntries[i].cLeft];
+                s_aEntries[cEntries].cLeft = ~(uint32_t)0;
+                s_aEntries[cEntries].pMod = pMod->papPrereqs[pMod->cPrereqs - s_aEntries[i].cLeft];
                 s_aEntries[i].cLeft--;
+                cEntries++;
             }
             else
@@ -962 +965 @@
          * We'll have to load it from file.
          */
-        rc = kldrDyldFindNewModule(pszDll, pszPrefix, pszSuffix, enmSearch, fFlags, ppMod);
+        rc = kldrDyldFindNewModule(pszDll, pszPrefix, pszSuffix, enmSearch, fFlags, &pMod);
         if (!rc)
             rc = kldrDyldModMap(pMod);
@@ -1162 +1165 @@
 static void kldrDyldStackDropFrame(uint32_t iLoad1st, uint32_t iLoadEnd, int rc)
 {
-    uint32_t iStack;
-    KLDRDYLD_ASSERT(iLoadEnd <= g_cStackMods);
-    KLDRDYLD_ASSERT(iLoad1st == g_cStackMods);
+    uint32_t i;
+    KLDRDYLD_ASSERT(iLoad1st <= g_cStackMods);
+    KLDRDYLD_ASSERT(iLoadEnd == g_cStackMods);
 
     /*
      * First pass: Do all the cleanups we can, but don't destroy anything just yet.
      */
-    for (iStack = iLoadEnd; iStack < iLoad1st; iStack++)
-    {
-        PKLDRDYLDMOD pMod = g_papStackMods[--iLoad1st];
+    i = iLoadEnd;
+    while (i-- > iLoad1st)
+    {
+        PKLDRDYLDMOD pMod = g_papStackMods[i];
         kldrDyldStackCleanupOne(pMod, rc);
     }
@@ -1179 +1183 @@
      *              can be completely removed.
      */
-    while (iLoad1st > iLoadEnd)
-    {
-        /*
-         * Pop a module.
-         */
-        PKLDRDYLDMOD pMod = g_papStackMods[--iLoad1st];
-        g_cStackMods = iLoad1st;
+    for (i = iLoad1st; i < iLoadEnd ; i++)
+    {
+        PKLDRDYLDMOD pMod = g_papStackMods[i];
 
         /*
@@ -1210 +1210 @@
         kldrDyldModDeref(pMod);
     }
+
+    /*
+     * Drop the stack frame.
+     */
+    g_cStackMods = iLoad1st;
 }
 
@@ -1245 +1250 @@
                 case KLDRSTATE_GOOD:
                 case KLDRSTATE_PENDING_GC:
+                case KLDRSTATE_PENDING_TERMINATION:
                     break;
 
                 case KLDRSTATE_INITIALIZATION_FAILED: /* just in case */
                 case KLDRSTATE_PENDING_INITIALIZATION:
-                case KLDRSTATE_PENDING_TERMINATION:
                     kldrDyldModUnloadPrerequisites(pMod);
                     break;
@@ -1309 +1314 @@
             case KLDRSTATE_INITIALIZATION_FAILED:
             case KLDRSTATE_PENDING_GC:
-                KLDRDYLD_ASSERT(pMod->cRefs == 0); /* ??? */
+                KLDRDYLD_ASSERT(!pMod->cDepRefs);
+                KLDRDYLD_ASSERT(!pMod->cDynRefs);
                 pMod->enmState = KLDRSTATE_GC;
                 kldrDyldModUnmap(pMod);
@@ -1428 +1434 @@
 int kldrDyldFailure(int rc, const char *pszFilename, ...)
 {
-    kldrHlpExit(1);
+    /** @todo print it. */
+    if (g_fBootstrapping);
+        kldrHlpExit(1);
     return rc;
 }