merge branch memory-shit into higher-half

This commit is contained in:
2025-05-10 15:48:10 +03:00
parent 65f543fa92
commit 767e74976f
14 changed files with 419 additions and 178 deletions
+5 -2
View File
@@ -2,7 +2,7 @@
OBJS = bin/boot.o bin/kernel.o bin/idt.o bin/isr.o bin/screen.o \
bin/utils.o bin/string.o bin/stdio.o bin/disk.o bin/pic.o bin/pit.o \
bin/keyboard.o bin/paging.o bin/heap.o bin/page_alloc.o bin/page_tables.o \
bin/fat.o bin/task.o bin/switch.o bin/sys_exit.o bin/gdt.o
bin/fat.o bin/task.o bin/switch.o bin/sys_exit.o bin/gdt.o bin/isr-asm.o
# Define the compiler and assembler
#CC = i686-elf-gcc -D__is_katauos
@@ -16,7 +16,7 @@ CFLAGS = -I./include/ -std=gnu99 -ffreestanding -O0 -Wall -Wextra -m32 -fno-pie
ASFLAGS = -f elf32
# Define the linker flags
LDFLAGS = -m elf_i386 -L$(shell $(CC) -print-libgcc-file-name | xargs dirname)
LDFLAGS = -m elf_i386 -L$(shell $(CC) -print-libgcc-file-name | xargs dirname)/32/ -lgcc
LDSCRIPT = link.ld
# Define the output file
@@ -124,6 +124,9 @@ bin/sys_exit.o: src/tasking/sys_exit.asm
bin/gdt.o: src/kernel/gdt.c
$(CC) $(CFLAGS) -c $< -o $@
bin/isr-asm.o: src/kernel/isr.asm
$(AS) $(ASFLAGS) $< -o $@
clean:
rm -rf bin/
rm -f $(OUTPUT)