Changeset 2875 for trunk/kLdr/kLdrDyld.c

Timestamp:

Nov 12, 2006, 9:59:45 AM (19 years ago)

Author:

bird

Message:

Got the stub loader working (but without stack allocation/switching).

File:

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

trunk/kLdr/kLdrDyld.c

@@ -98 +98 @@
 uint32_t        kLdrDyldFlags = 0;
 /** The default search method. */
-KLDRDYLDSEARCH  kLdrDyldSearch = KLDRDYLD_SEARCH_INVALID;
+KLDRDYLDSEARCH  kLdrDyldSearch = KLDRDYLD_SEARCH_HOST;
 
 
@@ -146 +146 @@
  * @{ */
 void       kldrDyldDoLoadExeStackSwitch(PKLDRDYLDMOD pExe, void *pvStack, size_t cbStack);
-void       kldrDyldDoLoadExe(PKLDRDYLDMOD pExe);
 static int kldrDyldDoLoad(const char *pszDll, const char *pszPrefix, const char *pszSuffix, KLDRDYLDSEARCH enmSearch,
                           unsigned fFlags, PPKLDRDYLDMOD ppMod, char *pszErr, size_t cchErr);
@@ -229 +228 @@
  * @param   pvOS        OS specific argument.
  */
-#ifndef __OS2__
-void kLdrDyldLoadExe(PKLDREXEARGS pArgs, void *pvOS)
+#ifndef __OS2__  /* kLdrDyldLoadExe is implemented in assembly on OS/2. */
+void kLdrDyldLoadExe(PCKLDREXEARGS pArgs, void *pvOS)
 #else
-void kldrDyldLoadExe(PKLDREXEARGS pArgs, void *pvOS)
+void kldrDyldLoadExe(PCKLDREXEARGS pArgs, void *pvOS)
 #endif
 {
@@ -241 +240 @@
 
     /*
-     * Copy the arguments into the globals and do loader init (probably already initialized).
-     */
-    kLdrDyldFlags = pArgs->fFlags;
+     * Indicate that we're boostrapping and ensure that initialization was successful.
+     */
+    g_fBootstrapping = 1;
+    rc = kldrInit();
+    if (rc)
+        kldrDyldFailure(rc, "Init failure, rc=%d", rc);
+
+    /*
+     * Validate the argument package.
+     */
+    if (pArgs->fFlags & ~(  KLDRYDLD_LOAD_FLAGS_GLOBAL_SYMBOLS
+                          | KLDRYDLD_LOAD_FLAGS_DEEP_SYMBOLS
+                          | KLDRDYLD_LOAD_FLAGS_RECURSIVE_INIT
+                          | KLDRYDLD_LOAD_FLAGS_SPECIFIC_MODULE))
+        kldrDyldFailure(KLDR_ERR_INVALID_PARAMETER, "Bad fFlags=%#x", pArgs->fFlags);
+    if (    pArgs->enmSearch <= KLDRDYLD_SEARCH_INVALID
+        ||  pArgs->enmSearch >= KLDRDYLD_SEARCH_END)
+        kldrDyldFailure(KLDR_ERR_INVALID_PARAMETER, "Bad enmSearch=%d", pArgs->enmSearch);
+
+    /*
+     * Set defaults.
+     */
+    kLdrDyldFlags |= (pArgs->fFlags & KLDRDYLD_LOAD_FLAGS_RECURSIVE_INIT);
     kLdrDyldSearch = pArgs->enmSearch;
+
+    /** @todo make sense of this default prefix/suffix stuff. */
     if (pArgs->szDefPrefix[0] != '\0')
         kLdrHlpMemCopy(kLdrDyldDefPrefix, pArgs->szDefPrefix, KLDR_MIN(sizeof(pArgs->szDefPrefix), sizeof(kLdrDyldDefPrefix)));
     if (pArgs->szDefSuffix[0] != '\0')
         kLdrHlpMemCopy(kLdrDyldDefSuffix, pArgs->szDefSuffix, KLDR_MIN(sizeof(pArgs->szDefSuffix), sizeof(kLdrDyldDefSuffix)));
-    /* append */ /** @todo create a function for doing this, an exposed api preferably. */
-    cbStack = sizeof(kLdrDyldPath) - kLdrHlpStrLen(kLdrDyldPath); /* borrow cbStack for a itty bit. */
-    kLdrHlpMemCopy(kLdrDyldPath, pArgs->szLibPath, KLDR_MIN(sizeof(pArgs->szLibPath), cbStack));
-    kLdrDyldPath[sizeof(kLdrDyldPath) - 1] = '\0';
-
-    g_fBootstrapping = 1;
-    rc = kldrInit();
-    if (rc)
-        kldrDyldFailure(rc, "Init failure, rc=%d", rc);
+
+    /** @todo append that path to the one for the specified search method. */
+    /** @todo create a function for doing this, an exposed api preferably. */
+    /* append path */
+    cbStack = sizeof(kLdrDyldLibraryPath) - kLdrHlpStrLen(kLdrDyldLibraryPath); /* borrow cbStack for a itty bit. */
+    kLdrHlpMemCopy(kLdrDyldLibraryPath, pArgs->szLibPath, KLDR_MIN(sizeof(pArgs->szLibPath), cbStack));
+    kLdrDyldLibraryPath[sizeof(kLdrDyldLibraryPath) - 1] = '\0';
 
     /*
@@ -269 +288 @@
      * Open and map the executable module before we join paths with kLdrDyldLoad().
      */
-    rc = kldrDyldFindNewModule(pArgs->szExecutable, NULL, NULL, kLdrDyldSearch,
-                               kLdrDyldFlags | KLDRDYLD_LOAD_FLAGS_EXECUTABLE, &pExe);
+    rc = kldrDyldFindNewModule(pArgs->szExecutable, NULL, NULL, pArgs->enmSearch,
+                               pArgs->fFlags | KLDRDYLD_LOAD_FLAGS_EXECUTABLE, &pExe);
     if (rc)
         kldrDyldFailure(rc, "Can't find/open the executable '%s', rc=%d", pArgs->szExecutable, rc);
@@ -745 +764 @@
     {
         if (fFlags & KLDRDYLD_LOAD_FLAGS_EXECUTABLE)
-            pLoadedMod->cDepRefs = 0xffff;
+        {
+            pLoadedMod->cDepRefs++; /* just make it stick. */
+            pLoadedMod->cRefs++;
+        }
         else
             rc = kldrDyldModDynamicLoad(pLoadedMod);