'mem' command shows memory usage of kernel heap now

implemented a malloc/free and memory manager (simplest possible implementation,
just allocating linearly and never freeing)

1 files changed, 5 insertions, 2 deletions

diff --git a/src/Makefile b/src/Makefile
index c256605..d8b279f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -33,11 +33,11 @@ kernel.bin: kernel.elf
 kernel.sym: kernel.elf
 	$(OBJCOPY) --only-keep-debug kernel.elf kernel.sym
 
-kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o kernel/tasks.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o drivers/video/vga.o drivers/video/vga_font.o gui/widget.o gui/composite_widget.o gui/window.o gui/desktop.o gui/text_widget.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o
+kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o kernel/memorymanagement.o kernel/tasks.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o drivers/video/vga.o drivers/video/vga_font.o gui/widget.o gui/composite_widget.o gui/window.o gui/desktop.o gui/text_widget.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o
 	$(LD) -o kernel.elf -N -n -Ttext 0x8800 --oformat elf32-i386 \
 		kernel/kernel.o kernel/kernel_asm.o \
 		kernel/console.o kernel/vgatext.o kernel/serial.o \
-		kernel/tasks.o \
+		kernel/memorymanagement.o kernel/tasks.o \
 		hardware/port.o hardware/port_asm.o \
 		hardware/interrupts.o hardware/interrupts_asm.o \
 		hardware/pci.o \
@@ -72,6 +72,9 @@ kernel/vgatext.o: kernel/vgatext.c kernel/vgatext.h
 kernel/serial.o: kernel/serial.c kernel/serial.h
 	$(CC) $(CFLAGS) -c -o kernel/serial.o kernel/serial.c
 
+kernel/memorymanagement.o: kernel/memorymanagement.c kernel/memorymanagement.h
+	$(CC) $(CFLAGS) -c -o kernel/memorymanagement.o kernel/memorymanagement.c
+
 kernel/tasks.o: kernel/tasks.c kernel/tasks.h
 	$(CC) $(CFLAGS) -c -o kernel/tasks.o kernel/tasks.c