Changeset 2870 for trunk/kLdr/kLdrDyldMod.c

Timestamp:

Nov 12, 2006, 6:38:28 AM (19 years ago)

Author:

bird

Message:

Test all kLdrDyld apis.

File:

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

trunk/kLdr/kLdrDyldMod.c

@@ -83 +83 @@
     if (rc)
         return kldrDyldFailure(rc, "%s: %rc", kLdrRdrName(pRdr), rc);
+
+    /*
+     * Match the module aginst the load flags.
+     */
+    switch (pRawMod->enmType)
+    {
+        case KLDRTYPE_EXECUTABLE_FIXED:
+        case KLDRTYPE_EXECUTABLE_RELOCATABLE:
+        case KLDRTYPE_EXECUTABLE_PIC:
+            if (!(fFlags & KLDRDYLD_LOAD_FLAGS_EXECUTABLE))
+            {
+                kLdrModClose(pRawMod);
+                return KLDR_ERR_NOT_EXE;
+            }
+            break;
+
+        case KLDRTYPE_OBJECT: /* We can handle these as DLLs. */
+        case KLDRTYPE_SHARED_LIBRARY_FIXED:
+        case KLDRTYPE_SHARED_LIBRARY_RELOCATABLE:
+        case KLDRTYPE_SHARED_LIBRARY_PIC:
+        case KLDRTYPE_FORWARDER_DLL:
+            if (fFlags & KLDRDYLD_LOAD_FLAGS_EXECUTABLE)
+            {
+                kLdrModClose(pRawMod);
+                return KLDR_ERR_NOT_DLL;
+            }
+            break;
+
+        default:
+            KLDRDYLDMOD_ASSERT(!"Bad enmType!");
+        case KLDRTYPE_CORE:
+            return fFlags & KLDRDYLD_LOAD_FLAGS_EXECUTABLE ? KLDR_ERR_NOT_EXE : KLDR_ERR_NOT_DLL;
+    }
 
     /*
@@ -128 +161 @@
         kLdrDyldTail = pMod;
 
-        /* we're good. */
+        /* deal with the remaining flags. */
+        if (fFlags & KLDRYDLD_LOAD_FLAGS_SPECIFIC_MODULE)
+            kldrDyldModMarkSpecific(pMod);
+        else
+            kldrDyldModMarkGlobal(pMod);
+
+        if (fFlags & KLDRYDLD_LOAD_FLAGS_GLOBAL_SYMBOLS)
+            kldrDyldModSetBindable(pMod, 0 /* not deep binable */);
+        else
+            kldrDyldModClearBindable(pMod);
+
+        /*
+         * We're good.
+         */
         *ppMod = pMod;
         rc = 0;