From 774e3796b252383aafb8b3f30d51a19400c74516 Mon Sep 17 00:00:00 2001 From: Brett Weiland Date: Sun, 18 Apr 2021 16:00:17 -0500 Subject: modified: src/bootloader/bios_functions/bios_disk.asm modified: src/bootloader/bootloader.asm new file: src/include/kernel.h modified: src/include/libc.h modified: src/include/paging.h new file: src/include/panic.h modified: src/kernel/kernel.c modified: src/kernel/libc.c modified: src/kernel/page.c new file: src/kernel/panic.c modified: src/link.ld modified: src/makefile modified: tools/page/page.py --- src/makefile | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'src/makefile') diff --git a/src/makefile b/src/makefile index 4e51ff4..2398509 100644 --- a/src/makefile +++ b/src/makefile @@ -8,16 +8,18 @@ EMU_RAM=4G XRES=1024 YRES=768 +CCFLAGS=-g -ffreestanding -Wall make: nasm -g -felf64 bootloader/bootloader.asm -o objects/bootloader.o - $(CC) $(INC) -g -ffreestanding -c kernel/kernel.c -o objects/kernel.o - $(CC) $(INC) -g -ffreestanding -c kernel/acpi.c -o objects/acpi.o - $(CC) $(INC) -g -ffreestanding -c kernel/drivers/serial.c -o objects/serial.o - $(CC) $(INC) -g -ffreestanding -c kernel/drivers/video.c -o objects/video.o - $(CC) $(INC) -g -ffreestanding -c kernel/printf.c -o objects/printf.o - $(CC) $(INC) -g -ffreestanding -c kernel/page.c -o objects/page.o - $(CC) $(INC) -g -ffreestanding -c kernel/libc.c -o objects/libc.o + $(CC) $(INC) $(CCFLAGS) -c kernel/kernel.c -o objects/kernel.o + $(CC) $(INC) $(CCFLAGS) -c kernel/panic.c -o objects/panic.o + $(CC) $(INC) $(CCFLAGS) -c kernel/acpi.c -o objects/acpi.o + $(CC) $(INC) $(CCFLAGS) -c kernel/drivers/serial.c -o objects/serial.o + $(CC) $(INC) $(CCFLAGS) -c kernel/drivers/video.c -o objects/video.o + $(CC) $(INC) $(CCFLAGS) -c kernel/printf.c -o objects/printf.o + $(CC) $(INC) $(CCFLAGS) -c kernel/page.c -o objects/page.o + $(CC) $(INC) $(CCFLAGS) -c kernel/libc.c -o objects/libc.o $(LD) -o indigo_os.elf --oformat=elf64-x86-64 -T link.ld $(OBJCPY) --only-keep-debug indigo_os.elf debug/debug_syms.o $(OBJCPY) -O binary --strip-all indigo_os.elf indigo_os @@ -27,8 +29,18 @@ endif ifneq ("$(wildcard $(./debug/serial.out))","") mkfifo debug/serial.out endif - rm -f indigo_os.elf - +# rm -f indigo_os.elf + + +preproc_debug: + nasm -g -felf64 bootloader/bootloader.asm + $(CC) $(INC) $(CCFLAGS) -E -c kernel/kernel.c + $(CC) $(INC) $(CCFLAGS) -E -c kernel/acpi.c + $(CC) $(INC) $(CCFLAGS) -E -c kernel/drivers/serial.c + $(CC) $(INC) $(CCFLAGS) -E -c kernel/drivers/video.c + $(CC) $(INC) $(CCFLAGS) -E -c kernel/printf.c + $(CC) $(INC) $(CCFLAGS) -E -c kernel/page.c + $(CC) $(INC) $(CCFLAGS) -E -c kernel/libc.c run: qemu-system-x86_64 -smp $(EMU_CORES) -m $(EMU_RAM) -nographic -no-reboot -drive format=raw,file=./indigo_os -- cgit v1.2.3