X-Git-Url: http://git.dujemihanovic.xyz/%7B%7B?a=blobdiff_plain;f=Makefile;h=f254d0c8ed42952a44a7d1cd42ad6c699b727b63;hb=da4e7bf5dd2b9448b638255a20ee503b0641e495;hp=c823fc4d53015e5c1e7e9f783f4ebf2be3b7af80;hpb=e643590fbf5d867cc6f7fb597718a980aa8f72b4;p=nameless-os.git

diff --git a/Makefile b/Makefile
index c823fc4..f254d0c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,15 @@
 export AS = yasm
+ASFLAGS = -g dwarf2 -f elf
 export CC = i686-elf-gcc
 QEMU = qemu-system-i386 -monitor stdio
 
 export GIT_REV = $(shell git describe --long HEAD)
 
-CFLAGS = -g -Iinclude/arch/x86 -ffreestanding -DGIT_COMMIT=\"$(GIT_REV)\"
+CFLAGS = -g -fgnu89-inline -Ikernel/include -Ikernel/include/arch/x86 -ffreestanding -DGIT_COMMIT=\"$(GIT_REV)\"
 
-KERNEL_OBJ = kernel/entry.o kernel/arch/x86/tty/tty.o kernel/drivers/irq/i8259a.o kernel/arch/x86/irq/idt.o kernel/arch/x86/irq/sample_handler.o kernel/kernel.o
+KERNEL_OBJ = kernel/entry.o kernel/arch/x86/halt.o kernel/arch/x86/tty/tty.o kernel/drivers/irq/i8259a.o kernel/arch/x86/irq/idt.o kernel/arch/x86/irq/sample_handler.o kernel/kernel.o
 
-BOOTLOADER_OBJ = boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN
+BOOTLOADER_OBJ = boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN boot/x86/stage3/loader.elf
 
 default: kernel/kernel.elf bootloader
 
@@ -19,38 +20,36 @@ bootloader: $(BOOTLOADER_OBJ)
 run: all
 	$(QEMU) boot/x86/disk.img
 
+debug: all
+	$(QEMU) -s -S boot/x86/disk.img
+
 boot/x86/mbr: boot/x86/mbr.s
 boot/x86/vbr-fat32: boot/x86/vbr-fat32.s boot/x86/fat32/*.s 
-boot/x86/stage3/LOADER.BIN: boot/x86/stage3/*.s boot/x86/fat32/*.s
+boot/x86/stage3/LOADER.BIN: boot/x86/stage3/*.s boot/x86/stage3/*.c boot/x86/fat32/*.s boot/x86/stage3/stage3.ld
+boot/x86/stage3/loader.elf: boot/x86/stage3/*.s boot/x86/stage3/*.c boot/x86/fat32/*.s boot/x86/stage3/stage3.ld
 $(BOOTLOADER_OBJ):
 	$(MAKE) -C boot/x86
 
-boot/x86/disk.img: boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN boot/x86/disk.dump kernel/kernel.bin
+boot/x86/disk.img: boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN boot/x86/disk.dump kernel/kernel.elf
 	truncate -s1G boot/x86/disk.img
 	sfdisk boot/x86/disk.img < boot/x86/disk.dump
 	mkfs.fat -F 32 --offset 2048 boot/x86/disk.img
 	dd if=boot/x86/mbr of=boot/x86/disk.img bs=440 count=1 conv=notrunc
 	dd if=boot/x86/vbr-fat32 of=boot/x86/disk.img bs=1 skip=90 seek=1048666 conv=notrunc
 	mcopy -i boot/x86/disk.img@@1M boot/x86/stage3/LOADER.BIN ::.
-	mcopy -i boot/x86/disk.img@@1M kernel/kernel.bin ::./KERNEL.BIN
-
-kernel/kernel.bin: ${KERNEL_OBJ} kernel/linker.ld
-	$(CC) -ffreestanding -nostdlib -o $@ -T kernel/linker.ld ${KERNEL_OBJ}
-
-kernel/entry.o: kernel/entry.s
-	$(AS) -f elf $< -o $@
+	mcopy -i boot/x86/disk.img@@1M kernel/kernel.elf ::./KERNEL.ELF
 
 kernel/arch/x86/irq/sample_handler.o: kernel/arch/x86/irq/sample_handler.c
 	$(CC) $(CFLAGS) -mgeneral-regs-only -c $< -o $@
 
-kernel/kernel.elf: kernel/kernel.bin
-	$(CC) -ffreestanding -nostdlib -o $@ -T kernel/linker.ld ${KERNEL_OBJ} -Wl,--oformat=elf32-i386
+kernel/kernel.elf: $(KERNEL_OBJ)
+	$(CC) -ffreestanding -nostdlib -o $@ -T kernel/linker.ld ${KERNEL_OBJ} -lgcc
 	i686-elf-objcopy --only-keep-debug kernel/kernel.elf kernel/kernel.dbg
 	i686-elf-objcopy --add-gnu-debuglink=kernel/kernel.dbg kernel/kernel.elf
 	i686-elf-strip --strip-unneeded kernel/kernel.elf
 
 clean:
-	-rm kernel/kernel.{bin,dbg,elf} ${KERNEL_OBJ}
+	-rm kernel/kernel.{dbg,elf} ${KERNEL_OBJ}
 	cd boot/x86 && $(MAKE) clean
 
-.PHONY: default all clean run bootloader
+.PHONY: default all clean run debug bootloader