X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fheap.c;h=499d24c928415fd1a621d522d9f94acc10a2225b;hb=45f9a29e481ce9ea7ca7121541f0e0f90147f5b1;hp=23df92a73f83e5f468c31e5f3b653ecf8cf31c15;hpb=17e16b3110b4c5124b0707435e0427993d696545;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/heap.c b/Usermode/Libraries/libc.so_src/heap.c
index 23df92a7..499d24c9 100644
--- a/Usermode/Libraries/libc.so_src/heap.c
+++ b/Usermode/Libraries/libc.so_src/heap.c
@@ -34,7 +34,7 @@ EXPORT void	free(void *mem);
 EXPORT void	*realloc(void *mem, Uint bytes);
 EXPORT void	*sbrk(int increment);
 LOCAL void	*extendHeap(int bytes);
-LOCAL uint	brk(int delta);
+LOCAL uint	brk(Uint newpos);
 
 //Code
 
@@ -53,7 +53,7 @@ EXPORT void *malloc(size_t bytes)
 	
 	// Initialise Heap
 	if(_heap_start == NULL)
-	{LOCAL void	*sbrk(int delta);
+	{
 		_heap_start = sbrk(0);
 		_heap_end = _heap_start;
 		extendHeap(HEAP_INIT_SIZE);
@@ -140,7 +140,10 @@ EXPORT void *malloc(size_t bytes)
 */
 EXPORT void free(void *mem)
 {
-	heap_head	*head = mem;
+	heap_head	*head = (void*)((intptr_t)mem-sizeof(heap_head));
+	
+	// Sanity please!
+	if(!mem)	return;
 	
 	if(head->magic != MAGIC)	//Valid Heap Address
 		return;
@@ -148,19 +151,19 @@ EXPORT void free(void *mem)
 	head->magic = MAGIC_FREE;
 	
 	//Unify Right
-	if((Uint)head + head->size < (Uint)_heap_end)
+	if((intptr_t)head + head->size < (intptr_t)_heap_end)
 	{
-		heap_head	*nextHead = (heap_head*)((Uint)head + head->size);
+		heap_head	*nextHead = (heap_head*)((intptr_t)head + head->size);
 		if(nextHead->magic == MAGIC_FREE) {	//Is the next block free
 			head->size += nextHead->size;	//Amalgamate
 			nextHead->magic = 0;	//For Security
 		}
 	}
 	//Unify Left
-	if((Uint)head - sizeof(heap_foot) > (Uint)_heap_start)
+	if((intptr_t)head - sizeof(heap_foot) > (intptr_t)_heap_start)
 	{
 		heap_head	*prevHead;
-		heap_foot	*prevFoot = (heap_foot *)((Uint)head - sizeof(heap_foot));
+		heap_foot	*prevFoot = (heap_foot *)((intptr_t)head - sizeof(heap_foot));
 		if(prevFoot->magic == MAGIC) {
 			prevHead = prevFoot->header;
 			if(prevHead->magic == MAGIC_FREE) {
@@ -208,10 +211,10 @@ EXPORT void *realloc(void *oldPos, size_t bytes)
 }
 
 /**
- \fn LOCAL void *extendHeap(int bytes)
- \brief Create a new block at the end of the heap area
- \param bytes	Integer - Size reqired
- \return Pointer to last free block
+ * \fn LOCAL void *extendHeap(int bytes)
+ * \brief Create a new block at the end of the heap area
+ * \param bytes	Integer - Size reqired
+ * \return Pointer to last free block
  */
 
 LOCAL void *extendHeap(int bytes)
@@ -260,7 +263,7 @@ EXPORT void *sbrk(int increment)
 	static size_t oldEnd = 0;
 	static size_t curEnd = 0;
 
-	//SysDebug("sbrk: (increment=%i)\n", increment);
+	//_SysDebug("sbrk: (increment=%i)\n", increment);
 
 	if (oldEnd == 0)	curEnd = oldEnd = brk(0);
 
@@ -304,10 +307,12 @@ EXPORT int IsHeap(void *ptr)
  */
 static void *FindHeapBase()
 {
+	#if 0
 	#define MAX		0xC0000000	// Address
 	#define THRESHOLD	512	// Pages
 	uint	addr;
 	uint	stretch = 0;
+	uint64_t	tmp;
 	
 	// Scan address space
 	for(addr = 0;
@@ -315,33 +320,46 @@ static void *FindHeapBase()
 		addr += 0x1000
 		)
 	{
-		if( _SysGetPhys(addr) == 0 ) {
+		tmp = _SysGetPhys(addr);
+		if( tmp != 0 ) {
 			stretch = 0;
 		} else {
 			stretch ++;
 			if(stretch > THRESHOLD)
 			{
-				return (void*)( addr + stretch*0x1000 );
+				return (void*)( addr - stretch*0x1000 );
 			}
 		}
+		//__asm__ __volatile__ (
+		//	"push %%ebx;mov %%edx,%%ebx;int $0xAC;pop %%ebx"
+		//	::"a"(256),"d"("%x"),"c"(addr));
 	}
+	
 	return NULL;
+	#else
+	return (void*)0x00900000;
+	#endif
 }
 
-LOCAL uint brk(int delta)
+LOCAL uint brk(Uint newpos)
 {
 	static uint	curpos;
 	uint	pages;
 	uint	ret = curpos;
+	 int	delta;
+	
+	//_SysDebug("brk: (newpos=0x%x)", newpos);
 	
 	// Find initial position
 	if(curpos == 0)	curpos = (uint)FindHeapBase();
 	
 	// Get Current Position
-	if(delta == 0)
-	{
-		return curpos;
-	}
+	if(newpos == 0)	return curpos;
+	
+	if(newpos < curpos)	return newpos;
+	
+	delta = newpos - curpos;
+	//_SysDebug(" brk: delta = 0x%x", delta);
 	
 	// Do we need to add pages
 	if(curpos & 0xFFF && (curpos & 0xFFF) + delta < 0x1000)