diff --git a/src/lib/libc_old/stdlib/malloc.c b/src/lib/libc_old/stdlib/malloc.c index 3f0d0e5..12e6b3a 100644 --- a/src/lib/libc_old/stdlib/malloc.c +++ b/src/lib/libc_old/stdlib/malloc.c @@ -118,13 +118,15 @@ if (tmpDesc1 == freeKernDesc) freeKernDesc = tmpDesc1->next; - + printf("MALLOC.01"); tmpDesc1->prev = 0x0; tmpDesc1->next = usedKernDesc; if (usedKernDesc != 0x0) usedKernDesc->prev = tmpDesc1; usedKernDesc = tmpDesc1; + printf("MALLOC.02"); if (tmpDesc1->limit > (len + 32)) { + printf("MALLOC.022"); tmpDesc2 = getEmptyDesc(); tmpDesc2->limit = tmpDesc1->limit - len; tmpDesc1->limit = len; @@ -135,15 +137,18 @@ //printf("kmalloc-1 tmpDesc2: [%i:%i:%i]\n",tmpDesc2->limit,tmpDesc1->limit,len); insertFreeDesc(tmpDesc2); } + printf("MALLOC.023"); buf = (char *)tmpDesc1->baseAddr; + printf("MALLOC.24"); for (i=0;ilimit;i++) { (char)buf[i] = (char)0x0; } - + printf("MALLOC.25"); //printf("baseAddr1[0x%X:0x%X]",tmpDesc1,tmpDesc1->baseAddr); return(tmpDesc1->baseAddr); } } + printf("MALLOC.1"); tmpDesc1 = getEmptyDesc(); //printf("no empty desc\n"); if (tmpDesc1 != 0x0) { @@ -287,6 +292,9 @@ /*** $Log$ + Revision 1.3 2005/10/21 20:07:07 reddawg + Work has resumed + Revision 1.2 2005/10/12 00:13:36 reddawg Removed diff --git a/src/sys/Makefile b/src/sys/Makefile index 142fb92..abec87c 100644 --- a/src/sys/Makefile +++ b/src/sys/Makefile @@ -1,7 +1,7 @@ # $Id$ # Kernel Makefile (C) 2002 The UbixOS Project -all: net-code sde-code pci-code ufs-code ubixfs-code vfs-code isa-code kernel-code lib-code vmm-code sys-code boot-code init-code devfs-code mpi-code kmods-code kernel-img #generic-code +all: sde-code pci-code ufs-code ubixfs-code vfs-code isa-code kernel-code lib-code vmm-code sys-code boot-code init-code devfs-code mpi-code kmods-code kernel-img #generic-code net-code generic-code: generic (cd generic;make) diff --git a/src/sys/kernel/systemtask.c b/src/sys/kernel/systemtask.c index ff1e317..8906124 100644 --- a/src/sys/kernel/systemtask.c +++ b/src/sys/kernel/systemtask.c @@ -96,8 +96,6 @@ tmpTask = sched_getDelTask(); if (tmpTask != 0x0) { vmmFreeProcessPages(tmpTask->id); - - if (tmpTask->imageFd != 0x0) fclose(tmpTask->imageFd);