diff --git a/arch/x86_64/extra.mk b/arch/x86_64/extra.mk index 5b47079..7efe101 100644 --- a/arch/x86_64/extra.mk +++ b/arch/x86_64/extra.mk @@ -11,6 +11,9 @@ $(BUILD_DIR)/$(KERNEL_EXEC).elf32: $(BUILD_DIR)/$(KERNEL_EXEC) @cp $(BUILD_DIR)/$(KERNEL_EXEC) $(BUILD_DIR)/$(KERNEL_EXEC).elf32 $(BUILD_DIR)/tools/e64patch/e64patch $(BUILD_DIR)/$(KERNEL_EXEC).elf32 +$(BUILD_DIR)/socks-kernel.iso: $(BUILD_DIR)/$(KERNEL_EXEC) + @$(BUILD_DIR)/../tools/socks.mkrescue + run: $(BUILD_DIR)/$(KERNEL_EXEC) $(BUILD_DIR)/$(KERNEL_EXEC).elf32 @printf " \033[1;93mQEMU\033[0m $<\n" @@ -21,6 +24,11 @@ run-curses: $(BUILD_DIR)/$(KERNEL_EXEC) $(BUILD_DIR)/$(KERNEL_EXEC).elf32 @$(QEMU) -kernel $(BUILD_DIR)/$(KERNEL_EXEC).elf32 -monitor stdio $(QEMU_FLAGS) -display curses -serial file:$(BUILD_DIR)/socks.log +run-cd-curses: $(BUILD_DIR)/socks-kernel.iso + @printf " \033[1;93mQEMU\033[0m $<\n" + + @$(QEMU) -cdrom $(BUILD_DIR)/socks-kernel.iso $(QEMU_FLAGS) -display curses -serial file:$(BUILD_DIR)/socks.log + debug: $(BUILD_DIR)/$(KERNEL_EXEC) $(BUILD_DIR)/$(KERNEL_EXEC).elf32 @./tools/kernel-debug/debug_session.sh \ tools/kernel-debug/gdb_session_init \ @@ -37,3 +45,11 @@ debug-curses: $(BUILD_DIR)/$(KERNEL_EXEC) $(BUILD_DIR)/$(KERNEL_EXEC).elf32 $(QEMU) \ -kernel $(BUILD_DIR)/$(KERNEL_EXEC).elf32 -S -s \ -display curses -serial file:$(BUILD_DIR)/socks.log $(QEMU_FLAGS) > build/qemu.log + +debug-cd-curses: $(BUILD_DIR)/socks-kernel.iso + @./tools/kernel-debug/debug_session.sh \ + tools/kernel-debug/gdb_session_init \ + tools/kernel-debug/lldb_session_init \ + $(QEMU) \ + -cdrom $(BUILD_DIR)/socks-kernel.iso -S -s \ + -display curses -serial file:$(BUILD_DIR)/socks.log $(QEMU_FLAGS) > build/qemu.log