Merge pull request #60 from vmttmv/main

build: debug symbols for stage1
This commit is contained in:
2025-10-25 11:42:52 -07:00
committed by GitHub
2 changed files with 14 additions and 8 deletions

View File

@@ -7,7 +7,8 @@ IMG_SIZE = 1440k
BUILD_DIR = build BUILD_DIR = build
BOOT_SRC = bootloader/boot.asm BOOT_SRC = bootloader/boot.asm
BOOT_BIN = $(BUILD_DIR)/boot.bin BOOT_OBJ = $(BUILD_DIR)/boot.o
BOOT_ELF = $(BUILD_DIR)/boot.elf
BOOT_IMG = $(BUILD_DIR)/boot.img BOOT_IMG = $(BUILD_DIR)/boot.img
KERNEL_SRC = kernel/kmain.c KERNEL_SRC = kernel/kmain.c
KERNEL_BIN = $(BUILD_DIR)/kernel.bin KERNEL_BIN = $(BUILD_DIR)/kernel.bin
@@ -15,16 +16,17 @@ DISK_IMG = $(BUILD_DIR)/disk.img
all: $(BOOT_IMG) $(KERNEL_BIN) $(DISK_IMG) all: $(BOOT_IMG) $(KERNEL_BIN) $(DISK_IMG)
stage1: $(BOOT_IMG)
$(BUILD_DIR): $(BUILD_DIR):
mkdir -p $@ mkdir -p $@
$(BOOT_BIN): $(BOOT_SRC) | $(BUILD_DIR) $(BOOT_OBJ): $(BOOT_SRC) | $(BUILD_DIR)
$(AS) -f bin -o $@ $< $(AS) -f elf32 -g -F dwarf -o $@ $<
$(BOOT_IMG): $(BOOT_BIN) $(BOOT_ELF): $(BOOT_OBJ)
cp $(BOOT_BIN) $@ $(LD) -Ttext=0x7c00 -melf_i386 -o $@ $<
$(BOOT_IMG): $(BOOT_ELF)
objcopy -O binary $< $@
truncate -s $(IMG_SIZE) $@ truncate -s $(IMG_SIZE) $@
$(KERNEL_BIN): $(KERNEL_SRC) | $(BUILD_DIR) $(KERNEL_BIN): $(KERNEL_SRC) | $(BUILD_DIR)
@@ -38,5 +40,9 @@ $(DISK_IMG): $(BOOT_IMG) $(KERNEL_BIN)
run: $(DISK_IMG) run: $(DISK_IMG)
$(QEMU) -drive file=$<,format=raw,if=floppy $(QEMU) -drive file=$<,format=raw,if=floppy
.PHONY: stage1 clean
stage1: $(BOOT_IMG)
clean: clean:
rm -rf $(BUILD_DIR) rm -rf $(BUILD_DIR)

View File

@@ -3,7 +3,7 @@
; ============================================================================== ; ==============================================================================
[BITS 16] [BITS 16]
[ORG 0x7C00] ; [ORG 0x7C00]
start: start:
cli ; Disable interrupts cli ; Disable interrupts