Changeset 2830

Timestamp:

Oct 23, 2006, 10:53:11 PM (19 years ago)

Author:

bird

Message:

Page aligned object allocation.

Location:

trunk/kLdr

Files:

• kLdr.c (modified) (1 diff)
• kLdr.h (modified) (1 diff)
• kLdrHlp.c (modified) (2 diffs)
• kLdrHlp.h (modified) (2 diffs)

trunk/kLdr/kLdr.c

@@ -49 +49 @@
 #include "kLdrHlp.h"
 
-#if 0
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
-/** Pointer to the head module (the executable).
- * (This is exported, so no prefix.) */
-PKLDRMOD        kLdrModuleHead = NULL;
-/** Pointer to the tail module.
- * (This is exported, so no prefix.) */
-PKLDRMOD        kLdrModuleTail = NULL;
-/** The Library search path. */
-char            kLdrLibraryPath[4096];
-/** The executable flags. */
-uint32_t        kLdrFlags;
-/** Bootstrap stack and temporary space. */
-char            abStack[8192];
-/** Set if we've initialized the loader. */
-int             fInitialized = 0;
-
 
 /*******************************************************************************
-*   Internal Functions                                                         *
+*                                                            *
 *******************************************************************************/
-static int kldrInit(void);
-static int kldrTerm(void);
-
-
-/**
- * Initialize the loader.
+/** Flag indicating whether we've initialized the loader or not.
+ *
+ * 0 if not initialized.
+ * -1 if we're initializing or terminating.
+ * 1 if we've successfully initialized it.
+ * .
  */
-int kldrInit(void)
-{
-    if (fInitialized)
-        return 0;
-    /** @todo */
-    return 0;
-}
-
-
-
-void kldrLoadExe(PKLDREXEARGS pArgs)
-{
-    /*
-     * Copy the arguments into the globals and do load init.
-     */
-    kLdrFlags = pArgs->fFlags;
-    kLdrMemCopy(kLdrLibraryPath, pArgs->szLibPath, KLDR_MIN(sizeof(pArgs->szLibPath), sizeof(kLdrLibraryPath)));
-    int rc = kldrInit();
-    if (rc)
-        kldrFailure(rc, "kLdr: Init failure, rc=%d\n", rc);
-
-    /*
-     * Open the executable module.
-     */
-    PKLDRMOD pExe;
-    kldrOpenExe(pArgs->szExecutable, &pExe);
-
-    /* Map the segments. */
-    kldrModMapSegments(pExe);
-
-    /*
-     * This is the point where we switch to the executable
-     * stack, allocating it if necessary.
-     */
-    void *pvBottom;
-    kldrModSetupStack(pExe, &pvBottom);
-    kldrLoadExecSwitchStack(pvBottom);
-}
-
-
-void kldrLoadExeOnNewStack(void)
-{
-    /*
-     * Load all dependant modules.
-     */
-    PKLDRMOD pCur;
-    do  for (pCur = kLdrModuleHead; pCur; pCur = pCur->pNext)
-        {
-            if (pCur->enmState >= KLDRSTATE_DEPS)
-                continue;
-            kldrModLoadDeps(pCur);
-        }
-    while (pCur);
-
-    /*
-     * Do fixups (FIFO).
-     */
-    for (pCur = kLdrModuleHead; pCur; pCur = pCur->pNext)
-    {
-        if (pCur->enmState >= KLDRSTATE_FIXED)
-            continue;
-        kldrModFixup(pCur, 0);
-    }
-
-    /*
-     * Do module initialization.
-     */
-    for (pCur = kLdrModuleTail; pCur != kLdrModuleTail; pCur = pCur->pPrev)
-    {
-        if (pCur->enmState >= KLDRSTATE_INITED)
-            continue;
-        kldrModCallInit(pCur);
-    }
-
-    /*
-     * Get the executable start address and commit the work that's been done.
-     */
-    void *pvEntry;
-    kldrModGetExeEntry(&pvEntry);
-
-    for (pCur = kLdrModuleHead; pCur; pCur = pCur->pNext)
-        if (pCur->enmState == KLDRSTATE_INITED)
-            pCur->enmState = KLDRSTATE_LOADED;
-
-    kldrSemRelease();
-
-    /*
-     * We're now ready for starting the executable code.
-     */
-    kldrOSStartExe(pLdrModuleHead, pvEntry);
-}
-
-
-int kLdrLoadDll(const char *pszFilename, unsigned fFlags, void *pvmod)
-{
-
-    return -1;
-}
-
+static int volatile g_fInitialized;
 
 
 
 /**
- * Panic / failure
- *
- * @returns rc if we're in a position where we can return.
- * @param   rc              Return code.
- * @param   pszFormat       Message string. Limited fprintf like formatted.
- * @param   ...             Message string arguments.
+ * Initializes the loader.
+ * @returns 0 on success, non-zero OS status code on failure.
  */
-int kldrFailure(int rc, const char *pszFormat, ...)
+int kldr)
 {
-    kldrExit(1);
+    int rc;
+
+    /* check we're already good. */
+    if (g_fInitialized == 1)
+        return 0;
+
+    /* a tiny serialization effort. */
+    for (;;)
+    {
+        if (g_fInitialized == 1)
+            return 0;
+        if (g_fInitialized == -2)
+            return -1;
+        /** @todo atomic test and set if we care. */
+        if (g_fInitialized == 0)
+        {
+            g_fInitialized = -1;
+            break;
+        }
+        kldrHlpSleep(1);
+    }
+
+    /*
+     * Do the initialization.
+     */
+    rc = kldrHlpHeapInit();
+    if (!rc)
+    {
+        rc = kldrHlpSemInit();
+        if (!rc)
+        {
+            g_fInitialized = 1;
+            return 0;
+        }
+        kldrHlpHeapTerm();
+    }
+    g_fInitialized = -2;
     return rc;
 }
 
-#endif
+
+/**
+ * Terminates the loader.
+ */
+void kldrTerm(void)
+{
+    /* can't terminate unless it's initialized. */
+    if (g_fInitialized != 1)
+        return;
+    g_fInitialized = -1;
+
+    /*
+     * Do the termination.
+     */
+    kldrHlpSemTerm();
+    kldrHlpHeapTerm();
+
+    /* done */
+    g_fInitialized = 0;
+}
+

trunk/kLdr/kLdr.h

@@ -68 +68 @@
     KLDRPROT_EXECUTE,
     /** Execute & read. */
-    KLDRPROT_EXECUTE_READONLY,
+    KLDRPROT_EXECUTE_READ,
     /** Execute, read & write. */
     KLDRPROT_EXECUTE_READWRITE,

trunk/kLdr/kLdrHlp.c

@@ -41 +41 @@
 #include <kLdr.h>
 #include "kLdrHlp.h"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -137 +476 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /** Internal worker for kldrHlpAssertMsg. */
 static void int2dec(char *pszLine, unsigned iLine)

trunk/kLdr/kLdrHlp.h

@@ -112 +112 @@
 
 
-int kldrSemInit(void);
-int kldrSemTerm(void);
-int kldrSemRequest(void);
-int kldrSemRelease(void);
-int kldrSemGlobalRequest(void);
-int kldrSemGlobalRelease(void);
+int     kldrHlpSemInit(void);
+void    kldrHlpSemTerm(void);
+int     kldrHlpSemRequest(void);
+void    kldrHlpSemRelease(void);
 
-int kldrPrivateAlloc(void *pv, size_t cb, unsigned fFlags, void **ppv);
-int kldrPrivateFree(void *pv, size_t cb);
-int kldrSharedAlloc(void *pv, size_t cb, unsigned fFlags, const char *pszFilename, void *File, void **ppv);
-int kldrSharedFree(void *pv, size_t cb);
+int     kldrHlpPageAlloc(void **ppv, size_t cb, KLDRPROT enmProt, unsigned fFixed);
+int     kldrHlpPageProtect(void *pv, size_t cb, KLDRPROT enmProt);
+int     kldrHlpPageFree(void *pv, size_t cb);
 
 int     kldrHlpHeapInit(void);
@@ -132 +129 @@
 int     kldrHlpGetEnv(const char *pszVar, char *pszVal, size_t *pcchVal);
 void    kldrHlpExit(int rc);
+
 void    kldrHlpAssertMsg(const char *pszExpr, const char *pszFile, unsigned iLine, const char *pszFunction);