fix: bugs related to O2 optimization

[lunaix-os.git] / lunaix-os / makefile

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index c25ee5cee93b9e99fa5765bf9e46caa6f50503e4..2735946ad29feaa663c907eb6ce755be91392df8 100644 (file)
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -20,43 +20,60 @@ $(ISO_DIR):
 
 $(OBJECT_DIR)/%.S.o: %.S
        @mkdir -p $(@D)
 
 $(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)
 
 $(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)
 
 $(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
 
 $(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)
 
        @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)
-all-debug: LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
+instable: O := -O2
+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)
        @echo "Dumping the disassembled kernel code to $(BUILD_DIR)/kdump.txt"
        @i686-elf-objdump -S $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt
 
 clean:
 all-debug: clean $(BUILD_DIR)/$(OS_ISO)
        @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)
 
 run: $(BUILD_DIR)/$(OS_ISO)

-       @qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::$(QEMU_MON_PORT),server,nowait &
+       @qemu-system-i386 $(QEMU_OPTIONS)

        @sleep 1
        @telnet 127.0.0.1 $(QEMU_MON_PORT)
 
 debug-qemu: all-debug
        @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) -monitor telnet::$(QEMU_MON_PORT),server,nowait &
+       @i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
+       @qemu-system-i386 $(QEMU_OPTIONS)

        @sleep 1
        @sleep 1

-       @$(QEMU_MON_TERM) -e "telnet 127.0.0.1 $(QEMU_MON_PORT)"
+       @$(QEMU_MON_TERM) -- telnet 127.0.0.1 $(QEMU_MON_PORT)

        @gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote localhost:1234"
 
        @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
 debug-bochs: all-debug
        @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