From 1b180d2f15e9b726e6e9dde5601f41fa48c1c044 Mon Sep 17 00:00:00 2001
From: Christian Cunningham <cc@localhost>
Date: Mon, 3 Jan 2022 20:10:10 -0800
Subject: Ensured Aligned Mutexes

---
 src/lib/mem.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lib/mem.h |  2 ++
 2 files changed, 75 insertions(+)

(limited to 'src/lib')

diff --git a/src/lib/mem.c b/src/lib/mem.c
index 296e096..d738305 100644
--- a/src/lib/mem.c
+++ b/src/lib/mem.c
@@ -64,6 +64,45 @@ void* malloc(unsigned char size)
 	return (void*)&mem[i+2];
 }
 
+void* malloca(unsigned char size, unsigned char amnt)
+{
+	unsigned char* mem = (unsigned char*)rpi_heap;
+	unsigned long i = 0;
+	// TODO: Use Null PID
+	while(1) {
+		unsigned long diff = (unsigned long)mem + i + 2;
+		diff %= amnt;
+		diff = amnt - diff;
+		if((mem[i] == size) && mem[i+1]==0) {
+			if(diff == 0) {
+				mem[i] = size;
+				mem[i+1] = 1;
+				return (void*)&mem[i+2];
+			}
+		} else if (mem[i] == 0) {
+			if(diff == 0 || diff == amnt) {
+				mem[i] = size;
+				mem[i+1] = 1;
+				rpi_heap_top = (void*)&mem[i+2+size];
+				return (void*)&mem[i+2];
+			} else {
+				if(diff <= 2) {
+					diff += amnt;
+				}
+				mem[i] = diff-2;
+				mem[i+1] = 0;
+				i += diff;
+				mem[i] = size;
+				mem[i+1] = 1;
+				rpi_heap_top = (void*)&mem[i+2+size];
+				return (void*)&mem[i+2];
+			}
+		}
+
+		i += mem[i]+2;
+	}
+}
+
 void free(void* memloc)
 {
 	// Don't try to free memory outside of heap
@@ -122,3 +161,37 @@ void heap_info(void)
 	}
 	uart_char('\n');
 }
+
+void heap_info_u(void)
+{
+	unsigned char* base = rpi_heap;
+	while ((void*)base < rpi_heap_top) {
+		unsigned char size = *base;
+		if(base[1] == 0) {
+			base += size + 2;
+			continue;
+		}
+		uart_hex((unsigned long)(base+2));
+		uart_string(" Size: ");
+		uart_10(size);
+		uart_string("\n");
+		static char* data = "00 \0";
+		static unsigned char temp = 0;
+		for(unsigned int i = 0; i < size; 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 += size + 2;
+	}
+	uart_char('\n');
+}
diff --git a/src/lib/mem.h b/src/lib/mem.h
index ec1402f..5c5cc94 100644
--- a/src/lib/mem.h
+++ b/src/lib/mem.h
@@ -15,9 +15,11 @@ void memcpy32(unsigned long* src, unsigned long* dest, unsigned int n);
 unsigned char memcmp32(unsigned long* a, unsigned long* b, unsigned int n);
 
 void* malloc(unsigned char size);
+void* malloca(unsigned char size, unsigned char amnt);
 void free(void* memloc);
 void* heap_base(void);
 void* heap_top(void);
 void heap_info(void);
+void heap_info_u(void);
 
 #endif
-- 
cgit v1.2.1