From f163a5d5f6802f63092229f0f9326e5fb44b7908 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sun, 9 Aug 2020 21:55:42 +0200
Subject: Added malloc/free syscall

---
 lib/Makefile  | 15 +++++++++++----
 lib/inc/mem.h | 13 +++++++++++--
 lib/inc/sys.h |  2 +-
 lib/mem.c     |  2 ++
 4 files changed, 25 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/Makefile b/lib/Makefile
index 730ed6d..ef56b3a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -18,11 +18,18 @@ CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os
 
 CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Iinc/
 
-all: compile
-
 %.o: %.c
 	@$(CC) -c $(CFLAGS) $< -o $@
 
-compile: $(COBJS)
+libc: CFLAGS += -Duserspace
+libc: $(COBJS)
+	@mkdir -p ../build/
+	@$(AR) qc ../build/libc.a $+
+
+libk: CFLAGS += -Dkernel
+libk: $(COBJS)
 	@mkdir -p ../build/
-	@$(AR) qc ../build/libc.a $(COBJS)
+	@$(AR) qc ../build/libk.a $+
+
+clean:
+	@find . -name "*.o" -type f -delete
diff --git a/lib/inc/mem.h b/lib/inc/mem.h
index e2d574f..9399b54 100644
--- a/lib/inc/mem.h
+++ b/lib/inc/mem.h
@@ -5,8 +5,17 @@
 
 #include <def.h>
 
-#define malloc(n) ((void *)((HEAP += n) - n)) // TODO: Implement real/better malloc/free
-#define free(x)
+// Huh
+#ifdef kernel
+#define malloc(n) (void *)((HEAP += n) - n) // TODO: Implement real/better malloc/free
+#define free(ptr)
+#elif defined(userspace)
+#include <sys.h>
+#define malloc(n) (void *)sys1(SYS_MALLOC, n)
+#define free(ptr) (void)(sys1(SYS_FREE, (int)ptr))
+#else
+#error "No lib target specified. Please use -Dkernel or -Duserspace"
+#endif
 
 // TODO: Use malloc as syscall
 u32 HEAP;
diff --git a/lib/inc/sys.h b/lib/inc/sys.h
index aaeb6ca..aefaead 100644
--- a/lib/inc/sys.h
+++ b/lib/inc/sys.h
@@ -4,7 +4,7 @@
 #ifndef SYS_H
 #define SYS_H
 
-enum sys { SYS_HALT, SYS_EXEC };
+enum sys { SYS_LOOP, SYS_MALLOC, SYS_FREE, SYS_EXEC };
 
 int sys0(enum sys num);
 int sys1(enum sys num, int d1);
diff --git a/lib/mem.c b/lib/mem.c
index 00b9735..58c337b 100644
--- a/lib/mem.c
+++ b/lib/mem.c
@@ -1,6 +1,8 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
 
 #include <def.h>
+#include <print.h>
+#include <sys.h>
 
 void *memcpy(void *dst, const void *src, u32 n)
 {
-- 
cgit v1.2.3