Changeset 2869 for trunk/kLdr/kLdrDyldMod.c

Timestamp:

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

Author:

bird

Message:

the simple testcase works.

File:

• trunk/kLdr/kLdrDyldMod.c (modified) (6 diffs)

trunk/kLdr/kLdrDyldMod.c

@@ -567 +567 @@
     uint32_t        i;
 
-    KLDRDYLDMOD_ASSERT(pMod->papPrereqs);
+    KLDRDYLDMOD_ASSERT(pMod->papPrereqs || !pMod->cPrereqs);
 
     /*
@@ -584 +584 @@
             pMod2->cDepRefs--;
             pMod2->cRefs--;
-            cToUnload += !pMod2->cRefs;
+            cToUnload += !pMod2->cDepRefs && !pMod2->cDynRefs;
         }
     }
@@ -661 +661 @@
         for (pMod = kLdrDyldHead; pMod; pMod = pMod->Load.pNext)
         {
-            if (    pMod->cRefs
+            if (    pMod->cDepRefs
+                ||  pMod->cDynRefs
                 ||  pMod->enmState >= KLDRSTATE_PENDING_TERMINATION
                 ||  pMod->enmState < KLDRSTATE_LOADED_PREREQUISITES)
@@ -760 +761 @@
 
     /* sanity */
-    KLDRDYLDMOD_ASSERT(pMod->cRefs > 0);
     KLDRDYLDMOD_ASSERT(pMod->enmState == KLDRSTATE_OPEN);
     KLDRDYLDMOD_ASSERT(!pMod->fMapped);
@@ -1003 +1003 @@
     int rc;
 
-    KLDRDYLDMOD_ASSERT(pMod->enmState == KLDRSTATE_INITIALIZING);
-
+    KLDRDYLDMOD_ASSERT(pMod->enmState == KLDRSTATE_PENDING_INITIALIZATION);
+
+    pMod->enmState = KLDRSTATE_INITIALIZING;
     rc = kLdrModCallInit(pMod->pMod, (uintptr_t)pMod->hMod);
     if (!rc)
+    {
         pMod->enmState = KLDRSTATE_GOOD;
+        /* push it onto the termination list.*/
+        pMod->InitTerm.pPrev = NULL;
+        pMod->InitTerm.pNext = g_pkLdrDyldTermHead;
+        if (g_pkLdrDyldTermHead)
+            g_pkLdrDyldTermHead->InitTerm.pPrev = pMod;
+        else
+            g_pkLdrDyldTermTail = pMod;
+        g_pkLdrDyldTermHead = pMod;
+    }
     else
         pMod->enmState = KLDRSTATE_INITIALIZATION_FAILED;
@@ -1024 +1035 @@
 void kldrDyldModCallTerm(PKLDRDYLDMOD pMod)
 {
-    KLDRDYLDMOD_ASSERT(pMod->enmState == KLDRSTATE_TERMINATING);
-
+    KLDRDYLDMOD_ASSERT(pMod->enmState == KLDRSTATE_PENDING_TERMINATION);
+
+    pMod->enmState = KLDRSTATE_TERMINATING;
     kLdrModCallTerm(pMod->pMod, (uintptr_t)pMod->hMod);
     pMod->enmState = KLDRSTATE_PENDING_GC;
+    /* unlinking on destruction. */
 }