Merge pull request #2142 from ghaerr/toolchain

[libc] Minor updates for 8086 toolchain commit

elks/tools/objtools/ecc

@@ -1,6 +1,6 @@
 # ecc - ELKS cc compiler wrapper for C86 (8086-toolchain)
 #
-# This script runs cpp86, c86, nasm and ld86 on the input file.
+# This script runs cpp86, c86, nasm86 and ld86 on the input file.
 # The input file must be specified without its .c extension for now,
 # and the script must be run in the 8086-toolchain/ directory,
 # as it also builds the libc86.a C86 library.
@@ -91,8 +91,8 @@ echo c86 $CFLAGS $1.c $1.asm
 c86 $CFLAGS $1.i $1.asm
 
 # assembler
-echo nasm $ASFLAGS -l $1.lst -o $1.o $1.asm
-nasm $ASFLAGS -l $1.lst -o $1.o $1.asm
+echo nasm86 $ASFLAGS -l $1.lst -o $1.o $1.asm
+nasm86 $ASFLAGS -l $1.lst -o $1.o $1.asm
 objdump86 -s $1.o
 
 # link executable

libc/include/malloc.h

@@ -21,6 +21,8 @@ int     __amalloc_add_heap(char __far *start, size_t size);
 void   *__arealloc(void *, size_t);         /* not implemented */
 void    __afree(void *);
 size_t  __amalloc_usable_size(void *);
+extern unsigned int malloc_arena_size;
+extern unsigned int malloc_arena_thresh;
 
 /* usable with all mallocs */
 void   *calloc(size_t elm, size_t sz);
@@ -32,7 +34,7 @@ int         fmemfree(void __far *ptr);
 int        _fmemalloc(int paras, unsigned short *pseg); /* syscall */
 int        _fmemfree(unsigned short seg);               /* syscall */
 
-extern unsigned int malloc_arena_size;
-extern unsigned int malloc_arena_thresh;
+/* debug output */
+int __dprintf(const char *fmt, ...);
 
 #endif

libc/malloc/amalloc.c

@@ -92,9 +92,7 @@ static int debug_level = DEBUG;
 /* add size bytes to arena malloc heap, must be done before first malloc */
 int __amalloc_add_heap(char __far *start, size_t size)
 {
-    if (size < 16)
-        return 0;
-
+    ASSERT(start != NULL && size >= 16);
     allocs = (FPTR)start;
     allocseg = FP_SEG(start);
     allocsize = size / sizeof(union store);
@@ -254,7 +252,7 @@ size_t __amalloc_usable_size(void *ptr)
 {
     NPTR p = (NPTR)ptr;
 
-    if (p == NULL)          /* NOTE this allows fmemalloc pointers to return 0 here */
+    if (ptr == NULL)
         return 0;
     ASSERT(FP_SEG(ptr)==allocseg);
     ASSERT(p>clearbusy(allocs[allocsize-1].ptr)&&p<=alloct);