Changeset 3573 for trunk/kStuff/kHlp/Bare/kHlpBareMem.c

Timestamp:

Aug 31, 2007, 6:09:23 AM (18 years ago)

Author:

bird

Message:

kHlp work...

Location:

trunk/kStuff/kHlp/Bare

Files:

• . (added)
• kHlpBareMem.c (moved) (moved from trunk/kStuff/kLdr/kLdrHlpMem.c ) (17 diffs)

trunk/kStuff/kHlp/Bare/kHlpBareMem.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
- * kLdr - The Dynamic Loader, Memory Helper Functions.
- *
- * Copyright (c) 2006-2007 knut st. osmundsen <bird-kbuild-src@anduin.net>
- *
- *
- * This file is part of kLdr.
- *
- * kLdr is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * kLdr is distributed in the hope that it will be useful,
+ * kHlp - Generic Page Memory Functions.
+ */
+
+/*
+ * Copyright (c) 2007 knut st. osmundsen <bird-src-spam@anduin.net>
+ *
+ * This file is part of kStuff.
+ *
+ * kStuff is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * kStuff is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with kLdr; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with kStuff; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
 
 /*******************************************************************************
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef __OS2__
+#include <k/kHlpAlloc.h>
+
+#if K_OS == K_OS_OS2
 # define INCL_BASE
 # define INCL_ERRORS
 # include <os2.h>
-#elif defined(__WIN__)
+#elif  K_OS == K_OS_WINDOWS
 # include <Windows.h>
 #else
 # error "port me"
 #endif
-
-#include <k/kLdr.h>
-#include "kLdrHlp.h"
 
 
@@ -46 +44 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
 /** The base of the stub object.
  * The OS/2 exe stub consists of a single data object. When allocating memory
@@ -54 +52 @@
 static KSIZE            g_cbStub = 0;
 
-#elif defined(__WIN__)
+#elif  K_OS == K_OS_WINDOWS
 /** The system info. */
 static SYSTEM_INFO      g_SystemInfo;
@@ -63 +61 @@
 
 
-#ifdef __OS2__
-static ULONG kldrHlpPageProtToNative(KPROT enmProt)
+#if K_OS == K_OS_OS2
+static ULONG kHlpPageProtToNative(KPROT enmProt)
 {
     switch (enmProt)
@@ -75 +73 @@
         case KPROT_EXECUTE_READWRITE:    return PAG_COMMIT | PAG_EXECUTE | PAG_READ | PAG_WRITE;
         default:
-            kldrHlpAssert(0);
+            kHlpAssert(0);
             return ~0U;
     }
 }
-#elif defined(__WIN__)
-static DWORD kldrHlpPageProtToNative(KPROT enmProt)
+#elif  K_OS == K_OS_WINDOWS
+static DWORD kHlpPageProtToNative(KPROT enmProt)
 {
     switch (enmProt)
@@ -91 +89 @@
         case KPROT_EXECUTE_READWRITE:    return PAGE_EXECUTE_READWRITE;
         default:
-            kldrHlpAssert(0);
+            kHlpAssert(0);
             return ~0U;
     }
@@ -107 +105 @@
  * @param   enmProt     The new protection. Copy-on-write is invalid.
  */
-int     kldrHlpPageAlloc(void **ppv, KSIZE cb, KPROT enmProt, unsigned fFixed)
-{
-#ifdef __OS2__
+KHLP_DECL(int) kHlpPageAlloc(void **ppv, KSIZE cb, KPROT enmProt, KBOOL fFixed)
+{
+#if K_OS == K_OS_OS2
     APIRET  rc;
-    ULONG   fFlags = kldrHlpPageProtToNative(enmProt);;
+    ULONG   fFlags = kHlpPageProtToNative(enmProt);;
 
     if (!fFixed)
@@ -128 +126 @@
     if (!rc)
         return 0;
-    kldrHlpAssert(0);
-    return rc;
-
-#elif defined(__WIN__)
+    kHlpAssert(0);
+    return rc;
+
+#elif  K_OS == K_OS_WINDOWS
     /* (We don't have to care about the stub here, because the stub will be unmapped before we get here.) */
     int     rc;
-    DWORD   fProt = kldrHlpPageProtToNative(enmProt);
+    DWORD   fProt = kHlpPageProtToNative(enmProt);
 
     if (!g_SystemInfo.dwPageSize)
@@ -143 +141 @@
         return 0;
     rc = GetLastError();
-    kldrHlpAssert(0);
+    kHlpAssert(0);
     return rc;
 
@@ -155 +153 @@
  * Change the protection of one or more pages in an allocation.
  *
- * (This will of course only work correctly on memory allocated by kldrHlpPageAlloc().)
+ * (This will of course only work correctly on memory allocated by kHlpPageAlloc().)
  *
  * @returns 0 on success, non-zero OS status code on failure.
@@ -162 +160 @@
  * @param   enmProt     The new protection. Copy-on-write is invalid.
  */
-int     kldrHlpPageProtect(void *pv, KSIZE cb, KPROT enmProt)
-{
-#ifdef __OS2__
+KHLP_DECL(int) kHlpPageProtect(void *pv, KSIZE cb, KPROT enmProt)
+{
+#if K_OS == K_OS_OS2
     APIRET      rc;
-    ULONG       fFlags = kldrHlpPageProtToNative(enmProt);;
+    ULONG       fFlags = kHlpPageProtToNative(enmProt);;
 
     /*
@@ -188 +186 @@
         }
     }
-    kldrHlpAssert(!rc);
-    return rc;
-
-#elif defined(__WIN__)
+    kHlpAssert(!rc);
+    return rc;
+
+#elif  K_OS == K_OS_WINDOWS
     DWORD fOldProt = 0;
-    DWORD fProt = kldrHlpPageProtToNative(enmProt);
+    DWORD fProt = kHlpPageProtToNative(enmProt);
     int rc = 0;
 
@@ -199 +197 @@
     {
         rc = GetLastError();
-        kldrHlpAssert(0);
+        kHlpAssert(0);
     }
     return rc;
@@ -209 +207 @@
 
 /**
- * Free memory allocated by kldrHlpPageAlloc().
+ * Free memory allocated by kHlpPageAlloc().
  *
  * @returns 0 on success, non-zero OS status code on failure.
- * @param   pv          The address returned by kldrHlpPageAlloc().
- * @param   cb          The byte count requested from kldrHlpPageAlloc().
- */
-int     kldrHlpPageFree(void *pv, KSIZE cb)
-{
-#ifdef __OS2__
+ * @param   pv          The address returned by kHlpPageAlloc().
+ * @param   cb          The byte count requested from kHlpPageAlloc().
+ */
+KHLP_DECL(int) skHlpPageFree(void *pv, KSIZE cb)
+{
+#if K_OS == K_OS_OS2
     APIRET rc;
 
@@ -242 +240 @@
             if (rc)
             {
-                kldrHlpAssert(!rc);
+                kHlpAssert(!rc);
                 return rc;
             }
@@ -259 +257 @@
      */
     rc = DosFreeMem(pv);
-    kldrHlpAssert(!rc);
-    return rc;
-
-#elif defined(__WIN__)
+    kHlpAssert(!rc);
+    return rc;
+
+#elif  K_OS == K_OS_WINDOWS
     /*
      * Free the object.
@@ -270 +268 @@
     {
         rc = GetLastError();
-        kldrHlpAssert(0);
-    }
-    return rc;
-
-#else
-# error "port me"
-#endif
-}
-
+        kHlpAssert(0);
+    }
+    return rc;
+
+#else
+# error "port me"
+#endif
+}
+