diff options
| author | Marvin Borner | 2020-08-09 21:55:42 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-08-09 21:55:42 +0200 |
| commit | f163a5d5f6802f63092229f0f9326e5fb44b7908 (patch) | |
| tree | f24ccfe1b9bd340875d534e1aa19ef8676fd4d7b /lib | |
| parent | b6d3d341c19440f8447d8d6c6567b7ff78db3174 (diff) | |
Added malloc/free syscall
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 15 | ||||
| -rw-r--r-- | lib/inc/mem.h | 13 | ||||
| -rw-r--r-- | lib/inc/sys.h | 2 | ||||
| -rw-r--r-- | lib/mem.c | 2 |
4 files changed, 25 insertions, 7 deletions
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); @@ -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) { |