X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/f4aab93debd6eed5115c2328ada3160512027bd2..13d664b914462e2410570d6f7d6258caac1662af:/lunaix-os/makefile

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index 2ff30c0..058bcc8 100644
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -1,28 +1,9 @@
-OS_ARCH := x86
+include config/make-locations
+include config/make-os
+include config/make-cc
+include config/make-debug-tool
 
-BUILD_DIR := build
-KERNEL_DIR := kernel
-OBJECT_DIR := $(BUILD_DIR)/obj
-BIN_DIR := $(BUILD_DIR)/bin
-ISO_DIR := $(BUILD_DIR)/iso
-ISO_BOOT_DIR := $(ISO_DIR)/boot
-ISO_GRUB_DIR := $(ISO_BOOT_DIR)/grub
-
-INCLUDES_DIR := includes
 INCLUDES := $(patsubst %, -I%, $(INCLUDES_DIR))
-
-OS_NAME = lunaix
-OS_BIN = $(OS_NAME).bin
-OS_ISO = $(OS_NAME).iso
-
-CC := i686-elf-gcc
-AS := i686-elf-as
-
-O := -O2
-W := -Wall -Wextra
-CFLAGS := -std=gnu99 -ffreestanding $(O) $(W)
-LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
-
 SOURCE_FILES := $(shell find -name "*.[cS]")
 SRC := $(patsubst ./%, $(OBJECT_DIR)/%.o, $(SOURCE_FILES))
 
@@ -39,38 +20,60 @@ $(ISO_DIR):
 
 $(OBJECT_DIR)/%.S.o: %.S
 	@mkdir -p $(@D)
-	$(CC) $(INCLUDES) -c $< -o $@
+	@echo "  CC    $<"
+	@$(CC) $(INCLUDES) -c $< -o $@
 
 $(OBJECT_DIR)/%.c.o: %.c 
 	@mkdir -p $(@D)
-	$(CC) $(INCLUDES) -c $< -o $@ $(CFLAGS)
+	@echo "  CC    $<"
+	@$(CC) $(INCLUDES) -c $< -o $@ $(CFLAGS)
 
 $(BIN_DIR)/$(OS_BIN): $(OBJECT_DIR) $(BIN_DIR) $(SRC)
-	$(CC) -T linker.ld -o $(BIN_DIR)/$(OS_BIN) $(SRC) $(LDFLAGS)
+	@echo "  LD    $(BIN_DIR)/$(OS_BIN)"
+	@$(CC) -T link/linker.ld -o $(BIN_DIR)/$(OS_BIN) $(SRC) $(LDFLAGS)
 
 $(BUILD_DIR)/$(OS_ISO): $(ISO_DIR) $(BIN_DIR)/$(OS_BIN) GRUB_TEMPLATE
-	@./config-grub.sh ${OS_NAME} > $(ISO_GRUB_DIR)/grub.cfg
+	@./config-grub.sh ${OS_NAME} $(ISO_GRUB_DIR)/grub.cfg
 	@cp $(BIN_DIR)/$(OS_BIN) $(ISO_BOOT_DIR)
 	@grub-mkrescue -o $(BUILD_DIR)/$(OS_ISO) $(ISO_DIR)
 
 all: clean $(BUILD_DIR)/$(OS_ISO)
 
-all-debug: O := -O0
-all-debug: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) -fomit-frame-pointer
-all-debug: LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
+instable: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
+instable: all
+
+all-debug: O := -Og
+all-debug: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
+all-debug: LDFLAGS := -g -ffreestanding $(O) -nostdlib -lgcc
 all-debug: clean $(BUILD_DIR)/$(OS_ISO)
-	@i686-elf-objdump -D $(BIN_DIR)/$(OS_BIN) > dump
+	@echo "Dumping the disassembled kernel code to $(BUILD_DIR)/kdump.txt"
+	@i686-elf-objdump -S $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt
 
 clean:
-	@rm -rf $(BUILD_DIR)
+	@rm -rf $(BUILD_DIR) || exit 1
+	@sleep 1
 
 run: $(BUILD_DIR)/$(OS_ISO)
-	@qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO)
+	@qemu-system-i386 $(QEMU_OPTIONS)
+	@sleep 1
+	@telnet 127.0.0.1 $(QEMU_MON_PORT)
 
 debug-qemu: all-debug
-	@objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
-	@qemu-system-i386 -s -S -kernel $(BIN_DIR)/$(OS_BIN) &
+	@i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
+	@qemu-system-i386 $(QEMU_OPTIONS)
+	@sleep 1
+	@$(QEMU_MON_TERM) -- telnet 127.0.0.1 $(QEMU_MON_PORT)
 	@gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote localhost:1234"
 
+debug-qemu-vscode: all-debug
+	@i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
+	@qemu-system-i386 $(QEMU_OPTIONS)
+	@sleep 0.5
+	@telnet 127.0.0.1 $(QEMU_MON_PORT)
+
 debug-bochs: all-debug
-	@bochs -q -f bochs.cfg
\ No newline at end of file
+	@bochs -q -f bochs.cfg
+
+debug-metal: 
+	@printf "@cmc" > $(PORT)
+	@gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote $(PORT)"
\ No newline at end of file