Changeset 2902

Timestamp:

Dec 25, 2006, 2:46:23 AM (19 years ago)

Author:

bird

Message:

hacking.

Location:

trunk/libc/src

Files:

• genalias/Makefile.kmk (modified) (1 diff)
• kNIX/Makefile.kmk (modified) (1 diff)
• kNIX/heap.c (modified) (5 diffs)
• kNIX/heapdata.c (modified) (1 diff)
• kNIX/os2/brk.c (modified) (2 diffs)

trunk/libc/src/genalias/Makefile.kmk

@@ -41 +41 @@
 endif
 genalias_SOURCES = \
-        $(PATH_LIBC_SRC)/genalias/genalias.c \
+        genalias.c
 
 

trunk/libc/src/kNIX/Makefile.kmk

@@ -46 +46 @@
     $(PATH_LIBC_SRC)/kNIX/b_processSetResourceLimit.c \
     $(PATH_LIBC_SRC)/kNIX/b_signalSendPid.c \
-    $(PATH_LIBC_SRC)/kNIX/filehandles.c \
-    $(PATH_LIBC_SRC)/kNIX/fs.c \
     $(PATH_LIBC_SRC)/kNIX/heap.c \
     $(PATH_LIBC_SRC)/kNIX/heapdata.c \
 
+#    $(PATH_LIBC_SRC)/kNIX/fs.c \
+#    $(PATH_LIBC_SRC)/kNIX/filehandles.c \
 #    $(PATH_LIBC_SRC)/kNIX/b_ioDuplicate.c \
 

trunk/libc/src/kNIX/heap.c

@@ -55 +55 @@
     FS_VAR_SAVE_LOAD();
     int rc = DosFreeMemEx((void *)ObjPtr);
-    LIBC_ASSERTM(!rc, ("ObjPtr=%p rc=%d\n", ObjPtr, rc);
+    LIBC_ASSERTM(!rc, vs"ObjPtr=%p rc=%d\n", ObjPtr, rc); (void)rc;
     FS_RESTORE();
 
@@ -64 +64 @@
                                       NULL,                 /* FreeSize */
                                       MEM_RELEASE);         /* FreeType */
-    LIBC_ASSERTM(NT_SUCCESS(rc), "ObjPtr=%p rc=%x\n", ObjPtr, rc);
+    LIBC_ASSERTM(NT_SUCCESS(rc), "ObjPtr=%p rc=%x\n", ObjPtr, rc); (void)rc;
 
 #else
@@ -84 +84 @@
 #ifdef __OS2__
     FS_VAR_SAVE_LOAD();
-    int rc = DosAllocMemEx(&p, size, PAG_READ | PAG_WRITE | OBJ_FORK);
+    int rc = DosAllocMemEx(&pv, size, PAG_READ | PAG_WRITE | OBJ_FORK);
     FS_RESTORE();
     if (rc)
@@ -126 +126 @@
 #ifdef __OS2__
     FS_VAR_SAVE_LOAD();
-    rc = DosSetMem((void *)addr, size, PAG_DEFAULT | PAG_COMMIT);
+    int rc = DosSetMem((void *)addr, size, PAG_DEFAULT | PAG_COMMIT);
     FS_RESTORE();
     return !rc ? 0 : -EINVAL;
@@ -154 +154 @@
 #ifdef __OS2__
     FS_VAR_SAVE_LOAD();
-    rc = DosSetMem((void *)addr, size, PAG_DECOMMIT);
+    int rc = DosSetMem((void *)addr, size, PAG_DECOMMIT);
     FS_RESTORE();
     return !rc ? 0 : -EINVAL;

trunk/libc/src/kNIX/heapdata.c

@@ -38 +38 @@
 _fmutex         __libc_back_gmtxHighHeap;
 PKNIXHEAPOBJ    __libc_back_gpHeapTopObj = NULL;
-KNIXHEAPOBJ     __libc_back_gaHeapObjs[CFG_KNIX_MAX_HEAP_OBJS] = {0};
+KNIXHEAPOBJ     __libc_back_gaHeapObjs[CFG_KNIX_MAX_HEAP_OBJS] = {{0}};
 unsigned        __libc_back_gcHeapObjs = 0;
 size_t          __libc_back_gcbHeap = CFG_KNIX_HEAP_SIZE;

trunk/libc/src/kNIX/os2/brk.c

@@ -8 +8 @@
 #include <sys/fmutex.h>
 #include <emx/syscalls.h>
-#include "syscalls.h"
+#include "../kNIX.h"
+//#include "syscalls.h"
 
 int _STD(brk) (const void *brkp)
 {
-  ULONG base;
+  void *base;
 
   if (_fmutex_request (&__libc_back_gmtxHeap, _FMR_IGNINT) != 0)
@@ -21 +22 @@
   else if ((ULONG)brkp >= __libc_back_gpHeapTopObj->brk
            && (ULONG)brkp <= __libc_back_gpHeapTopObj->end)
-    base = __libc_back_heapExpandObjBy ((ULONG)brkp - __libc_back_gpHeapTopObj->brk);
+    base = __libc_back_heapExpandObjBy ((uintptr_t)brkp - __libc_back_gpHeapTopObj->brk);
   else if ((ULONG)brkp >= __libc_back_gpHeapTopObj->base
            && (ULONG)brkp < __libc_back_gpHeapTopObj->brk)
-    base = __libc_back_heapShrinkObjBy (__libc_back_gpHeapTopObj->brk - (ULONG)brkp);
+    base = __libc_back_heapShrinkObjBy (__libc_back_gpHeapTopObj->brk - (uintptr_t)brkp);
   else
-    base = __libc_back_heapShrinkTo ((ULONG)brkp);
+    base = __libc_back_heapShrinkTo ((uintptr_t)brkp);
 
   if (_fmutex_release (&__libc_back_gmtxHeap) != 0)
     return -1;
 
-  if (base == 0)
+  if (base == NULL)
     {
       errno = ENOMEM;