Changeset 810 for trunk/src/emx/include

Timestamp:

Oct 6, 2003, 2:55:10 AM (22 years ago)

Author:

bird

Message:

#608: High memory support.

Location:

trunk/src/emx/include

Files:

• emx/umalloc.h (modified) (6 diffs, 1 prop)
• os2safe.h (added)
• stdlib.h (modified) (1 diff, 1 prop)
• umalloc.h (modified) (2 diffs, 1 prop)

trunk/src/emx/include/emx/umalloc.h

@@ -7 +7 @@
 extern "C" {
 #endif
+
+/* include all we need here to make life easier. */
+#include <stddef.h>
+#include <umalloc.h>
+#include <sys/builtin.h>
+#include <sys/fmutex.h>
+#include <sys/rmutex.h>
+#include <sys/uflags.h>
 
 /* =========================== Introduction =========================== */
@@ -221 +229 @@
 
 #define _UM_TILE_OK(p,s)      (_UM_TILE_ALIGNED ((p), (s)) \
-                               && _UM_TILE_TILED ((p), (s))) 
+                               && _UM_TILE_TILED ((p), (s)))
 
 /* Compute the smallest number X such that P will be aligned on a A
@@ -603 +611 @@
 
 /* Note that _um_regular_heap is declared in <umalloc.h>.
-   _um_tiled_heap isn't, so we declare it here. */
+   the others aren't, so we declare them here. */
 
 extern Heap_t _um_tiled_heap;
+extern Heap_t _um_high_heap;
+extern Heap_t _um_low_heap;
 
 
@@ -710 +720 @@
 int _um_find_bucket (size_t);
 void _um_free_maybe_lock (void *, int);
-void _um_init_default_regular_heap (void);
-void _um_init_default_tiled_heap (void);
+Heap_t _um_init_default_regular_heap (void);
+Heap_t _um_init_default_tiled_heap (void);
 void *_um_lump_alloc (Heap_t, size_t, size_t, unsigned);
 void _um_lump_coalesce_free (Heap_t, struct _um_lump *, struct _um_seg *,
@@ -725 +735 @@
 int _um_walk_no_lock (Heap_t, _um_callback2 *, void *);
 
+
+/** @group Low Memory Heap Routines.
+ * Intended for internal LIBC use. First call to any of these routines
+ * will initialize the heap.
+ * @{ */
+void *  _lmalloc(size_t);
+void *  _lcalloc(size_t, size_t);
+void *  _lrealloc(void *, size_t);
+Heap_t  _linitheap(void);
+/** @} */
+
+/** @group High Memory Heap Routines.
+ * Intended for internal LIBC use. First call to any of these routines
+ * will initialize the heap.
+ * @{ */
+void *  _hmalloc(size_t);
+void *  _hcalloc(size_t, size_t);
+void *  _hrealloc(void *, size_t);
+Heap_t  _hinitheap(void);
+void *  __libc_HimemDefaultAlloc(Heap_t Heap, size_t *pcb, int *pfClean);
+void    __libc_HimemDefaultRelease(Heap_t Heap, void *pv, size_t cb);
+int     __libc_HasHighMem(void);
+/** @} */
+
+
+/** @group Default Heap Voting.
+ * @{ */
+void    __libc_HeapVote(int fDefaultHeapInHighMem);
+void    __libc_HeapEndVoting(void);
+int     __libc_HeapGetResult(void);
+/** @} */
+
+
+
 /* Inline functions. */
 
@@ -763 +807 @@
 {
   /* Use the 'syscall' write for safest possible path. */
-  extern int __write (int handle, const void *buf, size_t nbytes); 
+  extern int __write (int handle, const void *buf, size_t nbytes);
   __write (2, "\r\n!_um_abort!", 13);
   if (pszmsg)
     {
       const char *psz = pszmsg;
-      while (*psz) 
+      while (*psz)
         psz++;
       __write (2, " ", 1);

trunk/src/emx/include/stdlib.h

@@ -180 +180 @@
  */
 #if __POSIX_VISIBLE /* >= ??? */
-/* int   posix_memalign(void **, size_t, size_t); (ADV) */
+int      posix_memalign(void **, size_t, size_t); /* bird: we implement this. */
 /** @todo int    rand_r(unsigned *);    */              /* (TSF) */
 int      setenv(const char *, const char *, int);

trunk/src/emx/include/umalloc.h

@@ -47 +47 @@
 #define _HEAP_TILED     0x02
 #define _HEAP_SHARED    0x04
+#define _HEAP_HIGHMEM   0x08 /* advisory flag */
 
 #define _BLOCK_CLEAN    1
@@ -95 +96 @@
 void *_utmalloc (Heap_t, size_t);
 
-
 #if defined (__cplusplus)
 }