Changeset 1271 for trunk/src/win32k/misc/malloc.c

Timestamp:

Oct 14, 1999, 3:19:22 AM (26 years ago)

Author:

bird

Message:

Changes during Pe2Lx rewrite.

File:

• trunk/src/win32k/misc/malloc.c (modified) (11 diffs)

trunk/src/win32k/misc/malloc.c

@@ -1 @@
-/* $Id: malloc.c,v 1.1 1999-09-06 02:20:02 bird Exp $
+/* $Id: malloc.c,v 1.2 1999-10-14 01:19:21 bird Exp $
  *
  * Heap.
@@ -19 +19 @@
 
 #define SIGNATURE 0xBEEFFEEB
-#define CB_HDR (sizeof(MEMBLOCK) - 1) /* size of MEMBLOCK header (in bytes) */
+/*#define CB_HDR (sizeof(MEMBLOCK) - 1) /* size of MEMBLOCK header (in bytes) */
+#define CB_HDR (int)&(((PMEMBLOCK)0)->achUserData[0])
 #define PNEXT_BLOCK(a) ((PMEMBLOCK)((unsigned)(a) + CB_HDR + (a)->cbSize))
 
@@ -25 +26 @@
 #define INCL_DOSERRORS
 #ifdef RING0
-#define INCL_NOAPI
+    #define INCL_NOAPI
 #else
-#define INCL_DOSMEMMGR
+    #define INCL_DOSMEMMGR
 #endif
+
 
 /******************************************************************************
@@ -34 +36 @@
 ******************************************************************************/
 #include <os2.h>
-
+#ifdef RING0
+    #include "dev32hlp.h"
+    #include "asmutils.h"
+#else
+    #include <builtin.h>
+    #define Int3() __interrupt(3)
+#endif
 #include "log.h"
-#include "dev32hlp.h"
-#include "asmutils.h"
 #include "malloc.h"
-#include "memory.h"
+#include <memory.h>
 
 
@@ -45 +51 @@
 *  Structs and Typedefs
 ******************************************************************************/
+#pragma pack(1)
 typedef struct _MEMBLOCK /* MB */
 {
@@ -54 +61 @@
    unsigned char     achUserData[1];
 } MEMBLOCK, *PMEMBLOCK;
-
+#pragma pack()
 
 /******************************************************************************
 *  Global data
 ******************************************************************************/
+/*#pragma info(nogen, nouni, noext)*/
 static PMEMBLOCK   pUsed;         /* pointer to the used memblock chain. */
 static PMEMBLOCK   pFree;         /* pointer to the free memblock chain. */
 static unsigned    cbFree;        /* bytes of free user memory in the heap.*/
-unsigned           _uHeapMinPtr; /* heap pointers are greater or equal to this.*/
-unsigned           _uHeapMaxPtr; /* heap pointers are less than this. */
+unsigned           _uHeapMinPtr;  /* heap pointers are greater or equal to this.*/
+unsigned           _uHeapMaxPtr;  /* heap pointers are less than this. */
+#ifndef RING0
+    char           fInited;       /* init flag */
+#endif
 
 /******************************************************************************
@@ -277 +288 @@
     pUsed = NULL;
 
-    #if RING0
+    #ifdef RING0
         pFree = D32Hlp_VMAlloc(VMDHA_SWAP | VMDHA_USEHIGHMEM, cbSize, ~0UL);
     #else
-        if (DosAllocMem(&pFree, cbSize, PAG_COMMIT | PAG_READ | PAG_WRITE) != 0)
-            pFree = NULL
+        if (DosAllocMem((void*)&pFree, cbSize, PAG_COMMIT | PAG_READ | PAG_WRITE) != 0)
+            pFree = NULL;
     #endif
     if (pFree == NULL)
@@ -308 +319 @@
             return -2;
         }
+    #endif
+    #ifdef RING3
+        fInited = TRUE;
     #endif
     return 0;
@@ -323 +337 @@
 {
     void *pvRet = NULL;
+
     #ifdef DEBUG_ALLOC
         if (!_heap_check())
@@ -384 +399 @@
             pvRet = malloc(cbNew);
             if (pvRet != NULL)
+            {
                 memcpy(pvRet, pv, pMemblock->cbSize);
-        }
-
+                free(pv);
+            }
+        }
+        return pvRet;
     }
     return NULL;
@@ -598 +616 @@
 
 
+#if !defined(RING0) && defined(__IBMC__)
+
+/**
+ * Initialize Memory Functions
+ * Called from _exeentry.
+ */
+int _rmem_init(void)
+{
+    int rc = heapInit(HEAP_SIZE);
+    return rc;
+}
+
+/**
+ * Initialize Memory Functions
+ * Called from _exeentry.
+ */
+int _rmem_term(void)
+{
+    return 0;
+}
+
+#endif