Changeset 810

Timestamp:

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

Author:

bird

Message:

#608: High memory support.

Location:

trunk

Files:

• Makefile (modified) (3 diffs, 1 prop)
• src/emx/Makefile (modified) (1 diff, 1 prop)
• src/emx/include/emx/umalloc.h (modified) (6 diffs, 1 prop)
• src/emx/include/os2safe.h (added)
• src/emx/include/stdlib.h (modified) (1 diff, 1 prop)
• src/emx/include/umalloc.h (modified) (2 diffs, 1 prop)
• src/emx/src/lib/alias/alias.smak (modified) (2 diffs, 1 prop)
• src/emx/src/lib/app/app.smak (modified) (2 diffs, 1 prop)
• src/emx/src/lib/io/eadread.c (modified) (3 diffs, 1 prop)
• src/emx/src/lib/libc.def (modified) (5 diffs, 1 prop)
• src/emx/src/lib/libc.smak (modified) (9 diffs, 1 prop)
• src/emx/src/lib/malloc/_hcalloc.c (added)
• src/emx/src/lib/malloc/_heapvoting.c (added)
• src/emx/src/lib/malloc/_hinitheap.c (added)
• src/emx/src/lib/malloc/_hmalloc.c (added)
• src/emx/src/lib/malloc/_hrealloc.c (added)
• src/emx/src/lib/malloc/_lcalloc.c (added)
• src/emx/src/lib/malloc/_linitheap.c (added)
• src/emx/src/lib/malloc/_lmalloc.c (added)
• src/emx/src/lib/malloc/_lrealloc.c (added)
• src/emx/src/lib/malloc/heapchk.c (modified) (2 diffs, 1 prop)
• src/emx/src/lib/malloc/heapmin.c (modified) (1 diff, 1 prop)
• src/emx/src/lib/malloc/heapwalk.c (modified) (3 diffs, 1 prop)
• src/emx/src/lib/malloc/initr.c (modified) (1 diff, 1 prop)
• src/emx/src/lib/malloc/initt.c (modified) (1 diff, 1 prop)
• src/emx/src/lib/malloc/malloc.c (modified) (1 diff, 1 prop)
• src/emx/src/lib/malloc/posix_memalign.c (added)
• src/emx/src/lib/malloc/realloc.c (modified) (1 diff, 1 prop)
• src/emx/src/lib/malloc/ucalloc.c (modified) (2 diffs, 1 prop)
• src/emx/src/lib/malloc/ucreate2.c (modified) (1 diff, 1 prop)
• src/emx/src/lib/malloc/umalloc.c (modified) (1 diff, 1 prop)
• src/emx/src/lib/malloc/utcalloc.c (modified) (1 diff, 1 prop)
• src/emx/src/lib/malloc/utmalloc.c (modified) (1 diff, 1 prop)
• src/emx/src/lib/misc/dirent.c (modified) (2 diffs, 1 prop)
• src/emx/src/lib/misc/getopt.c (modified) (2 diffs, 1 prop)
• src/emx/src/lib/os2_386/highmem.txt (added)
• src/emx/src/lib/os2_386/os2.smak (modified) (2 diffs, 1 prop)
• src/emx/src/lib/os2_386/safe (added)
• src/emx/src/lib/os2_386/safe/SafeDosCreatePipe.c (added)
• src/emx/src/lib/os2_386/safe/SafeDosDupHandle.c (added)
• src/emx/src/lib/os2_386/safe/SafeDosForceDelete.c (added)
• src/emx/src/lib/os2_386/safe/SafeDosOpenL.c (added)
• src/emx/src/lib/os2_386/safe/SafeDosQueryFHState.c (added)
• src/emx/src/lib/os2_386/safe/SafeDosQueryHType.c (added)
• src/emx/src/lib/os2_386/safe/SafeDosQueryNPHState.c (added)
• src/emx/src/lib/os2_386/safe/SafeDosSetDateTime.c (added)
• src/emx/src/lib/os2_386/safe/SafeDosSetFilePtr.c (added)
• src/emx/src/lib/os2_386/safe/SafeDosSetFilePtrL.c (added)
• src/emx/src/lib/os2_386/safe/SafeDosWaitChild.c (added)
• src/emx/src/lib/os2_386/safe/SafeDosWaitNPipe.c (added)
• src/emx/src/lib/os2_386/safe/safe.h (added)
• src/emx/src/lib/startup/386/crt0.s (modified) (1 diff, 1 prop)
• src/emx/src/lib/startup/386/dll0.s (modified) (1 diff, 1 prop)
• src/emx/src/lib/startup/startup.c (modified) (3 diffs, 1 prop)
• src/emx/src/lib/startup/startup.smak (modified) (4 diffs, 1 prop)
• src/emx/src/lib/sys/386/__init_environ.s (modified) (2 diffs, 1 prop)
• src/emx/src/lib/sys/386/appinit.s (modified) (2 diffs, 1 prop)
• src/emx/src/lib/sys/386/systhrea.s (modified) (2 diffs, 1 prop)
• src/emx/src/lib/sys/__endthread.c (modified) (2 diffs, 1 prop)
• src/emx/src/lib/sys/__init.c (modified) (5 diffs, 1 prop)
• src/emx/src/lib/sys/__initdll.c (modified) (7 diffs, 1 prop)
• src/emx/src/lib/sys/__newthread.c (modified) (3 diffs, 1 prop)
• src/emx/src/lib/sys/__open.c (modified) (1 diff, 1 prop)
• src/emx/src/lib/sys/__pipe.c (modified) (1 diff, 1 prop)
• src/emx/src/lib/sys/__read.c (modified) (2 diffs, 1 prop)
• src/emx/src/lib/sys/__write.c (modified) (2 diffs, 1 prop)
• src/emx/src/lib/sys/heaphigh.c (added)
• src/emx/src/lib/sys/largefileio.c (modified) (2 diffs, 1 prop)
• src/emx/src/lib/sys/remove.c (modified) (1 diff, 1 prop)
• src/emx/src/lib/sys/syscalls.h (modified) (5 diffs, 1 prop)
• src/emx/src/libos2/highmem.txt (added)
• src/emx/src/libos2/os2.smak (modified) (2 diffs, 1 prop)
• src/emx/src/libos2/safe (added)
• src/emx/src/libos2/safe/SafeDosCreatePipe.c (added)
• src/emx/src/libos2/safe/SafeDosDupHandle.c (added)
• src/emx/src/libos2/safe/SafeDosForceDelete.c (added)
• src/emx/src/libos2/safe/SafeDosOpenL.c (added)
• src/emx/src/libos2/safe/SafeDosQueryFHState.c (added)
• src/emx/src/libos2/safe/SafeDosQueryHType.c (added)
• src/emx/src/libos2/safe/SafeDosQueryNPHState.c (added)
• src/emx/src/libos2/safe/SafeDosSetDateTime.c (added)
• src/emx/src/libos2/safe/SafeDosSetFilePtr.c (added)
• src/emx/src/libos2/safe/SafeDosSetFilePtrL.c (added)
• src/emx/src/libos2/safe/SafeDosWaitChild.c (added)
• src/emx/src/libos2/safe/SafeDosWaitNPipe.c (added)
• src/emx/src/libos2/safe/safe.h (added)
• src/gcc/gcc/config/i386/emx.h (modified) (4 diffs, 1 prop)

trunk/Makefile

@@ -681 +681 @@
 ifeq "$(BUILD_PLATFORM)" "OS2"          
         unset GCCLOAD ; $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc \
-            LIBGCC2_DEBUG_CFLAGS="$(BUILD_DEBUGINFO)" \
-                      CFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -O2" \
-                    CXXFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -O2" \
-                 BOOT_CFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -O2 -mcpu=pentium -mpreferred-stack-boundary=2 -malign-strings=0 -falign-loops=2 -falign-jumps=2 -falign-functions=2" \
-                     LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zexe -Zcrtdll -Zstack 1024" \
-                BOOT_LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zexe -Zcrtdll -Zstack 1024" \
+            LIBGCC2_DEBUG_CFLAGS="$(BUILD_DEBUGINFO) -Zhigh-mem " \
+                      CFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -O2" \
+                    CXXFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -O2" \
+                 BOOT_CFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -O2 -mcpu=pentium -mpreferred-stack-boundary=2 -malign-strings=0 -falign-loops=2 -falign-jumps=2 -falign-functions=2" \
+                     LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -Zexe -Zcrtdll -Zstack 1024" \
+                BOOT_LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -Zexe -Zcrtdll -Zstack 1024" \
                 bootstrap
 else
@@ -794 +794 @@
                 unset GCCLOAD; \
                 export GCC_OMF="real"; \
-            export LIBGCC2_DEBUG_CFLAGS="-g -Zaout"; \
-                export       CFLAGS="$(OMFSPEC_HACK) -Zomf -g "; \
-                export     CXXFLAGS="$(OMFSPEC_HACK) -Zomf -g "; \
-                export  BOOT_CFLAGS="$(OMFSPEC_HACK) -Zomf -g "; \
-                export      LDFLAGS="$(OMFSPEC_HACK) -Zomf -g -Zexe -Zcrtdll -Zstack 1024"; \
-                export BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zomf -g -Zexe -Zcrtdll -Zstack 1024"; \
+            export LIBGCC2_DEBUG_CFLAGS="-g -Zhigh-mem -Zaout"; \
+                export       CFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g "; \
+                export     CXXFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g "; \
+                export  BOOT_CFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g "; \
+                export      LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zexe -Zcrtdll -Zstack 1024"; \
+                export BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zexe -Zcrtdll -Zstack 1024"; \
                 $(subst \,/,$(COMSPEC)) ; \
                 mv -f $(PATH_BUILTTOOLS)/omfhackbin $(PATH_BUILTTOOLS)/omfhack
@@ -818 +818 @@
         if test ! -d $(PATH_BUILTTOOLS)/omfhackbin; then echo "no omfhackbin"; exit 1; fi ; \
         unset GCCLOAD ; export GCC_OMF="real" ; echo GCC_OMF=$$GCC_OMF; $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gccomf \
-            LIBGCC2_DEBUG_CFLAGS="-g -Zaout" \
-                      CFLAGS="$(OMFSPEC_HACK) -Zomf -g " \
-                    CXXFLAGS="$(OMFSPEC_HACK) -Zomf -g " \
-                 BOOT_CFLAGS="$(OMFSPEC_HACK) -Zomf -g " \
-                     LDFLAGS="$(OMFSPEC_HACK) -Zomf -g -Zexe -Zcrtdll -Zstack 1024" \
-                BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zomf -g -Zexe -Zcrtdll -Zstack 1024" \
+            LIBGCC2_DEBUG_CFLAGS="-g -Zhigh-mem -Zaout" \
+                      CFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g " \
+                    CXXFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g " \
+                 BOOT_CFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g " \
+                     LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zexe -Zcrtdll -Zstack 1024" \
+                BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zexe -Zcrtdll -Zstack 1024" \
                 -e all
         mv -f $(PATH_BUILTTOOLS)/omfhackbin $(PATH_BUILTTOOLS)/omfhack

trunk/src/emx/Makefile

@@ -103 +103 @@
 LD = gcc
 # Linker flags
-LDFLAGS     = $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND) -Zmap -Zstack 1024 $(LIBS)
+LDFLAGS     = $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND) -Zmap -Zstack 1024 -Zhigh-mem $(LIBS)
 LDFLAGS.DLL = $(LDFLAGS) -Zdll
 # Linker flags for different build modes

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)
 }

trunk/src/emx/src/lib/alias/alias.smak

@@ -10 +10 @@
 .TKIND  := aout
 .INSDIR := lib/
-.TARGET := c_alias.a
+.TARGET := libc_alias.a
 include common.smak
 
@@ -22 +22 @@
 # For every aliased function create a .o file containing the alias
 # and add it to the target library.
-$.$(.TARG): $.stmp-libc-std
+##$.$(.TARG): $.stmp-libc-std
+## Depending on the timestamp kind of sucks, now we depend on the
+## header, which is better but will require libc to be build first.
+$.$(.TARG): $.libc-std.h
         $(call RM,$@)
-        @$(call DO.STDALIAS,_strcasecmp,__std_stricmp,$.strcasecmp.o)
-        @$(call DO.STDALIAS,_strncasecmp,__std_strnicmp,$.strncasecmp.o)
-        @$(call DO.STDALIAS,_itoa,__std_ltoa,$.itoa.o)
-        @$(call DO.STDALIAS,__itoa,__std_ltoa,$._itoa.o)
-        @$(call DO.STDALIAS,__Exit,__exit,$.__Exit.o)
-        @$(foreach x,$(ALIAS.FUNCS),\
-          $(call DO.STDALIAS,_$x,__std_$x,$.$x.o)$(NL))
-        @$(foreach x,$(ALIAS._FUNCS),\
-          $(call DO.STDALIAS,__$x,__std_$x,$._$x.o)$(NL))
-        $(AR) $(ARFLAGS) $@ $(addprefix $.,\
-          strcasecmp.o strncasecmp.o itoa.o _itoa.o __Exit.o \
-          $(addsuffix .o,$(ALIAS.FUNCS) $(addprefix _,$(ALIAS._FUNCS))))
-        @$(call RM,$(addprefix $., \
-          strcasecmp.o strncasecmp.o itoa.o _itoa.o __Exit.o \
-          $(addsuffix .o,$(ALIAS.FUNCS) $(addprefix _,$(ALIAS._FUNCS)))))
+        $(call MKDIR,$.aliases)
+        $(call RM,$.aliases/*.o)
+        $(call RM,$.aliases/*.s)
+        @$(call DO.STDALIAS,_strcasecmp,__std_stricmp,$.aliases/strcasecmp.o)
+        @$(call DO.STDALIAS,_strncasecmp,__std_strnicmp,$.aliases/strncasecmp.o)
+        @$(call DO.STDALIAS,_itoa,__std_ltoa,$.aliases/itoa.o)
+        @$(call DO.STDALIAS,__itoa,__std_ltoa,$.aliases/_itoa.o)
+        @$(call DO.STDALIAS,__Exit,__exit,$.aliases/__Exit.o)
+        for i in $(ALIAS.FUNCS); do \
+                echo "Aliasing _$$i to __std_$$i ..."; \
+        echo ".stabs \"_$$i\",11,0,0,0;.stabs \"__std_$$i\",1,0,0,0;" > $.aliases/_$$i.s; \
+        if as -o $.aliases/_$$i.o $.aliases/_$$i.s; then \
+                else false; \
+                fi \
+        done
+        for i in $(ALIAS._FUNCS); do \
+                echo "Aliasing __$$i to __std_$$i ..."; \
+                echo ".stabs \"__$$i\",11,0,0,0;.stabs \"__std_$$i\",1,0,0,0;" > $.aliases/__$$i.s; \
+                if as -o $.aliases/__$$i.o $.aliases/__$$i.s; then \
+                else false; \
+                fi \
+        done
+        $(AR) $(ARFLAGS) $@ $.aliases/*.o
 
 include mkomflib.smak

trunk/src/emx/src/lib/app/app.smak

@@ -7 +7 @@
 
 .TKIND  := aout
-.TARGET := c_app.a
+.TARGET := libc_app.a
 .TSRC   := $(wildcard src/lib/app/*.c)
 .TCF    := -I$.
@@ -20 +20 @@
 
 .TKIND  := aout prof
-.TARGET := c_app_p.a
+.TARGET := libc_app_p.a
 include mklib.smak

trunk/src/emx/src/lib/io/eadread.c

@@ -11 +11 @@
 #include <errno.h>
 #include <sys/ead.h>
+#include <emx/umalloc.h>
 #include "ea.h"
 
@@ -147 +148 @@
     {
       reftype = ENUMEA_REFTYPE_PATH;
-      fileref = path;
+      i = strlen(path) + 1;
+      fileref = alloca(i);
+      memcpy(fileref, path, i);
     }
   else
@@ -162 +165 @@
         {
           dena_buf_size += 0x20000; /* DosEnumAttribute is broken */
-          dena_buf = realloc (dena_buf, dena_buf_size);
+          dena_buf = _lrealloc (dena_buf, dena_buf_size);
           if (dena_buf == NULL)
             {

trunk/src/emx/src/lib/libc.def

@@ -43 +43 @@
     "__sys_pid" @23
     "__sys_ppid" @24
-    "__sys_private_heap" @25
+    "__um_high_heap" @25
     "__sys_thread_table" @26
     "__sys_top_heap_obj" @27
@@ -72 +72 @@
     "___locale_lconv" @52
     "___locale_time" @53
-    "__sys_virtual_address_limit" @54
-    "___pfnDosOpenL" @55
-    "___pfnDosSetFileLocksL" @56
-    "___pfnDosSetFilePtrL" @57
-    "___pfnDosSetFileSizeL" @58
+    "__um_low_heap" @54
+    "__rand48_add" @55
+    "__rand48_mult" @56
+    "__rand48_seed" @57
 
 ; code
@@ -89 +88 @@
     "__init1_fdinit" @108
     "__init1_tmp" @109
-    "___init_environ" @110
-    "___init_ret" @111
+    "__std_posix_memalign" @110
+    "__lrealloc" @111
     "__init_streams" @112
     "___initthread" @113
@@ -812 +811 @@
     "__std_unsetenv" @831
     "__std_lockf" @832
-    "___init_largefileio" @833
+    "__lmalloc" @833
     "__std_fseeko" @834
     "__std_ftello" @835
@@ -835 +834 @@
     "__dorand48" @854
     "__std_srand48" @855
-    "__rand48_add" @856
-    "__rand48_mult" @857
-    "__rand48_seed" @858
-    "__std_drand48" @859
-    "__std_erand48" @860
-    "__std_jrand48" @861
-    "__std_lcong48" @862
-    "__std_lrand48" @863
-    "__std_mrand48" @864
-    "__std_nrand48" @865
-    "__std_seed48" @866
-    "__std_qsort_r" @867
+    "__std_drand48" @856
+    "__std_erand48" @857
+    "__std_jrand48" @858
+    "__std_lcong48" @859
+    "__std_lrand48" @860
+    "__std_mrand48" @861
+    "__std_nrand48" @862
+    "__std_seed48" @863
+    "__std_qsort_r" @864
+    "__hcalloc" @865
+    "__hinitheap" @866
+    "__hmalloc" @867
+    "__hrealloc" @868
+    "__lcalloc" @869
+    "__linitheap" @870

trunk/src/emx/src/lib/libc.smak

@@ -25 +25 @@
 .MDESC  := The C library
 
-.TARGET := c_p.a
+.TARGET := libc_p.a
 .TKIND  := aout prof
 .TSRC   := $(libc.TSRC.$(CPU)) $(libc.TSRC)
@@ -34 +34 @@
 include mklib.smak
 
-# Build c.a last since LIBC.DLL needs .OBJS from c.a
-.TARGET := c.a
+# Build libc.a last since LIBC.DLL needs .OBJS from libc.a
+.TARGET := libc.a
 .TKIND  := aout
 .TKEEP  := 1
@@ -49 +49 @@
 LIBC.STUBARG    := $(if $(LIBC.STUB),-Zlinker -STUB:$(LIBC.STUB))
 LIBC.DLL        := $.omf/libc$(VH)$(VM).dll
-LIBC.IMPLIB     := $.omf/c_dll.lib $.aout/c_dll.a
+LIBC.IMPLIB     := $.omf/libc_dll.lib $.aout/libc_dll.a
 LIBC.DEF        := $.omf/libc.def
-LIBC.OBJS       := $.omf/src/lib/startup/386/dll0.obj $.omf/src/lib/startup/dllinit.obj
-LIBC.LIBS       := $.omf/c.lib $.omf/c_app.lib
-LIBC.DEPS       := $(LIBC.STUB) $.omf/c_alias.lib
+LIBC.OBJS       := $.omf/src/lib/startup/dll0hi.obj $.omf/src/lib/startup/dllinit.obj
+LIBC.LIBS       := $.omf/libc.lib $.omf/libc_app.lib
+LIBC.DEPS       := $(LIBC.STUB) $.omf/libc_alias.lib
 LIBC.DLL.OBJS   :=
 LIBC.DIRS       := $(sort $(dir $(LIBC.OBJS) $(LIBC.DEPS) $(LIBC.DLL.OBJS)))
@@ -59 +59 @@
 LIBC.PRF.DLL    := $(LIBC.DLL:.dll=.prf)
 LIBC.PRF.DEF    := $.omf/libc.prf.def
-LIBC.PRF.OBJS   := $.omf/src/lib/startup/386/dll0.obj $.omf-prof/src/lib/startup/dllinit.obj
-LIBC.PRF.LIBS   := $.omf-prof/c_p.lib $.omf-prof/c_app_p.lib
+LIBC.PRF.OBJS   := $.omf/src/lib/startup/dll0hi.obj $.omf-prof/src/lib/startup/dllinit.obj
+LIBC.PRF.LIBS   := $.omf-prof/libc_p.lib $.omf-prof/libc_app_p.lib
 LIBC.PRF.DEPS   := $(LIBC.DEPS)
 LIBC.PRF.DIRS   := $(sort $(dir $(LIBC.PRF.OBJS) $(LIBC.PRF.DEPS)))
@@ -95 +95 @@
         @$(call FECHO,$@,EXPORTS)
         $(call DO.EMXEXP,$(filter %.lib,$^),$@)
+        sed -e "/\"___pfn/d" -e "/\"__sys_/d" -e "/\"___libc_/d" $@ > $@.tmp
+        mv -f $@.tmp $@
         krx.exe src/lib/dlllegacy.cmd -e "_DLL_InitTerm" $@ src/lib/libc.def
 
@@ -114 +116 @@
         echo $@         
 
-# LIBC .def file (two steps).
+# LIBC.PREF .def file
 $(LIBC.PRF.DEF): $(LIBC.DEF)
         $(call RM,$@)
@@ -134 +136 @@
         echo $@         
 
-# LIBC .def file (two steps)
+# LIBC.ELH .def file
 # Man! This sucks! Isn't there support for inline files (<<\nfile\n<<) in GNU MAKE?
-# Even M$/IBM nmake     have that.
+# Even M$/IBM nmake     have that. ;-)
 # And no, I couldn't care less about performance with this type of DLL.
 $(LIBC.ELH.DEF): $(LIBC.DEF) src/lib/libc.smak
@@ -213 +215 @@
 .PHONY: libc-dll
 all: libc-dll
-libc-dll: emxbind emxexp app alias libc os2 \
+libc-dll: emxbind emxexp app alias libc os2 os2@omf \
                         $(LIBC.DIRS) $(LIBC.DLL) $(LIBC.IMPLIB) \
                         $(LIBC.PRF.DIRS) $(LIBC.PRF.DLL) \
@@ -244 +246 @@
 
 # How libc-std.h can be auto-generated.
-# Unfortunately, we cannot use c.a to find out all _std_ names since
-# c.a itself depends on this header file. Thus we have to scan all source
+# Unfortunately, we cannot use libc.a to find out all _std_ names since
+# libc.a itself depends on this header file. Thus we have to scan all source
 # files for _STD() macros invocations. Fortunately, gawk rulez forever thus
 # this happens in just a fraction of second.

trunk/src/emx/src/lib/malloc/heapchk.c

@@ -15 +15 @@
   _UM_MT_DECL
   int rc1, rc2;
+  Heap_t    heap_reg = _UM_DEFAULT_REGULAR_HEAP;
+  Heap_t    heap_tiled = _UM_DEFAULT_TILED_HEAP;
 
   /* Initialize the heap pointers, in case _heapchk() is called by a
      new thread before malloc(). */
 
-  if (_UM_DEFAULT_REGULAR_HEAP == NULL)
-    _um_init_default_regular_heap ();
-  if (_UM_DEFAULT_TILED_HEAP == NULL)
-    _um_init_default_tiled_heap ();
+  if (heap_reg == NULL)
+    heap_reg = _um_init_default_regular_heap ();
+  if (heap_tiled == NULL)
+    heap_tiled = _um_init_default_tiled_heap ();
 
   /* First check the regular heap. */
 
-  rc1 = _uheapchk (_UM_DEFAULT_REGULAR_HEAP);
+  rc1 = _uheapchk (heap_reg);
   if (rc1 != _HEAPOK && rc1 != _HEAPEMPTY)
     return rc1;
@@ -40 +42 @@
      heaps is non-empty. */
 
-  rc2 = _uheapchk (_UM_DEFAULT_TILED_HEAP);
+  rc2 = _uheapchk (heap_tiled);
   if (rc2 == _HEAPEMPTY)
     return rc1;

trunk/src/emx/src/lib/malloc/heapmin.c

@@ -14 +14 @@
 {
   _UM_MT_DECL
+  Heap_t    heap_reg = _UM_DEFAULT_REGULAR_HEAP;
 
-  if (_UM_DEFAULT_REGULAR_HEAP == NULL)
-    _um_init_default_regular_heap ();
-  return _uheapmin (_UM_DEFAULT_REGULAR_HEAP);
+  if (heap_reg == NULL)
+    heap_reg = _um_init_default_regular_heap ();
+  return _uheapmin (heap_reg);
 }

trunk/src/emx/src/lib/malloc/heapwalk.c

@@ -2 +2 @@
 
 #include "libc-alias.h"
-#include <stdlib.h>
-#include <stddef.h>
 #include <umalloc.h>
-#include <sys/builtin.h>        /* For <sys/fmutex.h> */
-#include <sys/fmutex.h>         /* For <sys/rmutex.h> */
-#include <sys/rmutex.h>
 #include <emx/umalloc.h>
 #include <emx/thread.h>
@@ -14 +9 @@
 {
   _UM_MT_DECL
-  int rc;
+  Heap_t    heap_reg = _UM_DEFAULT_REGULAR_HEAP;
+  Heap_t    heap_tiled = _UM_DEFAULT_TILED_HEAP;
+  int       rc;
 
   /* Initialize the heap pointers, in case _heap_walk() is called by a
      new thread before malloc(). */
 
-  if (_UM_DEFAULT_REGULAR_HEAP == NULL)
-    _um_init_default_regular_heap ();
-  if (_UM_DEFAULT_TILED_HEAP == NULL)
-    _um_init_default_tiled_heap ();
+  if (heap_reg == NULL)
+    heap_reg = _um_init_default_regular_heap ();
+  if (heap_tiled == NULL)
+    heap_tiled = _um_init_default_tiled_heap ();
 
   /* First walk through the regular heap. */
 
-  rc = _uheap_walk (_UM_DEFAULT_REGULAR_HEAP, callback);
+  rc = _uheap_walk (heap_reg, callback);
   if (rc != 0)
     return rc;
@@ -33 +30 @@
      heap, return the regular heap's status. */
 
-  if (_UM_DEFAULT_REGULAR_HEAP == _UM_DEFAULT_TILED_HEAP
-      || _UM_DEFAULT_TILED_HEAP == NULL)
+  if (heap_reg == heap_tiled || heap_tiled == NULL)
     return rc;
 
   /* Walk through the tiled heap. */
 
-  return _uheap_walk (_UM_DEFAULT_TILED_HEAP, callback);
+  return _uheap_walk (heap_tiled, callback);
 }

trunk/src/emx/src/lib/malloc/initr.c

@@ -2 +2 @@
 
 #include "libc-alias.h"
-#include <stdlib.h>
-#include <stddef.h>
 #include <umalloc.h>
-#include <sys/builtin.h>        /* For <sys/fmutex.h> */
-#include <sys/fmutex.h>         /* For <sys/rmutex.h> */
-#include <sys/rmutex.h>
+#include <emx/umalloc.h>
 #include <sys/smutex.h>
-#include <sys/uflags.h>
-#include <emx/umalloc.h>
 #include <emx/thread.h>
 
-/* This is the default regular heap. */
-
+/** This is the default regular heap. */
 Heap_t _um_regular_heap;
 
+/**
+ * Sets the default regular heap for the current thread and perhaps
+ * even the system.
+ *
+ * Now because of the voting procedure we do not set the _um_regular_heap nor
+ * the per thread variable until the voting is completed. There for make sure
+ * to use the returned value not the one in the per thread or system variables!
+ *
+ * @returns Default heap for the thread.
+ */
+Heap_t _um_init_default_regular_heap(void)
+{
+    _UM_MT_DECL
+    static _smutex  lock;
+    Heap_t          heap_reg = _UM_DEFAULT_REGULAR_HEAP;
 
-void _um_init_default_regular_heap (void)
-{
-  _UM_MT_DECL
-  void *memory;
-  Heap_t h;
-  static _smutex lock;
+    /*
+     * Is there actually anything left to be done?
+     */
+    if (!heap_reg)
+    {
+        int     vote = __libc_HeapGetResult();
+        if (vote >= 0)
+        {
+            /*
+             * Is system wide default heap initiated?
+             */
+            _smutex_request(&lock);
+            heap_reg = _um_regular_heap;
+            if (!heap_reg)
+            {
+                if (vote)
+                {
+                    /*
+                     * Use high memory heap.
+                     */
+                    _um_regular_heap = heap_reg = _hinitheap();
+                }
+                else
+                {
+                    /*
+                     * Use low memory heap.
+                     */
+                    _um_regular_heap = heap_reg = _linitheap();
+                }
+            }
+            _smutex_release(&lock);
 
-  _smutex_request (&lock);
-
-  /* Create the regular heap if it hasn't been created by another
-     thread between the check of _UM_DEFAULT_REGULAR_HEAP by our
-     caller and obtaining the semaphore. */
-
-  if (_UM_DEFAULT_REGULAR_HEAP == NULL)
-    {
-      if (_um_regular_heap == NULL)
+            /*
+             * Set the per thread default.
+             */
+            _UM_DEFAULT_REGULAR_HEAP = heap_reg;
+        }
+        else
         {
-          _uflags (_UF_SBRK_MODEL, _UF_SBRK_ARBITRARY);
-          memory = sbrk (_INITIAL_DEFAULT_HEAP_SIZE);
-          if (memory == (void *)-1)
-            abort ();
-          h = _ucreate2 (memory, _INITIAL_DEFAULT_HEAP_SIZE,
-                         !_BLOCK_CLEAN, _HEAP_REGULAR,
-                         _um_default_alloc, _um_default_release,
-                         _um_default_expand, _um_default_shrink);
-          if (h == NULL)
-            abort ();
-          if (_uopen (h) != 0)
-            abort ();
-          _um_regular_heap = h;
+            /*
+             * The voting is not yet over, so we must return the low heap.
+             * We do not set either the per thread or system defaults!
+             */
+            heap_reg = _um_low_heap;
+            if (!heap_reg)
+                heap_reg = _linitheap();
         }
-
-      _UM_DEFAULT_REGULAR_HEAP = _um_regular_heap;
     }
 
-  _smutex_release (&lock);
+    return heap_reg;
 }
+

trunk/src/emx/src/lib/malloc/initt.c

@@ -2 +2 @@
 
 #include "libc-alias.h"
-#include <stdlib.h>
-#include <stddef.h>
-#include <umalloc.h>
-#include <sys/builtin.h>        /* For <sys/fmutex.h> */
-#include <sys/fmutex.h>         /* For <sys/rmutex.h> */
-#include <sys/rmutex.h>
+#include <emx/umalloc.h>
 #include <sys/smutex.h>
-#include <sys/uflags.h>
-#include <emx/umalloc.h>
 #include <emx/thread.h>
 
-/* This is the default tiled heap. */
-
+/** This is the default tiled heap. */
 Heap_t _um_tiled_heap = NULL;
 
+/**
+ * Initialize the default tiled heap for the current thread.
+ *
+ * Sets _um_tiled_heap to _um_low_heap if zero. The per thread
+ * default tiled heap is set to _um_tiled_heap.
+ *
+ * @returns Heap handle on success.
+ */
+Heap_t _um_init_default_tiled_heap(void)
+{
+    _UM_MT_DECL
+    Heap_t          heap_tiled;
+    static _smutex  lock;
 
-void _um_init_default_tiled_heap (void)
-{
-  _UM_MT_DECL
-  static _smutex lock;
-
-  _smutex_request (&lock);
-
-  /* Create the tiled heap if it hasn't been created by another thread
-     between the check of _UM_DEFAULT_TILED_HEAP by our caller and
-     obtaining the semaphore. */
-
-  if (_UM_DEFAULT_TILED_HEAP == NULL)
+    /*
+     * Create the tiled heap if it hasn't been created by another thread
+     * between the check of _UM_DEFAULT_TILED_HEAP by our caller and
+     * obtaining the semaphore.
+     */
+    heap_tiled = _UM_DEFAULT_TILED_HEAP;
+    if (heap_tiled == NULL)
     {
-      if (_um_tiled_heap == NULL)
+        _smutex_request(&lock);
+        if (_um_tiled_heap == NULL)
         {
-          /* Use the regular heap also as tiled heap. */
-          _um_init_default_regular_heap ();
-          _um_tiled_heap = _um_regular_heap;
+            /* Use the low heap also as tiled heap. */
+            _linitheap();
+            _um_tiled_heap = _um_low_heap;
         }
 
-
-      _UM_DEFAULT_TILED_HEAP = _um_tiled_heap;
+        _UM_DEFAULT_TILED_HEAP = heap_tiled = _um_tiled_heap;
+        _smutex_release(&lock);
     }
 
-  _smutex_release (&lock);
+    return heap_tiled;
 }
+

trunk/src/emx/src/lib/malloc/malloc.c

@@ -14 +14 @@
 {
   _UM_MT_DECL
+  Heap_t    heap_reg = _UM_DEFAULT_REGULAR_HEAP;
 
-  if (_UM_DEFAULT_REGULAR_HEAP == NULL)
-    _um_init_default_regular_heap ();
-  return _umalloc (_UM_DEFAULT_REGULAR_HEAP, size);
+  if (heap_reg == NULL)
+    heap_reg = _um_init_default_regular_heap ();
+  return _umalloc (heap_reg, size);
 }

trunk/src/emx/src/lib/malloc/realloc.c

@@ -15 +15 @@
     return malloc (new_size);
   else
-    return _um_realloc (block, new_size, 4, 0);
+    return _um_realloc (block, new_size, new_size < 32 ? 4 : 16, 0);
 }

trunk/src/emx/src/lib/malloc/ucalloc.c

@@ -18 +18 @@
   void *block;
   unsigned flags;
+  unsigned align;
 
   assert (h->magic == _UM_MAGIC_HEAP);
@@ -27 +28 @@
     return NULL;
 
+  align = (size < 32 ? 4 : 16);
+
   _um_heap_lock (h);
   flags = _UMFI_ZERO;
   if (h->type & _HEAP_TILED)
     flags |= _UMFI_TILED;
-  block = _um_alloc_no_lock (h, bytes, 4, flags);
+  block = _um_alloc_no_lock (h, bytes, align, flags);
   _um_heap_unlock (h);
   return block;

trunk/src/emx/src/lib/malloc/ucreate2.c

@@ -22 +22 @@
 
   /* Check the TYPE argument.  It must not contain any bits but
-     _HEAP_REGULAR, _HEAP_TILED, and _HEAP_SHARED.  Exactly one of
-     _HEAP_REGULAR and _HEAP_TILED must be set. */
+     _HEAP_REGULAR, _HEAP_TILED, _HEAP_SHARED, and _HEAP_HIGHMEM.
+     Exactly one of _HEAP_REGULAR and _HEAP_TILED must be set.
+     _HEAP_HIGHMEM and _HEAP_TILED are mutaly exclusive. */
 
-  if (type & ~(_HEAP_REGULAR|_HEAP_TILED|_HEAP_SHARED))
+  if (type & ~(_HEAP_REGULAR|_HEAP_TILED|_HEAP_SHARED|_HEAP_HIGHMEM))
     return NULL;
   t = type & (_HEAP_REGULAR|_HEAP_TILED);
   if (t != _HEAP_REGULAR && t != _HEAP_TILED)
       return NULL;
+  if ((type & (_HEAP_HIGHMEM|_HEAP_TILED)) == (_HEAP_HIGHMEM|_HEAP_TILED))
+      return NULL;
+
 
   /* Check the SIZE argument. */

trunk/src/emx/src/lib/malloc/umalloc.c

@@ -15 +15 @@
   void *block;
   unsigned flags;
+  unsigned align = (size < 32 ? 4 : 16);
 
   assert (h->magic == _UM_MAGIC_HEAP);
   if (h->magic != _UM_MAGIC_HEAP)
     return NULL;
+
   _um_heap_lock (h);
   flags = 0;
   if (h->type & _HEAP_TILED)
     flags |= _UMFI_TILED;
-  block = _um_alloc_no_lock (h, size, 4, flags);
+  block = _um_alloc_no_lock (h, size, align, flags);
   _um_heap_unlock (h);
   return block;

trunk/src/emx/src/lib/malloc/utcalloc.c

@@ -19 +19 @@
   if (h->magic != _UM_MAGIC_HEAP)
     return NULL;
+  if (h->type & _HEAP_HIGHMEM)
+    return NULL;
 
   bytes = count * size;

trunk/src/emx/src/lib/malloc/utmalloc.c

@@ -18 +18 @@
   if (h->magic != _UM_MAGIC_HEAP)
     return NULL;
+  if (h->type & _HEAP_HIGHMEM)
+    return NULL;
   _um_heap_lock (h);
   block = _um_alloc_no_lock (h, size, 4, _UMFI_TILED);

trunk/src/emx/src/lib/misc/dirent.c

@@ -11 +11 @@
 #include <emx/io.h>
 #include <emx/syscalls.h>
+#include <emx/umalloc.h>
 
 
@@ -115 +116 @@
          */
         cch = strlen(psz) + 1;
-        dp = malloc(sizeof(struct _dircontents) + cch);
+        dp = _hmalloc(sizeof(struct _dircontents) + cch);
         if (dp == NULL)
         {

trunk/src/emx/src/lib/misc/getopt.c

@@ -6 +6 @@
 #include <string.h>
 #include <emx/getopt.h>
+#include <emx/umalloc.h>
 
 char *optarg          = NULL;
@@ -47 +48 @@
       if (optmode == GETOPT_ANY)
         {
-          options = (char **)malloc (argc * sizeof (char *));
-          non_options = (char **)malloc (argc * sizeof (char *));
+          options = (char **)_hmalloc (argc * sizeof (char *));
+          non_options = (char **)_hmalloc (argc * sizeof (char *));
           if (options == NULL || non_options == NULL)
             {

trunk/src/emx/src/lib/os2_386/os2.smak

@@ -6 +6 @@
 .INSDIR := lib/
 
-.TARGET := os2.a
+.TARGET := libos2.a
 .TKIND  := aout
 .TSRC.386 := $(wildcard src/lib/os2_386/*.s)
-.TSRC   := $(.TSRC.$(CPU)) $(wildcard src/lib/os2_386/*.c)
+.TSRC   := $(.TSRC.$(CPU)) $(wildcard src/lib/os2_386/*.c) $(wildcard src/lib/os2_386/safe/*.c)
 .TCF    := -Wno-unused -s
 .IMPS   := $(wildcard src/lib/os2_386/*.imp)
@@ -15 +15 @@
 include mkimplib.smak
 
-.TARGET := os2_p.a
+.TARGET := libos2_p.a
 .TKIND  := aout prof
 .TCF    := -Wno-unused
 include mkimplib.smak
+

trunk/src/emx/src/lib/startup/386/crt0.s

@@ -38 +38 @@
 
 __text:
+#if defined (HIGHMEM)
+    pushl    $1     /* vote for high mem for default stack */
+#else
+    pushl    $0     /* veto agains high mem for default stack */
+#endif
         call    ___init_app
     /* esp points to main() call frame. */

trunk/src/emx/src/lib/startup/386/dll0.s

@@ -36 +36 @@
 
 __text:
-/** @todo ___init_dll shouldn't be called, only _DLL_InitTerm. */
+    cmpl    $0, 8(%esp)
+    jz      do_common_init
+    jmp     do_initterm
+
+    /*
+     * Nonstandard: we're doing some early initializations.
+     */
+do_common_init:
+#if defined (HIGHMEM)
+    pushl    $1     /* vote for high mem for default stack */
+#else
+    pushl    $0     /* veto against high mem for default stack */
+#endif
         call    ___init_dll
+    add     $4, %esp
+    orl     %eax, %eax
+    jz      do_initterm
+    /*
+     * __init_dll() failed - fail the dll loading.
+     */
+    xorl    %eax, %eax
+    ret
+
+    /*
+     * Standard initialization.
+     */
+do_initterm:
         cld
     jmp     _DLL_InitTerm
 
+
         .data
-
 __data:
         .long   0xba0bab        // Magic number (error detection)

trunk/src/emx/src/lib/startup/startup.c

@@ -111 +111 @@
  * LIBCxy.DLL:
  *      - dll0.s gets control and calls __init_dll in sys/__initdll.c
+ *          - __init_dll calls __libc_HeapVote() to do the heap voting.
  *          - __init_dll calls __init_os_version() to set _osminor,_osmajor globals.
  *          - __init_dll initiates _sys_pid and _sys_ppid globals.
- *          - __init_dll creates _sys_heap_fmutex.
- *          - __init_dll allocates and initialized the _sys_private_heap heap, which is
- *            operated by DosSubSetMem() and it's friends.
+ *          - __init_dll creates _sys_heap_fmutex and _sys_gmtxHimem.
  *          - __init_dll then initializes _sys_thread_table and calls __newthread() in
  *            sys/__newthread.c to create the thread 1 entry.
+ *              - __newthread() will call __sys_newthread() which inits the high memory
+ *                heap (or low if no high mem) when calling _hmalloc().
  *          - __init_dll calls __init_environ() which initializes environ and _org_environ.
  *          - __init_dll then intializes _sys_clock0_ms with the current MS count.
@@ -130 +131 @@
  * Your.DLL:
  *      - dll0.s gets control and calls __init_dll() in sys/__initdll.c
- *          - __init_dll returns at once since already done during LIBCxy.DLL init.
+ *          - __init_dll calls __libc_HeapVote() to do the heap voting.
+ *          - __init_dll then returns since already done during LIBCxy.DLL init.
  *      - dll0.s calls _DLL_InitTerm in startup/dllinit.c.
  *          - _DLL_InitTerm calls _CRT_init() in startup/startup.c to initialize the CRT.
@@ -141 +143 @@
  *      - crt0.s gets control and calls ___init_app in sys/386/appinit.s which forwards
  *        the call to __init() in sys/__init.c.
- *          - __init() calls __init_dll() which returns at once because of LIBCxy.DLL init.
+ *          - __init() calls __init_dll() to do common initiation.
+ *              - __init_dll calls __libc_HeapVote() to do the heap voting.
+ *              - __init_dll then returns since already done during LIBCxy.DLL init.
  *          - __init() parse the commandline to figure out how much stack to use for array
  *            and the argument copy.

trunk/src/emx/src/lib/startup/startup.smak

@@ -9 +9 @@
 include common.smak
 
-.OBJS += $(addprefix $.$(.TKIND.DIR)src/lib/startup/,mcrt0.o gcrt0.o) \
+.OBJS += $(addprefix $.$(.TKIND.DIR)src/lib/startup/,mcrt0.o gcrt0.o crt0hi.o dll0hi.o) \
   $(addprefix $.omf/src/lib/startup/,mcrt0.obj gcrt0.obj \
-  $(CPU)/crt0.obj $(CPU)/dll0.obj)
+  $(CPU)/crt0.obj $(CPU)/dll0.obj crt0hi.obj dll0hi.obj)
 .DIRS := $(sort $(dir $(.OBJS)))
 TARGDIRS += $(.DIRS)
@@ -21 +21 @@
         $(call CP,$^,$(dir $@))
 
+$.aout/src/lib/startup/crt0hi.o: src/lib/startup/386/crt0.s
+        $(call DO.COMPILE.s, -DHIGHMEM)
+        
+$.aout/src/lib/startup/dll0hi.o: src/lib/startup/386/dll0.s
+        $(call DO.COMPILE.s, -DHIGHMEM)
+                                
 $.aout/src/lib/startup/mcrt0.o: src/lib/startup/386/crt0.s
         $(call DO.COMPILE.s, -DMCRT0)
@@ -30 +36 @@
         $(call RM,tmp1.o tmp2.o)
 
-# This rule doesnt work if the aout/src/lib/startup/ directory does not
+# This rule doesn't work if the aout/src/lib/startup/ directory does not
 # exist when make is started, and is ignored because of this (shit!)
 #$.omf/src/lib/startup/%.obj: $.aout/src/lib/startup/%.o
@@ -40 +46 @@
 $.omf/src/lib/startup/gcrt0.obj: $.aout/src/lib/startup/gcrt0.o
         $(call DO.EMXOMF,-m__text)
+$.omf/src/lib/startup/dll0hi.obj: $.aout/src/lib/startup/dll0hi.o
+        $(call DO.EMXOMF,-m__text)
+$.omf/src/lib/startup/crt0hi.obj: $.aout/src/lib/startup/crt0hi.o
+        $(call DO.EMXOMF,-m__text)
 $.omf/src/lib/startup/386/dll0.obj: $.aout/src/lib/startup/386/dll0.o
         $(call DO.EMXOMF,-m__text)

trunk/src/emx/src/lib/sys/386/__init_environ.s

@@ -36 +36 @@
  *
  */
-    .globl ___init_environ
-___init_environ:
+    .globl __sys_init_environ
+__sys_init_environ:
     pushl   %ebp
     movl    %esp, %ebp
@@ -68 +68 @@
     movl    %esi, %ecx
     subl    %esp, %ecx
-    / DosSubAllocMem(_sys_private_heap, &_org_environ, size);
+    / _org_environ = _hmalloc(size);
     pushl   %ecx
-    pushl   $__org_environ
-    pushl   __sys_private_heap
-    call    DosSubAllocMem
-    addl    $12, %esp
+    call    __hmalloc
+    addl    $4, %esp
     orl     %eax, %eax
-    jnz     env_ret
+    jz      env_ret
+    mov     %eax, __org_environ
 
     /*

trunk/src/emx/src/lib/sys/386/appinit.s

@@ -2 +2 @@
 
         .globl  ___init_app
-        .globl  ___init_ret
+        .globl  __sys_init_ret
 
         .data
@@ -16 +16 @@
         hlt
 
-___init_ret:
+__sys_init_ret:
         movl    4(%esp), %esp
         jmp     *L_ret

trunk/src/emx/src/lib/sys/386/systhrea.s

@@ -8 +8 @@
 
 __sys_thread:
+        /** @todo change this to use a TLS variable */
+        movl    %fs, %ecx
+        movl    $DosTIB, %eax
+        movl    %eax, %fs
         fs
         movl    12, %eax                /* ptib2 */
         movl    0(%eax), %edx           /* TID */
         movl    __sys_thread_table(,%edx,4), %eax
+        movl    %ecx, %fs
         testl   %eax, %eax
         jz      1f
@@ -21 +26 @@
         pushl   %edx                    /* tid */
         call    ___sys_newthread
-        addl    $4, %esp
+        addl    $8, %esp
         popl    %edx
         movl    __sys_thread_table(,%edx,4), %eax

trunk/src/emx/src/lib/sys/__endthread.c

@@ -2 +2 @@
 
 #include "libc-alias.h"
+#include <stdlib.h>
 #define INCL_DOS
 #define INCL_FSMACROS
@@ -11 +12 @@
 {
   thread_data *tp;
-  FS_VAR();
 
   if (tid < MAX_THREADS && _sys_thread_table[tid] != NULL)
     {
       tp = _sys_thread_table[tid];
-      FS_SAVE_LOAD();
       if (tp->fd.hdir != HDIR_CREATE)
         {
+          FS_VAR();
+          FS_SAVE_LOAD();
           DosFindClose (tp->fd.hdir);
+          FS_RESTORE();
           tp->fd.hdir = HDIR_CREATE;
         }
-      DosSubFreeMem (_sys_private_heap, tp, sizeof (thread_data));
-      FS_RESTORE();
+      free (tp);
       _sys_thread_table[tid] = NULL;
     }

trunk/src/emx/src/lib/sys/__init.c

@@ -10 +10 @@
 */
 
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #include "libc-alias.h"
 #define INCL_DOS
@@ -21 +25 @@
 #include <alloca.h>
 
+
+/* All globals is to be defined in this object file. */
 #define EXTERN
 #define INIT(x) = x
-
 #include "syscalls.h"
 
 
-extern int __init_dll(void);
-extern void volatile __init_ret(void *stack);
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
 static int parse_args(const char *src, char **argv, char *pool);
 
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
 /** argument count found by parse_args(). */
 static int argc;
 
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
 /** Helper macros for parse args
  * @{ */
@@ -128 +142 @@
  * magic done in sys/386/appinit.s. The top of the returned stack have a layout
  * as seen in struct stackframe below - start of struct is main() callframe.
+ * @param   fDefaultHeapInHighMem   If set the application is open to put the default
+ *                                  heap in high memory.
+ *                                  If clear the application veto against putting the
+ *                                  default heap in high memory.
+ *                                  Passed on to __init_dll().
  * @ingroup startup
  */
-void __init(void)
+void __init(int fDefaultHeapInHighMem)
 {
     /** top of stack unpon 'return' from this function. */
@@ -155 +174 @@
     /*
      * Do the common initialization in case we're linked statically.
+     * Then end the heap voting.
      */
-    if (__init_dll())
+    if (__init_dll(fDefaultHeapInHighMem))
         goto failure;
+
+    __libc_HeapEndVoting();
+
 
     /*
@@ -200 +223 @@
 
     /* Return to the program. */
-    __init_ret(pStackFrame);
+    _sys_init_ret(pStackFrame);
 
 failure:

trunk/src/emx/src/lib/sys/__initdll.c

@@ -32 +32 @@
 #include "syscalls.h"
 
+/* Make this function an weak external. */
+#pragma weak __init_largefileio
+
+
 /*******************************************************************************
 *   Global Variables                                                           *
@@ -39 +43 @@
 
 
-/*******************************************************************************
-*   External Functions                                                         *
-*******************************************************************************/
-extern int __init_environ(const char *pszEnv);
-extern void __init_largefileio(void) __attribute__((weak));
-
-
 /**
  * Common init code for crt0 and dll0.
  * This should perhaps be a part of _CRT_init.
  */
-int __init_dll(void)
+int __init_dll(int fDefaultHeapInHighMem)
 {
     ULONG   aul[2];
@@ -60 +57 @@
 
     /*
-     * Only called once.
+     * Heap voting.
+     */
+    __libc_HeapVote(fDefaultHeapInHighMem);
+
+    /*
+     * The rest must only be executed once.
      */
     if (initialized)
@@ -76 +78 @@
      * Check for high memory (>512MB) support.
      */
-    _sys_virtual_address_limit = 0;
+    _sys_gcbVirtualAddressLimit = 0;
     if (    !DosQuerySysInfo(QSV_VIRTUALADDRESSLIMIT, QSV_VIRTUALADDRESSLIMIT, &aul[0], sizeof(aul[0]))
         &&  aul[0] > 512)
-        _sys_virtual_address_limit = aul[0] * 1024*1024;
+        _sys_gcbVirtualAddressLimit = aul[0] * 1024*1024;
 
     /*
@@ -94 +96 @@
 
     /*
-     * Initialize the heap.  Here, we only create the semaphore
-     * (while having only one thread).  The heap will be created by __sbrk().
+     * Initialize the heap semaphores.
      */
     if (_fmutex_create(&_sys_heap_fmutex, 0) != 0)
         return -1;
-
-    /*
-     * LIBC Private heap, used for org_environ and per thread data.
-     * Let's try put it in high memory...
-     */
-    /** @todo Redo this private heap stuff. */
-    rc = DosAllocMem(&_sys_private_heap, SYS_PRIVATE_HEAP_SIZE,
-                     _sys_virtual_address_limit
-                        ? PAG_READ | PAG_WRITE | OBJ_ANY
-                        : PAG_READ | PAG_WRITE);
-    if (rc != 0)
-        return -1;
-    rc = DosSubSetMem(_sys_private_heap,
-                      DOSSUB_INIT | DOSSUB_SPARSE_OBJ | DOSSUB_SERIALIZE,
-                      SYS_PRIVATE_HEAP_SIZE);
-    if (rc != 0)
+    if (_fmutex_create(&_sys_gmtxHimem, 0) != 0)
         return -1;
 
@@ -128 +114 @@
      * Setup environment (org_environ and _STD(environ))
      */
-    rc = __init_environ(ppib->pib_pchenv);
+    rc = _sys_init_environ(ppib->pib_pchenv);
     if (rc)
         return -1;
@@ -137 +123 @@
      * large file suppoort enabled.
      */
-    if (__init_largefileio)
-        __init_largefileio();
+    if (_sys_init_largefileio)
+        _sys_init_largefileio();
 
     /*

trunk/src/emx/src/lib/sys/__newthread.c

@@ -2 +2 @@
 
 #include "libc-alias.h"
+#include <os2emx.h>
 #include <errno.h>
-#define INCL_DOS
-#define INCL_FSMACROS
-#include <os2emx.h>
 #include <emx/syscalls.h>
+#include <emx/umalloc.h>
 #include "syscalls.h"
 
@@ -13 +12 @@
 int __sys_newthread (int tid, int *errnop)
 {
-  ULONG rc;
   void *data;
-  FS_VAR();
 
   if (tid >= MAX_THREADS)
@@ -23 +20 @@
       return -1;
     }
-  FS_SAVE_LOAD();
-  rc = DosSubAllocMem (_sys_private_heap, &data, sizeof (thread_data));
-  FS_RESTORE();
-  if (rc != 0)
+  data = _hmalloc (sizeof (thread_data));
+  if (!data)
     {
-      _sys_set_errno (rc);
+      errno = ENOMEM;
       return -1;
     }

trunk/src/emx/src/lib/sys/__open.c

@@ -91 +91 @@
     {
         LONGLONG cbInitialTmp = cbInitial;
-        rc = __pfnDosOpenL(pszFile, &hFile, &ulAction, cbInitialTmp, flAttr, flOpenFlags, flOpenMode, NULL);
+        int     cch = strlen(pszFile);
+        char *  pszFile_safe = alloca(cch + 1);
+        if (pszFile_safe)
+        {
+            strcpy(pszFile_safe, pszFile);
+            rc = __pfnDosOpenL(pszFile_safe, &hFile, &ulAction, cbInitialTmp, flAttr, flOpenFlags, flOpenMode, NULL);
+        }
+        else
+            rc = ERROR_NOT_ENOUGH_MEMORY;
     }
     else

trunk/src/emx/src/lib/sys/__pipe.c

@@ -4 +4 @@
 #define INCL_DOSQUEUES
 #define INCL_FSMACROS
+#include <os2safe.h>
 #include <os2emx.h>
 #include <emx/syscalls.h>

trunk/src/emx/src/lib/sys/__read.c

@@ -3 +3 @@
 #include "libc-alias.h"
 #define INCL_FSMACROS
+#define INCL_ERRORS
 #include <os2emx.h>
+#include <stdlib.h>
+#include <memory.h>
+#include <emx/umalloc.h>
 #include <emx/syscalls.h>
 #include "syscalls.h"
@@ -11 +15 @@
   ULONG rc;
   ULONG n;
+  void *pvBuf_safe = NULL;
   FS_VAR();
 
+  /*
+   * Devices doesn't like getting high addresses.
+   */
+  if ((unsigned)buf >= 512*1024*1024)
+  {
+    ULONG   ulType = 0;
+    ULONG   ulAttr = 0;
+    FS_SAVE_LOAD();
+    rc = DosQueryHType(handle, &ulType, &ulAttr);
+    FS_RESTORE();
+
+    if (!rc && (ulType & 0xf) == HANDTYPE_DEVICE)
+      {
+        pvBuf_safe = _lmalloc(nbyte);
+        if (!pvBuf_safe)
+            return ERROR_NOT_ENOUGH_MEMORY;
+        memcpy(pvBuf_safe, buf, nbyte);
+      }
+  }
+
   FS_SAVE_LOAD();
-  rc = DosRead (handle, buf, nbyte, &n);
+  rc = DosRead (handle, pvBuf_safe ? pvBuf_safe : buf, nbyte, &n);
   FS_RESTORE();
+  if (pvBuf_safe)
+    {
+      memcpy(buf, pvBuf_safe, nbyte);
+      free(pvBuf_safe);
+    }
   if (rc == 0)
     return n;

trunk/src/emx/src/lib/sys/__write.c

@@ -3 +3 @@
 #include "libc-alias.h"
 #define INCL_FSMACROS
+#define INCL_ERRORS
 #include <os2emx.h>
+#include <memory.h>
+#include <stdlib.h>
 #include <emx/syscalls.h>
+#include <emx/umalloc.h>
 #include "syscalls.h"
 
@@ -11 +15 @@
   ULONG rc;
   ULONG n;
+  void *pvBuf_safe = NULL;
   FS_VAR();
+
+  /*
+   * Devices doesn't like getting high addresses.
+   */
+  if ((unsigned)buf >= 512*1024*1024)
+  {
+    ULONG   ulType = 0;
+    ULONG   ulAttr = 0;
+    FS_SAVE_LOAD();
+    rc = DosQueryHType(handle, &ulType, &ulAttr);
+    FS_RESTORE();
+
+    if (!rc && (ulType & 0xf) == HANDTYPE_DEVICE)
+      {
+        if (nbyte > 256)
+          { /* use heap for large buffers */
+            pvBuf_safe = _lmalloc(nbyte);
+            if (!pvBuf_safe)
+                return ERROR_NOT_ENOUGH_MEMORY;
+            memcpy(pvBuf_safe, buf, nbyte);
+            buf = pvBuf_safe;
+          }
+        else
+          { /* use stack for small buffers */
+            pvBuf_safe = alloca(nbyte);
+            memcpy(pvBuf_safe, buf, nbyte);
+            buf = pvBuf_safe;
+            pvBuf_safe = NULL;
+          }
+      }
+  }
 
   FS_SAVE_LOAD();
   rc = DosWrite (handle, buf, nbyte, &n);
   FS_RESTORE();
+
+  if (pvBuf_safe)
+      free(pvBuf_safe);
   if (rc == 0)
     return n;

trunk/src/emx/src/lib/sys/largefileio.c

@@ -37 +37 @@
 #define INCL_BASE
 #include <os2.h>
+#include "syscalls.h"
 
 
@@ -62 +63 @@
  * @author  knut st. osmundsen <bird-srcspam@anduin.net>
  */
-void __init_largefileio(void)
+void _sys_init_largefileio(void)
 {
     HMODULE     hmod = NULLHANDLE;

trunk/src/emx/src/lib/sys/remove.c

@@ -5 +5 @@
 #define INCL_FSMACROS
 #define INCL_DOSMISC
+#include <os2safe.h>
 #include <os2emx.h>
 #include <emx/syscalls.h>

trunk/src/emx/src/lib/sys/syscalls.h

@@ -54 +54 @@
  * address space size in bytes.
  *
- * Initiated by __init_dll(). */
-EXTERN unsigned long _sys_virtual_address_limit;
+ * Initiated by __init_dll().
+ */
+EXTERN unsigned long    _sys_gcbVirtualAddressLimit;
+
 
 /* The top heap object.  This points into _sys_heap_objs[] or is NULL.
@@ -65 +67 @@
    objects are managed in LIFO fashion. */
 
-EXTERN struct heap_obj _sys_heap_objs[MAX_HEAP_OBJS];
+EXTERN struct heap_obj  _sys_heap_objs[MAX_HEAP_OBJS];
 
 /* This is the number of heap objects. */
 
-EXTERN unsigned _sys_heap_obj_count;
+EXTERN unsigned         _sys_heap_obj_count;
 
 /* This variable can be initialized by the application to control the
    size of the heap object(s). */
 
-extern unsigned _sys_heap_size;
+extern unsigned         _sys_heap_size;
 
 
@@ -158 +160 @@
 #define MAX_THREADS 1024
 
-/* This mutex semaphore protects the heap. */
-#ifdef _FMC_SHARED
-EXTERN _fmutex _sys_heap_fmutex;
-#endif
-EXTERN void *_sys_private_heap INIT (NULL);
 EXTERN thread_data *_sys_thread_table[MAX_THREADS];
 
@@ -172 +169 @@
 void _sys_set_errno (unsigned long rc);
 void _sys_get_clock (unsigned long *ms);
+
+/** @group Heap stuff.
+ * @{ */
 ULONG _sys_expand_heap_obj_by (ULONG incr);
 ULONG _sys_expand_heap_by (ULONG incr, ULONG sbrk_model);
@@ -177 +177 @@
 ULONG _sys_shrink_heap_by (ULONG decr, ULONG sbrk_model);
 ULONG _sys_shrink_heap_obj_by (ULONG decr);
+#ifdef _FMC_SHARED
+/** This mutex semaphore protects the heap. */
+EXTERN _fmutex          _sys_heap_fmutex;
+/** Mutex semaphore protecting the list of high memory big blocks. */
+EXTERN _fmutex          _sys_gmtxHimem;
+#endif
+/** @} */
 
+
+/** @group Init functions
+ * @{ */
+extern int              __init_dll(int fDefaultHeapInHighMem);
+extern void volatile    _sys_init_ret(void *stack);
+extern int              _sys_init_environ(const char *pszEnv);
+extern void             _sys_init_largefileio(void);
+/** @} */

trunk/src/emx/src/libos2/os2.smak

@@ -6 +6 @@
 .INSDIR := lib/
 
-.TARGET := os2.a
+.TARGET := libos2.a
 .TKIND  := aout
 .TSRC.386 := $(wildcard src/lib/os2_386/*.s)
-.TSRC   := $(.TSRC.$(CPU)) $(wildcard src/lib/os2_386/*.c)
+.TSRC   := $(.TSRC.$(CPU)) $(wildcard src/lib/os2_386/*.c) $(wildcard src/lib/os2_386/safe/*.c)
 .TCF    := -Wno-unused -s
 .IMPS   := $(wildcard src/lib/os2_386/*.imp)
@@ -15 +15 @@
 include mkimplib.smak
 
-.TARGET := os2_p.a
+.TARGET := libos2_p.a
 .TKIND  := aout prof
 .TCF    := -Wno-unused
 include mkimplib.smak
+

trunk/src/gcc/gcc/config/i386/emx.h

@@ -267 +267 @@
   "%(cpp_cpu) "                                                                \
   "%{posix:-D_POSIX_SOURCE} "                                                  \
-  "%{Zmt*:} "                                                                  \
+  "%{Zmt*:} %{Zlow-mem:} "                                                     \
   "%{pg:-D__GPROF__} "                                                         \
   "%{mepilogue:-D__EPILOGUE__} "                                               \
@@ -315 +315 @@
 /* Override the default crt0 files.  */
 #define STARTFILE_SPEC                                                         \
-  "%{Zdll:dll0%O%{Zomf:bj}%s}"                                                 \
+  "%{Zdll:dll0%{Zhigh-mem:hi}%O%{Zomf:bj}%s}"                                  \
   "%{!Zdll:%{pg:gcrt0%O%{Zomf:bj}%s}"                                          \
-          "%{!pg:%{pn:gcrt0%O%{Zomf:bj}%s}%{!pn:%{p:mcrt0%O%{Zomf:bj}%s}%{!p:crt0%O%{Zomf:bj}%s}}}"\
+          "%{!pg:%{pn:gcrt0%O%{Zomf:bj}%s}%{!pn:%{p:mcrt0%O%{Zomf:bj}%s}%{!p:crt0%{Zhigh-mem:hi}%O%{Zomf:bj}%s}}}"\
          " %{Zbin-files:binmode%O%{Zomf:bj}%s} %{Zsmall-conv:smallcnv%O%{Zomf:bj}%s}}"
 
@@ -348 +348 @@
   "%(cpp_cpu) "                                                                \
   "%{posix:-D_POSIX_SOURCE} "                                                  \
-  "%{Zmt*:} "                                                                  \
+  "%{Zmt*:} %{Zlow-mem:} "                                                     \
   "%{pg:-D__GPROF__} "                                                         \
   "%{mepilogue:-D__EPILOGUE__} "                                               \
@@ -396 +396 @@
 /* Override the default crt0 files.  */
 #define STARTFILE_SPEC                                                         \
-  "%{Zdll:dll0%O%{!Zaout:bj}%s}"                                               \
+  "%{Zdll:dll0%{Zhigh-mem:hi}%O%{!Zaout:bj}%s}"                                        \
   "%{!Zdll:%{pg:gcrt0%O%{!Zaout:bj}%s}"                                        \
-          "%{!pg:%{pn:gcrt0%O%{!Zaout:bj}%s}%{!pn:%{p:mcrt0%O%{!Zaout:bj}%s}%{!p:crt0%O%{!Zaout:bj}%s}}}"\
+          "%{!pg:%{pn:gcrt0%O%{!Zaout:bj}%s}%{!pn:%{p:mcrt0%O%{!Zaout:bj}%s}%{!p:crt0%{Zhigh-mem:hi}%O%{!Zaout:bj}%s}}}"\
          " %{Zbin-files:binmode%O%{!Zaout:bj}%s} %{Zsmall-conv:smallcnv%O%{!Zaout:bj}%s}}"