Changeset 3594 for trunk/kStuff/kHlp/Generic/kHlpPage.c

Timestamp:

Oct 2, 2007, 11:35:22 PM (18 years ago)

Author:

bird

Message:

Made it build on darwin - leaving a couple of things for later...

File:

• trunk/kStuff/kHlp/Generic/kHlpPage.c (modified) (7 diffs)

trunk/kStuff/kHlp/Generic/kHlpPage.c

@@ -31 +31 @@
 #include <k/kHlpAssert.h>
 
-#if K_OS == K_OS_OS2
+#if K_OS == K_OS_DARWIN
+# include <sys/syscall.h>
+# include <sys/mman.h>
+extern void *kHlpSys_mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off);
+extern int kHlpSys_mprotect(void *addr, size_t len, int prot);
+extern int kHlpSys_munmap(void *addr, size_t len);
+
+#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"
@@ -45 +54 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-#if K_OS == K_OS_OS2
+#if K_OS == K_OS_DARWIN \
+ || K_OS == K_OS_FREEBSD \
+ || K_OS == K_OS_LINUX \
+ || K_OS == K_OS_NETBSD \
+ || K_OS == K_OS_OPENBSD \
+ || K_OS == K_OS_SOLARIS
+/* nothing */
+#elif K_OS == K_OS_OS2
 /** The base of the loader stub object. <kLdr Hack>
  * The OS/2 exe stub consists of a single data object. When allocating memory
@@ -62 +78 @@
 
 
-#if K_OS == K_OS_OS2
+#if K_OS == K_OS_DARWIN \
+ || K_OS == K_OS_FREEBSD \
+ || K_OS == K_OS_LINUX \
+ || K_OS == K_OS_NETBSD \
+ || K_OS == K_OS_OPENBSD \
+ || K_OS == K_OS_SOLARIS
+static int kHlpPageProtToNative(KPROT enmProt)
+{
+    switch (enmProt)
+    {
+        case KPROT_NOACCESS:             return PROT_NONE;
+        case KPROT_READONLY:             return PROT_READ;
+        case KPROT_READWRITE:            return PROT_READ | PROT_WRITE;
+        case KPROT_EXECUTE:              return PROT_EXEC;
+        case KPROT_EXECUTE_READ:         return PROT_EXEC | PROT_READ;
+        case KPROT_EXECUTE_READWRITE:    return PROT_EXEC | PROT_READ | PROT_WRITE;
+        default:
+            kHlpAssert(0);
+            return ~0U;
+    }
+}
+
+#elif K_OS == K_OS_OS2
 static ULONG kHlpPageProtToNative(KPROT enmProt)
 {
@@ -97 +135 @@
 
 
+
 /**
  * Allocate a chunk of memory with page granularity.
@@ -108 +147 @@
 KHLP_DECL(int) kHlpPageAlloc(void **ppv, KSIZE cb, KPROT enmProt, KBOOL fFixed)
 {
-#if K_OS == K_OS_OS2
+#if K_OS == K_OS_DARWIN
+    void *pv;
+
+    pv = kHlpSys_mmap(fFixed ? *ppv : NULL, cb, kHlpPageProtToNative(enmProt),
+                      fFixed ? MAP_FIXED | MAP_ANON: MAP_ANON, -1, 0);
+    if ((KIPTR)pv < 256)
+    {
+        kHlpAssert(0);
+        return (int)(KIPTR)pv; /** @todo convert errno to kErrors */
+    }
+    *ppv = pv;
+    return 0;
+
+#elif K_OS == K_OS_OS2
     APIRET  rc;
-    ULONG   fFlags = kHlpPageProtToNative(enmProt);;
+    ULONG   fFlags = kHlpPageProtToNative(enmProt);
 
     if (!fFixed)
@@ -163 +215 @@
 KHLP_DECL(int) kHlpPageProtect(void *pv, KSIZE cb, KPROT enmProt)
 {
-#if K_OS == K_OS_OS2
+#if K_OS == K_OS_DARWIN
+    int rc;
+
+    rc = kHlpSys_mprotect(pv, cb, kHlpPageProtToNative(enmProt));
+    if (!rc)
+        return 0;
+    /** @todo convert errno -> kErrors */
+    kHlpAssert(0);
+    return rc;
+
+#elif K_OS == K_OS_OS2
     APIRET      rc;
-    ULONG       fFlags = kHlpPageProtToNative(enmProt);;
+    ULONG       fFlags = kHlpPageProtToNative(enmProt);
 
     /*
@@ -216 +278 @@
 KHLP_DECL(int) kHlpPageFree(void *pv, KSIZE cb)
 {
-#if K_OS == K_OS_OS2
+#if K_OS == K_OS_DARWIN
+    int rc;
+
+    rc = kHlpSys_munmap(pv, cb);
+    if (!rc)
+        return 0;
+    /** @todo convert errno -> kErrors */
+    return rc;
+
+#elif K_OS == K_OS_OS2
     APIRET rc;