Changeset 3598 for trunk/kStuff/kLdr

Timestamp:

Oct 4, 2007, 8:46:12 PM (18 years ago)

Author:

bird

Message:

hacking darwin.

Location:

trunk/kStuff/kLdr

Files:

• Makefile.kmk (modified) (1 diff)
• kLdrDyldFind.c (modified) (2 diffs)
• kLdrDyldOS.c (modified) (5 diffs)
• kLdrDyldSem.c (modified) (8 diffs)

trunk/kStuff/kLdr/Makefile.kmk

@@ -147 +147 @@
 kLdrStatic_SDKS.win = WINPSDK W2K3DDK
 kLdrStatic_INCS := $(PATH_SUB_CURRENT) $(PATH_SUB_ROOT)/include
+kLdrStatic_DEFS.darwin = __DARWIN__
+kLdrStatic_DEFS.os2 = __OS2__
 kLdrStatic_DEFS.win = __WIN__
-kLdrStatic_DEFS.os2 = __OS2__
-kLdrStatic_DEFS.darwin = __DARWIN__
 kLdrStatic_SOURCES = $(kLdr_SOURCES)
 

trunk/kStuff/kLdr/kLdrDyldFind.c

@@ -304 +304 @@
     if (!kLdrDyldAppDir[0])
     {
-#if defined(__OS2__)
+#if K_OS == K_OS_DARWIN
+        /** @todo implement this! */
+        kLdrDyldWindowsAppDir[0] = kLdrDyldAppDir[0] = '.';
+        kLdrDyldWindowsAppDir[1] = kLdrDyldAppDir[1] = '\0';
+
+#elif K_OS == K_OS_OS2
         PPIB pPib;
         PTIB pTib;
@@ -791 +796 @@
      */
     if (*penmSearch == KLDRDYLD_SEARCH_HOST)
-#if defined(__OS2__)
+#if K_OS == K_OS_DARWIN
+        /** @todo *penmSearch = KLDRDYLD_SEARCH_DARWIN; */
+        *penmSearch = KLDRDYLD_SEARCH_UNIX_COMMON;
+#elif K_OS == K_OS_OS2
         *penmSearch = KLDRDYLD_SEARCH_OS2;
 #elif K_OS == K_OS_WINDOWS

trunk/kStuff/kLdr/kLdrDyldOS.c

@@ -43 +43 @@
 
 #else
-# error "port me"
+# include <k/kHlpAlloc.h>
+
 #endif
 
@@ -76 +77 @@
 
 #else
-# error "Port me"
+    void *pv;
+
+    if (!cb)
+        cb = 1 * 1024*1024; /* 1MB */
+
+    if (!kHlpPageAlloc(&pv, cb, KPROT_READWRITE, K_FALSE))
+        return pv;
+    return NULL;
 #endif
 }
@@ -92 +100 @@
 int kldrDyldOSStartExe(KUPTR uMainEPAddress, void *pvStack, KSIZE cbStack)
 {
-#if defined(__OS2__)
-
-#elif K_OS == K_OS_WINDOWS
+#if K_OS == K_OS_WINDOWS
     /*
      * Invoke the entrypoint on the current stack for now.
@@ -109 +115 @@
     for (;;)
         TerminateProcess(GetCurrentProcess(), rc);
-
-/*#elif defined(__NT__)*/
-#else
-# error "Port me"
 #endif
 
@@ -126 +128 @@
     kldrDyldDoLoadExe(pExe);
 }
+

trunk/kStuff/kLdr/kLdrDyldSem.c

@@ -31 +31 @@
 #include <k/kDefs.h>
 #include <k/kHlpSem.h>
+#include <k/kHlpAssert.h>
 
-#if K_OS == K_OS_OS2
+#if K_OS == K_OS_DARWIN
+# include <mach/mach.h>
+
+#elif K_OS == K_OS_OS2
 # define INCL_BASE
 # define INCL_ERRORS
 # include <os2.h>
+
 #elif  K_OS == K_OS_WINDOWS
 # include <Windows.h>
+
 #else
 # error "port me"
@@ -47 +53 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-#if K_OS == K_OS_OS2
+#if K_OS == K_OS_DARWIN
+/** The loader sempahore. */
+static semaphore_t      g_Semaphore = MACH_PORT_NULL;
+
+#elif K_OS == K_OS_OS2
 /** The loader sempahore. */
 static HMTX             g_hmtx;
@@ -54 +64 @@
 /** The loader sempahore. */
 static CRITICAL_SECTION g_CritSect;
+
 #else
 # error "port me"
@@ -64 +75 @@
  * @returns 0 on success, non-zero OS status code on failure.
  */
-int     kLdrDyldSemInit(void)
+int kLdrDyldSemInit(void)
 {
-#if K_OS == K_OS_OS2
+#if K_OS == K_OS_DARWIN
+    kern_return_t krc;
+
+    krc = semaphore_create(mach_task_self(), &g_Semaphore, SYNC_POLICY_FIFO, 0);
+    if (krc != KERN_SUCCESS)
+        return krc;
+
+#elif K_OS == K_OS_OS2
     APIRET rc;
     g_hmtx = NULLHANDLE;
@@ -86 +104 @@
  * Terminates the loader semaphore.
  */
-void    kLdrDyldSemTerm(void)
+void kLdrDyldSemTerm(void)
 {
-#if K_OS == K_OS_OS2
+#if K_OS == K_OS_DARWIN
+    kern_return_t krc;
+    semaphore_t Semaphore = g_Semaphore;
+    g_Semaphore = MACH_PORT_NULL;
+    krc = semaphore_destroy(mach_task_self(), Semaphore);
+    kHlpAssert(krc == KERN_SUCCESS); (void)krc;
+
+#elif K_OS == K_OS_OS2
     HMTX hmtx = g_hmtx;
     g_hmtx = NULLHANDLE;
@@ -108 +133 @@
  * @returns 0 on success, non-zero OS status code on failure.
  */
-int     kLdrDyldSemRequest(void)
+int kLdrDyldSemRequest(void)
 {
-#if K_OS == K_OS_OS2
+#if K_OS == K_OS_DARWIN
+    /* not sure about this... */
+    kern_return_t krc;
+    do krc = semaphore_wait(g_Semaphore);
+    while (krc == KERN_ABORTED);
+    if (krc == KERN_SUCCESS)
+        return 0;
+    return krc;
+
+#elif K_OS == K_OS_OS2
     APIRET rc = DosRequestMutexSem(g_hmtx, 5000);
     if (rc == ERROR_TIMEOUT || rc == ERROR_SEM_TIMEOUT || rc == ERROR_INTERRUPT)
@@ -140 +174 @@
  * The caller is responsible for making sure it's the semaphore owner!
  */
-void    kLdrDyldSemRelease(void)
+void kLdrDyldSemRelease(void)
 {
-#if K_OS == K_OS_OS2
+#if K_OS == K_OS_DARWIN
+    /* not too sure about this... */
+    kern_return_t krc = semaphore_signal(g_Semaphore);
+    kHlpAssert(krc == KERN_SUCCESS); (void)krc;
+
+#elif K_OS == K_OS_OS2
     APIRET rc = DosReleaseMutexSem(g_hmtx);
     kHlpAssert(!rc); (void)rc;
@@ -152 +191 @@
 # error "port me"
 #endif
-
 }