X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/9406e904ddad5db2ba2dd550e21bbb224899fd79..b0c2a4be2d1f4f93ab01d0858979a12ef0735ec1:/lunaix-os/makefile

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index 9d3c799..e0f3eba 100644
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -20,17 +20,17 @@ $(ISO_DIR):
 
 $(OBJECT_DIR)/%.S.o: %.S
 	@mkdir -p $(@D)
-	@echo "$@"
+	@echo " BUILD: $<"
 	@$(CC) $(INCLUDES) -c $< -o $@
 
 $(OBJECT_DIR)/%.c.o: %.c 
 	@mkdir -p $(@D)
-	@echo "$@"
+	@echo " BUILD: $<"
 	@$(CC) $(INCLUDES) -c $< -o $@ $(CFLAGS)
 
 $(BIN_DIR)/$(OS_BIN): $(OBJECT_DIR) $(BIN_DIR) $(SRC)
-	@echo "Generating $(BIN_DIR)/$(OS_BIN)"
-	@$(CC) -T linker.ld -o $(BIN_DIR)/$(OS_BIN) $(SRC) $(LDFLAGS)
+	@echo " LINK: $(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
@@ -39,12 +39,12 @@ $(BUILD_DIR)/$(OS_ISO): $(ISO_DIR) $(BIN_DIR)/$(OS_BIN) GRUB_TEMPLATE
 
 all: clean $(BUILD_DIR)/$(OS_ISO)
 
-all-debug: O := -Og
-all-debug: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT)
+all-debug: O := -O0
+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)
 	@echo "Dumping the disassembled kernel code to $(BUILD_DIR)/kdump.txt"
-	@i686-elf-objdump -D $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt
+	@i686-elf-objdump -S $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt
 
 clean:
 	@rm -rf $(BUILD_DIR)
@@ -62,5 +62,11 @@ debug-qemu: all-debug
 	@$(QEMU_MON_TERM) -e "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 -s -S -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::$(QEMU_MON_PORT),server,nowait &
+	@sleep 0.5
+	@telnet 127.0.0.1 $(QEMU_MON_PORT)
+
 debug-bochs: all-debug
 	@bochs -q -f bochs.cfg