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

Timestamp:

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

Author:

bird

Message:

kHlp work...

Location:

trunk/kStuff/kHlp/Bare

Files:

• . (added)
• kHlpBareHeap.c (moved) (moved from trunk/kStuff/kLdr/kLdrHlpHeap.c ) (12 diffs)

trunk/kStuff/kHlp/Bare/kHlpBareHeap.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
- * kLdr - The Dynamic Loader, Helper Functions, Heap.
- *
- * Copyright (c) 2006 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,
+ * kHlpBare - Heap.
+ */
+
+/*
+ * Copyright (c) 2006-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
  *
  */
@@ -30 +30 @@
 *   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"
-
 
 
@@ -87 +85 @@
  * Assert that a heap free block is valid. */
 #ifdef KLDRHEAP_STRICT
-# define KLDRHEAP_ASSERT(expr)      kldrHlpAssert(expr)
+# define KLDRHEAP_ASSERT(expr)      kHlpAssert(expr)
 
 # define KLDRHEAP_ASSERT_BLOCK(pHeap, pBlock) \
@@ -193 +191 @@
  * @returns 0 on success, non-zero OS specific status code on failure.
  */
-int kldrHlpHeapInit(void)
+KHLP_DECL(int) kHlpHeapInit(void)
 {
     return kLdrHeapInit(&g_Heap);
@@ -202 +200 @@
  * Terminates the kLdr heap.
  */
-void kldrHlpHeapTerm(void)
+KHLP_DECL(void) kHlpHeapTerm(void)
 {
     kLdrHeapDelete(&g_Heap);
@@ -214 +212 @@
  * @param   cb      The requested heap block size.
  */
-void *kldrHlpAlloc(KSIZE cb)
+KHLP_DECL(void *) kHlpAlloc(KSIZE cb)
 {
     return kLdrHeapAlloc(&g_Heap, cb);
@@ -226 +224 @@
  * @param   cb      The requested heap block size.
  */
-void *kldrHlpAllocZ(KSIZE cb)
+KHLP_DECL(void *) kHlpAllocZ(KSIZE cb)
 {
     void *pv = kLdrHeapAlloc(&g_Heap, cb);
     if (pv)
-        kLdrHlpMemSet(pv, 0, cb);
+        kHlpMemSet(pv, 0, cb);
     return pv;
 }
@@ -238 +236 @@
  * Frees memory allocated off the kLdr heap.
  *
- * @param   pv      Pointer to the heap block returned by kldrHlpAlloc().
- */
-void kldrHlpFree(void *pv)
+ * @param   pv      Pointer to the heap block returned by kHlpAlloc().
+ */
+KHLP_DECL(void) kHlpFree(void *pv)
 {
     kLdrHeapFree(&g_Heap, pv);
@@ -252 +250 @@
  * @param   cb      The amount of memory.
  */
-void kldrHlpHeapDonate(void *pv, KSIZE cb)
+KHLP_DECL(void) kHlpHeapDonate(void *pv, KSIZE cb)
 {
     kLdrHeapDonate(&g_Heap, pv, cb);
@@ -652 +650 @@
 static int kLdrHeapSegAlloc(PKLDRHEAPSEG pSeg, KSIZE cbMin)
 {
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
     APIRET rc;
 
@@ -667 +665 @@
     }
 
-#elif defined(__WIN__)
+#elif  K_OS == K_OS_WINDOWS
     pSeg->cb = (cbMin + 0xffff) & ~(KSIZE)0xffff;
     pSeg->pvBase = VirtualAlloc(NULL, pSeg->cb, MEM_COMMIT, PAGE_READWRITE);
@@ -691 +689 @@
 static void kLdrHeapSegFree(PKLDRHEAPSEG pSeg)
 {
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
     APIRET rc = DosFreeMem(pSeg->pvBase);
     KLDRHEAP_ASSERT(!rc); (void)rc;
 
-#elif defined(__WIN__)
+#elif  K_OS == K_OS_WINDOWS
     BOOL fRc = VirtualFree(pSeg->pvBase, 0 /*pSeg->cb*/, MEM_RELEASE);
     KLDRHEAP_ASSERT(fRc); (void)fRc;