3 files changed, 69 insertions, 5 deletions

diff --git a/src/lib/mem.c b/src/lib/mem.c
index 0069623..1a974f1 100644
--- a/src/lib/mem.c
+++ b/src/lib/mem.c
@@ -44,19 +44,78 @@ unsigned char memcmp32(unsigned long* a, unsigned long* b, unsigned int n)
 
 #define MAX_MM 0x100000
 static unsigned char rpi_heap[MAX_MM] = {0,};
+static void* rpi_heap_top = &rpi_heap;
 
 void* malloc(unsigned char size)
 {
 	unsigned char* mem = (unsigned char*)rpi_heap;
 	unsigned long i = 0;
-	while (mem[i] != 0) {
-		i += mem[i]+1;
+	// TODO: Use Null PID
+	while ((mem[i] != 0) && !(mem[i] == size && mem[i+1]==0)) {
+		i += mem[i]+2;
 	}
 	mem[i] = size;
-	return (void*)&mem[i+1];
+	// Use allocator's PID
+	mem[i+1] = 1;
+	// Update top of heap
+	rpi_heap_top = (void*)&mem[i+2+size];
+	return (void*)&mem[i+2];
 }
 
-void free(__attribute__((unused)) void* memloc)
+void free(void* memloc)
 {
-	// TODO: Implement free
+	// Don't try to free memory outside of heap
+	if(!(((void*)rpi_heap <= memloc) && (memloc < rpi_heap_top)))
+		return;
+	unsigned char* base = memloc - 2;
+	unsigned char size = *base;
+	// TODO: Use Null PID
+	base[1] = 0;
+	// Clear out old memory
+	for(unsigned int i = 0; i < size; i++) {
+		base[i+2] = 0;
+	}
+}
+
+void* heap_base(void)
+{
+	return (void*)rpi_heap;
+}
+
+void* heap_top(void)
+{
+	return rpi_heap_top;
+}
+
+void heap_info(void)
+{
+	unsigned char* base = rpi_heap;
+	while ((void*)base < rpi_heap_top) {
+		if(base[1] == 0) {
+			uart_char('F');
+			uart_char(' ');
+		}
+		uart_hex((unsigned long)(base+2));
+		uart_string(" Size: ");
+		uart_10(base[0]);
+		uart_string("\n");
+		static char* data = "00 \0";
+		static unsigned char temp = 0;
+		for(unsigned int i = 0; i < base[0]; i++) {
+			temp = (base[2+i]>>4)&0xF;
+			if(temp > 9)
+				temp += 7;
+			temp += 0x30;
+			data[0] = temp;
+			temp = (base[2+i])&0xF;
+			if(temp > 9)
+				temp += 7;
+			temp += 0x30;
+			data[1] = temp;
+			uart_string(data);
+		}
+		uart_char('\n');
+		base += *base + 2;
+	}
+	uart_char('\n');
 }
diff --git a/src/lib/mem.h b/src/lib/mem.h
index 4fdae78..4d02236 100644
--- a/src/lib/mem.h
+++ b/src/lib/mem.h
@@ -10,5 +10,8 @@ unsigned char memcmp32(unsigned long* a, unsigned long* b, unsigned int n);
 
 void* malloc(unsigned char size);
 void free(void* memloc);
+void* heap_base(void);
+void* heap_top(void);
+void heap_info(void);
 
 #endif
diff --git a/src/lib/q.c b/src/lib/q.c
index e40fee8..494c712 100644
--- a/src/lib/q.c
+++ b/src/lib/q.c
@@ -27,6 +27,7 @@ void popq(struct Q_base* qb)
 	if (qb->next == 0)
 		return;
 	if (qb->next == qb->last) {
+		free(qb->next->data);
 		free(qb->next);
 		qb->next = 0;
 		qb->last = 0;
@@ -34,5 +35,6 @@ void popq(struct Q_base* qb)
 	}
 	struct Q* t = qb->next;
 	qb->next = qb->next->next;
+	free(t->data);
 	free(t);
 }