From a80021fa96b07d4ae26d9f85099f4bce09a8f5b3 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sun, 29 Nov 2020 22:17:41 +0100
Subject: Big steps towards working window resizing

Found some other bugs too
---
 libc/mem.c | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'libc')

diff --git a/libc/mem.c b/libc/mem.c
index fab91f8..dc4e0e6 100644
--- a/libc/mem.c
+++ b/libc/mem.c
@@ -154,30 +154,33 @@ void *realloc(void *ptr, u32 size)
 #define kmalloc(n) (void *)sys1(SYS_MALLOC, n)
 #define kfree(ptr) (void)(sys1(SYS_FREE, (int)ptr))
 
-static u32 *heap = NULL;
-static u32 index = 0;
-static u32 malloced = 0;
+/* static u32 *heap = NULL; */
+/* static u32 index = 0; */
+/* static u32 malloced = 0; */
 
+// TODO: Fix userspace malloc (for size > HEAP_SIZE)!
 void *malloc(u32 size)
 {
-	if (size < 1)
-		return NULL;
+	return kmalloc(size);
 
-	size = size + ALIGNMENT + ALIGN_INFO;
+	/* if (size < 1) */
+	/* 	return NULL; */
 
-	if (!malloced || size > malloced) {
-		heap = kmalloc(HEAP_SIZE);
-		malloced = HEAP_SIZE;
-	}
-	malloced -= size;
+	/* size = size + ALIGNMENT + ALIGN_INFO; */
 
-	heap[index] = size;
-	index += size + 1;
+	/* if (!malloced || size > malloced) { */
+	/* 	heap = kmalloc(HEAP_SIZE); */
+	/* 	malloced = HEAP_SIZE; */
+	/* } */
+	/* malloced -= size; */
 
-	void *p = (void *)(heap + index - size);
-	ALIGN(p);
+	/* heap[index] = size; */
+	/* index += size + 1; */
 
-	return p;
+	/* void *p = (void *)(heap + index - size); */
+	/* ALIGN(p); */
+
+	/* return p; */
 }
 
 // TODO: Implement free, realloc and find_smallest_hole
-- 
cgit v1.2.3