Changeset 2869

Timestamp:

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

Author:

bird

Message:

the simple testcase works.

Location:

trunk/kLdr

Files:

• kLdr.c (modified) (1 diff)
• kLdrDyld.c (modified) (13 diffs)
• kLdrDyldFind.c (modified) (10 diffs)
• kLdrDyldMod.c (modified) (6 diffs)
• kLdrHlp.c (modified) (5 diffs)
• kLdrInternal.h (modified) (1 diff)
• kLdrModPE.c (modified) (2 diffs)
• kLdrRdrFile.c (modified) (1 diff)
• testcase/tst-0-driver.c (modified) (1 diff)

trunk/kLdr/kLdr.c

@@ -106 +106 @@
         if (!rc)
         {
-            g_fInitialized = 1;
-            return 0;
+            rc = kldrDyldInit();
+            if (!rc)
+            {
+                g_fInitialized = 1;
+                return 0;
+            }
+            kldrHlpSemTerm();
         }
         kldrHlpHeapTerm();

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;
 }

trunk/kLdr/kLdrDyldFind.c

@@ -218 +218 @@
      */
     rc = kldrHlpGetEnv("KLDR_LIBRARY_PATH", kLdrDyldPath, sizeof(kLdrDyldPath));
-    if (rc)
-        kLdrDyldPath[0] = '\0';
-
     rc = kldrHlpGetEnv("KLDR_DEF_PREFIX", szTmp, sizeof(szTmp));
     if (!rc)
         kLdrHlpMemCopy(kLdrDyldDefPrefix, szTmp, sizeof(szTmp));
-
     rc = kldrHlpGetEnv("KLDR_DEF_SUFFIX", szTmp, sizeof(szTmp));
     if (!rc)
@@ -249 +245 @@
     kldrHlpGetEnv("KLDR_OS2_LIBPATH", kLdrDyldOS2Libpath, sizeof(kLdrDyldOS2Libpath));
     kldrHlpGetEnv("KLDR_OS2_LIBPATHSTRICT", kLdrDyldOS2LibpathStrict, sizeof(kLdrDyldOS2LibpathStrict));
+    if (    kLdrDyldOS2LibpathStrict[0] == 'T'
+        ||  kLdrDyldOS2LibpathStrict[0] == 't')
+        kLdrDyldOS2LibpathStrict[0] = 'T';
+    else
+        kLdrDyldOS2LibpathStrict[0] = '\0';
+    kLdrDyldOS2LibpathStrict[1] = '\0';
     kldrHlpGetEnv("KLDR_OS2_BEGINLIBPATH", kLdrDyldOS2BeginLibpath, sizeof(kLdrDyldOS2BeginLibpath));
     kldrHlpGetEnv("KLDR_OS2_ENDLIBPATH", kLdrDyldOS2EndLibpath, sizeof(kLdrDyldOS2EndLibpath));
@@ -267 +269 @@
     kldrHlpGetEnv("KLDR_WINDOWS_SYSTEM_DIR", kLdrDyldWindowsSystemDir, sizeof(kLdrDyldWindowsSystemDir));
     kldrHlpGetEnv("KLDR_WINDOWS_DIR", kLdrDyldWindowsDir, sizeof(kLdrDyldWindowsDir));
-    kldrHlpGetEnv("KLDR_WINDOWS_PATH", kLdrDyldWindowsPath, sizeof(kLdrDyldWindowsPath));
+    rc = kldrHlpGetEnv("KLDR_WINDOWS_PATH", kLdrDyldWindowsPath, sizeof(kLdrDyldWindowsPath));
+    if (rc)
+        kldrHlpGetEnv("PATH", kLdrDyldWindowsPath, sizeof(kLdrDyldWindowsPath));
 #endif
 
@@ -279 +283 @@
     (void)cch;
     return 0;
+}
+
+
+/**
+ * Lazily initialize the two application directory paths.
+ */
+static void kldrDyldFindLazyInitAppDir(void)
+{
+    if (!kLdrDyldAppDir[0])
+    {
+#if defined(__OS2__)
+        PPIB pPib;
+        PTIB pTib;
+        APIRET rc;
+
+        DosGetInfoBlocks(&pTib, &pPib);
+        rc = DosQueryModuleName(pPib->pib_hmte, sizeof(kLdrDyldAppDir), kLdrDyldAppDir);
+        if (!rc)
+        {
+            *kldrHlpGetFilename(kLdrDyldAppDir) = '\0';
+             kLdrHlpMemCopy(kLdrDyldWindowsAppDir, kLdrDyldAppDir, sizeof(kLdrDyldAppDir));
+        }
+        else
+        {
+            kLdrDyldWindowsAppDir[0] = kLdrDyldAppDir[0] = '.';
+            kLdrDyldWindowsAppDir[1] = kLdrDyldAppDir[1] = '\0';
+        }
+
+
+#elif defined(__WIN__)
+        DWORD dwSize = GetModuleFileName(NULL /* the executable */, kLdrDyldAppDir, sizeof(kLdrDyldAppDir));
+        if (dwSize > 0)
+        {
+            *kldrHlpGetFilename(kLdrDyldAppDir) = '\0';
+            kLdrHlpMemCopy(kLdrDyldWindowsAppDir, kLdrDyldAppDir, sizeof(kLdrDyldAppDir));
+        }
+        else
+        {
+            kLdrDyldWindowsAppDir[0] = kLdrDyldAppDir[0] = '.';
+            kLdrDyldWindowsAppDir[1] = kLdrDyldAppDir[1] = '\0';
+        }
+
+#else
+# error "Port me"
+#endif
+    }
 }
 
@@ -390 +440 @@
     Args.pszName = pszName;
     Args.cchName = kLdrHlpStrLen(pszName);
-    Args.cchPrefix = Args.pszPrefix ? kLdrHlpStrLen(pszPrefix) : 0;
-    Args.cchSuffix = Args.pszSuffix ? kLdrHlpStrLen(pszSuffix) : 0;
+    Args.cchPrefix = Args.pszPrefix ? kLdrHlpStrLen(Args.pszPrefix) : 0;
+    Args.cchSuffix = Args.pszSuffix ? kLdrHlpStrLen(Args.pszSuffix) : 0;
     Args.cchMaxLength = Args.cchName + Args.cchSuffix + Args.cchPrefix;
     Args.fFlags = fFlags;
@@ -400 +450 @@
      */
 /** @todo get rid of the strlen() on the various paths here! */
-    switch (enmSearch)
+    switch (Args.enmSearch)
     {
         case KLDRDYLD_SEARCH_KLDR:
         {
+            kldrDyldFindLazyInitAppDir();
             if (kLdrDyldAppDir[0] != '\0')
             {
@@ -432 +483 @@
         case KLDRDYLD_SEARCH_WINDOWS_ALTERED:
         {
+            kldrDyldFindLazyInitAppDir();
             rc = kldrDyldFindTryOpenPath(kLdrDyldWindowsAppDir, kLdrHlpStrLen(kLdrDyldWindowsAppDir), &Args);
             if (rc != KLDR_ERR_MODULE_NOT_FOUND)
                 break;
-            if (enmSearch == KLDRDYLD_SEARCH_WINDOWS_ALTERED)
+            if (Args.enmSearch == KLDRDYLD_SEARCH_WINDOWS_ALTERED)
             {
                 rc = kldrDyldFindTryOpenPath(".", 1, &Args);
@@ -447 +499 @@
             if (rc != KLDR_ERR_MODULE_NOT_FOUND)
                 break;
-            if (enmSearch == KLDRDYLD_SEARCH_WINDOWS)
+            if (Args.enmSearch == KLDRDYLD_SEARCH_WINDOWS)
             {
                 rc = kldrDyldFindTryOpenPath(".", 1, &Args);
@@ -513 +565 @@
     static char s_szFilename[1024];
     char *psz;
+
+    /*
+     * Ignore any attempts at opening empty paths.
+     * This can happen when a *Dir globals is empty.
+     */
+    if (!cchPath)
+        return KLDR_ERR_MODULE_NOT_FOUND; /* ignore */
 
     /*
@@ -692 +751 @@
         if (    cchName > cchSuffix
             &&  (   fCaseSensitive
-                 ?  kLdrHlpMemComp(pszName + cchName - cchSuffix, *ppszSuffix, cchSuffix)
-                 :  kLdrHlpMemIComp(pszName + cchName - cchSuffix, *ppszSuffix, cchSuffix))
+                 ?  !kLdrHlpMemComp(pszName + cchName - cchSuffix, *ppszSuffix, cchSuffix)
+                 :  !kLdrHlpMemIComp(pszName + cchName - cchSuffix, *ppszSuffix, cchSuffix))
            )
             *ppszSuffix = NULL;

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. */
 }
 

trunk/kLdr/kLdrHlp.c

@@ -386 +386 @@
  *
  * @returns 0 on success.
- * @returns KLDR_ERR_BUFFER_OVERFLOW on if the buffer is too small (it'll be partially filled).
+ * @returns KLDR_ERR_BUFFER_OVERFLOW on if the buffer is too small.
  * @returns KLDR_ERR_SYMBOL_NOT_FOUND if not found. (Yeah, abusing the status code, but it's only internally...)
  * @returns OS specfic status code on other error.
@@ -407 +407 @@
             kLdrHlpMemCopy(pszVal, pszValue, cch + 1);
         else
-        {
             rc = KLDR_ERR_BUFFER_OVERFLOW;
-            if (cchVal > 1)
-            {
-                kLdrHlpMemCopy(pszVal, pszValue, *pcchVal);
-                pszVal[*pcchVal - 1] = '\0';
-            }
-        }
     }
     else
@@ -425 +418 @@
     SetLastError(0);
     cch = GetEnvironmentVariable(pszVar, pszVal, cchVal);
-    if (cch < cchVal)
+    if (cch > 0 && cch < cchVal)
         return 0;
 
@@ -796 +789 @@
     const uint8_t *pb = (const uint8_t *)pv;
     const uint8_t  b = (uint8_t)ch;
-    while (cb)
+    while (cb-- > 0)
     {
         if (*pb == b)
@@ -811 +804 @@
     const uint8_t *pb1 = (const uint8_t *)pv1;
     const uint8_t *pb2 = (const uint8_t *)pv2;
-    while (cb)
+    while (cb-- > 0)
     {
         if (*pb1 != *pb2)

trunk/kLdr/kLdrInternal.h

@@ -353 +353 @@
 int kldrDyldModQuerySymbol(PKLDRDYLDMOD pMod, uint32_t uSymbolOrdinal, const char *pszSymbolName, uintptr_t *puValue, uint32_t *pfKind);
 
+int kldrDyldInit(void);
+void kldrDyldTerm(void);
+int kldrDyldFindInit(void);
+
 int kldrDyldFailure(int rc, const char *pszFormat, ...);
 int kldrInit(void);

trunk/kLdr/kLdrModPE.c

@@ -241 +241 @@
     pMod->enmFmt = KLDRFMT_PE;
     if (s.FileHdr.Characteristics & IMAGE_FILE_DLL)
-        pMod->enmType = s.FileHdr.Characteristics & IMAGE_FILE_RELOCS_STRIPPED
+        pMod->enmType = !(s.FileHdr.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)
             ? KLDRTYPE_SHARED_LIBRARY_RELOCATABLE
             : KLDRTYPE_SHARED_LIBRARY_FIXED;
     else
-        pMod->enmType = s.FileHdr.Characteristics & IMAGE_FILE_RELOCS_STRIPPED
+        pMod->enmType = !(s.FileHdr.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)
             ? KLDRTYPE_EXECUTABLE_RELOCATABLE
             : KLDRTYPE_EXECUTABLE_FIXED;
@@ -1580 +1580 @@
                 rc = pfnGetImport(pMod, iImp, IMAGE_ORDINAL32(pThunk->u1.Ordinal), NULL, &Value, &fKind, pvUser);
             else if (KLDRMODPE_VALID_RVA(pModPE, pThunk->u1.Ordinal))
-                rc = pfnGetImport(pMod, iImp, NIL_KLDRMOD_SYM_ORDINAL,
-                                  KLDRMODPE_RVA2TYPE(pvMapping, pThunk->u1.Ordinal, const char *),
-                                  &Value, &fKind, pvUser);
+            {
+                const IMAGE_IMPORT_BY_NAME *pName = KLDRMODPE_RVA2TYPE(pvMapping, pThunk->u1.Ordinal, const IMAGE_IMPORT_BY_NAME *);
+                rc = pfnGetImport(pMod, iImp, NIL_KLDRMOD_SYM_ORDINAL, pName->Name, &Value, &fKind, pvUser);
+            }
             else
             {

trunk/kLdr/kLdrRdrFile.c

@@ -1112 +1112 @@
     SecAttr.lpSecurityDescriptor = NULL;
     SecAttr.nLength = 0;
-    File = CreateFile(pszFilename, GENERIC_READ | GENERIC_EXECUTE, FILE_SHARE_READ, &SecAttr, OPEN_ALWAYS, 0, NULL);
+    File = CreateFile(pszFilename, GENERIC_READ | GENERIC_EXECUTE, FILE_SHARE_READ, &SecAttr, OPEN_EXISTING, 0, NULL);
     if (File == INVALID_HANDLE_VALUE)
         return GetLastError();

trunk/kLdr/testcase/tst-0-driver.c

@@ -72 +72 @@
     hMod = (HKLDRMOD)0xffffeeee;
     strcpy(szErr, pszErrInit);
-    rc = kLdrDyldLoad("tst-0", NULL, NULL, KLDRDYLD_SEARCH_KLDR,
+    rc = kLdrDyldLoad("tst-0-a", NULL, NULL, KLDRDYLD_SEARCH_HOST,
                       KLDRDYLD_LOAD_FLAGS_RECURSIVE_INIT, &hMod, szErr, sizeof(szErr));
     if (rc)
         Failure("kLdrDyldLoad(\"tst-0\",...) failed, rc=%d (%#x). szErr='%s'.\n", rc, rc, szErr);
-    if (strcmp(szErr, pszErrInit))
+    if (!strcmp(szErr, pszErrInit))
         Failure("szErr wasn't set.\n");
     if (hMod == (HKLDRMOD)0xffffeeee)