diff --git a/Makefile b/Makefile index 2c1cd65..4a162f2 100644 --- a/Makefile +++ b/Makefile @@ -8,23 +8,91 @@ default: all .PHONY: clean clean: rm -drf $(BUILD) - cd bootloader; make clean + cd tetros; cargo clean # Make everything +# (but don't run qemu) .PHONY: all all: img -# Make bios bootloader -# dd if=./bootloader/build/stage2.bin of=$@ conv=notrunc bs=512 seek=40 +# +# MARK: boot +# +# Compile tetros as library +LIB_SRC = ./tetros/Cargo.toml ./tetros/Cargo.lock $(shell find ./tetros/src -type f) +$(BUILD)/tetros.lib: $(LIB_SRC) + @mkdir -p $(BUILD) + cd tetros && \ + env RUSTFLAGS="-C soft-float" \ + cargo rustc \ + --manifest-path="./Cargo.toml" \ + -Z build-std=core,alloc \ + -Z build-std-features=compiler-builtins-mem \ + --target "./targets/x86-unknown-none.json" \ + --lib \ + --release \ + -- \ + --emit link="$(CURDIR)/$@" + +# Link tetros +BIOS_LD = ./tetros/linkers/x86-unknown-none.ld +$(BUILD)/tetros.elf: $(BUILD)/tetros.lib $(BIOS_LD) + ld \ + -m elf_i386 \ + --gc-sections \ + -z max-page-size=0x1000 \ + -T "$(BIOS_LD)" \ + -o "$@" \ + "$<" + + objcopy --only-keep-debug "$@" "$@.sym" + objcopy --strip-debug "$@" + +# Wrap tetros in three-stage BIOS loader +# Parameters: +# - BIOS_SRC: source directory of bios assembly +# - STAGE3: path to linked stage 3 binary +# - STAGE2_SECTOR: the index of the first sector of the stage 2 binary on the disk +BIOS_SRC = ./bios +STAGE2_SECTOR = 5 +STAGE3 = $(BUILD)/tetros.elf +$(BUILD)/bios.bin: $(wildcard $(BIOS_SRC)/*.asm) $(STAGE3) + @mkdir -p "$(BUILD)" + nasm \ + -f bin \ + -D STAGE3=$(STAGE3) \ + -D STAGE2_SECTOR=$(STAGE2_SECTOR) \ + -o "$@" \ + -l "$@.lst" \ + -i "$(BIOS_SRC)" \ + "$(BIOS_SRC)/main.asm" + +# Extract full mbr (first 512 bytes) +$(BUILD)/mbr.bin: $(BUILD)/bios.bin + @mkdir -p "$(BUILD)" + @echo "" + dd if="$<" bs=512 count=1 of="$@" + +# Extract stage 2 (rest of file) +$(BUILD)/stage2.bin: $(BUILD)/bios.bin + @mkdir -p "$(BUILD)" + @echo "" + dd if="$<" bs=512 skip=1 of="$@" + +# +# MARK: bundle +# + +# Make full disk image .PHONY: img img: $(BUILD)/disk.img -$(BUILD)/disk.img: - mkdir -p $(BUILD) - cd bootloader; make +$(BUILD)/disk.img: $(BUILD)/mbr.bin $(BUILD)/stage2.bin + @mkdir -p $(BUILD) + @echo "" dd if=/dev/zero of=$@ bs=512 count=32 - dd if=./bootloader/build/512.bin of=$@ conv=notrunc bs=512 - dd if=./bootloader/build/stage2.bin of=$@ conv=notrunc seek=5 bs=512 + dd if="$(BUILD)/mbr.bin" of=$@ conv=notrunc bs=512 + dd if="$(BUILD)/stage2.bin" of=$@ conv=notrunc seek=5 bs=512 qemu: $(BUILD)/disk.img qemu-system-i386 \ diff --git a/bootloader/bios/cpuid.asm b/bios/cpuid.asm similarity index 100% rename from bootloader/bios/cpuid.asm rename to bios/cpuid.asm diff --git a/bootloader/bios/gdt.asm b/bios/gdt.asm similarity index 100% rename from bootloader/bios/gdt.asm rename to bios/gdt.asm diff --git a/bootloader/bios/main.asm b/bios/main.asm similarity index 100% rename from bootloader/bios/main.asm rename to bios/main.asm diff --git a/bootloader/bios/print.asm b/bios/print.asm similarity index 100% rename from bootloader/bios/print.asm rename to bios/print.asm diff --git a/bootloader/bios/protected_mode.asm b/bios/protected_mode.asm similarity index 100% rename from bootloader/bios/protected_mode.asm rename to bios/protected_mode.asm diff --git a/bootloader/bios/stage1.asm b/bios/stage1.asm similarity index 100% rename from bootloader/bios/stage1.asm rename to bios/stage1.asm diff --git a/bootloader/bios/stage2.asm b/bios/stage2.asm similarity index 100% rename from bootloader/bios/stage2.asm rename to bios/stage2.asm diff --git a/bootloader/bios/thunk.asm b/bios/thunk.asm similarity index 100% rename from bootloader/bios/thunk.asm rename to bios/thunk.asm diff --git a/bootloader/.gitignore b/bootloader/.gitignore deleted file mode 100644 index 378eac2..0000000 --- a/bootloader/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/bootloader/Makefile b/bootloader/Makefile deleted file mode 100644 index 2f04455..0000000 --- a/bootloader/Makefile +++ /dev/null @@ -1,83 +0,0 @@ -# This compiles our bootloader as a static library, -# and wraps it in a multistage loader. - - -BUILD = ./build - - -.PHONY: all -all: $(BUILD)/mbr.bin $(BUILD)/512.bin $(BUILD)/stage2.bin - -.PHONY: clean -clean: - rm -drf $(BUILD) - cd bootloader; cargo clean - -# Compile bootloader as library -LIB_SRC = ./bootloader/Cargo.toml ./bootloader/Cargo.lock $(shell find ./bootloader/src -type f) -$(BUILD)/bootloader.lib: $(LIB_SRC) - @mkdir -p $(BUILD) - cd bootloader && \ - env RUSTFLAGS="-C soft-float" \ - cargo rustc \ - --manifest-path="./Cargo.toml" \ - -Z build-std=core,alloc \ - -Z build-std-features=compiler-builtins-mem \ - --target "./targets/x86-unknown-none.json" \ - --lib \ - --release \ - -- \ - --emit link="$(CURDIR)/$@" - -# Link bootloader -BIOS_LD = ./bootloader/linkers/x86-unknown-none.ld -$(BUILD)/bootloader.elf: $(BUILD)/bootloader.lib $(BIOS_LD) - ld \ - -m elf_i386 \ - --gc-sections \ - -z max-page-size=0x1000 \ - -T "$(BIOS_LD)" \ - -o "$@" \ - "$<" - - objcopy --only-keep-debug "$@" "$@.sym" - objcopy --strip-debug "$@" - -# Wrap bootloader in three-stage BIOS loader -# Parameters: -# - BIOS_SRC: source directory of bios assembly -# - STAGE3: path to linked stage 3 binary -# - STAGE2_SECTOR: the index of the first sector of the stage 2 binary on the disk -BIOS_SRC = ./bios -STAGE2_SECTOR = 5 -STAGE3 = $(BUILD)/bootloader.elf -$(BUILD)/bios.bin: $(wildcard $(BIOS_SRC)/*.asm) $(STAGE3) - @mkdir -p "$(BUILD)" - nasm \ - -f bin \ - -D STAGE3=$(STAGE3) \ - -D STAGE2_SECTOR=$(STAGE2_SECTOR) \ - -o "$@" \ - -l "$@.lst" \ - -i "$(BIOS_SRC)" \ - "$(BIOS_SRC)/main.asm" - -# Extract MBR code (first 440 bytes) -# This can be used to embed this mbr in gpt-partitioned disks -$(BUILD)/mbr.bin: $(BUILD)/bios.bin - @mkdir -p "$(BUILD)" - @echo "" - dd if="$<" bs=440 count=1 of="$@" - -# Extract full mbr (first 512 bytes) -# This can be used to make raw boot disks -$(BUILD)/512.bin: $(BUILD)/bios.bin - @mkdir -p "$(BUILD)" - @echo "" - dd if="$<" bs=512 count=1 of="$@" - -# Extract stage 2 (rest of file) -$(BUILD)/stage2.bin: $(BUILD)/bios.bin - @mkdir -p "$(BUILD)" - @echo "" - dd if="$<" bs=512 skip=1 of="$@" \ No newline at end of file diff --git a/bootloader/bootloader/Cargo.lock b/tetros/Cargo.lock similarity index 100% rename from bootloader/bootloader/Cargo.lock rename to tetros/Cargo.lock diff --git a/bootloader/bootloader/Cargo.toml b/tetros/Cargo.toml similarity index 100% rename from bootloader/bootloader/Cargo.toml rename to tetros/Cargo.toml diff --git a/bootloader/bootloader/linkers/x86-unknown-none.ld b/tetros/linkers/x86-unknown-none.ld similarity index 100% rename from bootloader/bootloader/linkers/x86-unknown-none.ld rename to tetros/linkers/x86-unknown-none.ld diff --git a/bootloader/bootloader/rust-toolchain.toml b/tetros/rust-toolchain.toml similarity index 100% rename from bootloader/bootloader/rust-toolchain.toml rename to tetros/rust-toolchain.toml diff --git a/bootloader/bootloader/src/main.rs b/tetros/src/main.rs similarity index 100% rename from bootloader/bootloader/src/main.rs rename to tetros/src/main.rs diff --git a/bootloader/bootloader/src/os/bios/memory_map.rs b/tetros/src/os/bios/memory_map.rs similarity index 100% rename from bootloader/bootloader/src/os/bios/memory_map.rs rename to tetros/src/os/bios/memory_map.rs diff --git a/bootloader/bootloader/src/os/bios/mod.rs b/tetros/src/os/bios/mod.rs similarity index 100% rename from bootloader/bootloader/src/os/bios/mod.rs rename to tetros/src/os/bios/mod.rs diff --git a/bootloader/bootloader/src/os/bios/panic.rs b/tetros/src/os/bios/panic.rs similarity index 100% rename from bootloader/bootloader/src/os/bios/panic.rs rename to tetros/src/os/bios/panic.rs diff --git a/bootloader/bootloader/src/os/bios/tetris.rs b/tetros/src/os/bios/tetris.rs similarity index 100% rename from bootloader/bootloader/src/os/bios/tetris.rs rename to tetros/src/os/bios/tetris.rs diff --git a/bootloader/bootloader/src/os/bios/thunk.rs b/tetros/src/os/bios/thunk.rs similarity index 100% rename from bootloader/bootloader/src/os/bios/thunk.rs rename to tetros/src/os/bios/thunk.rs diff --git a/bootloader/bootloader/src/os/bios/vga-copy.rs b/tetros/src/os/bios/vga-copy.rs similarity index 100% rename from bootloader/bootloader/src/os/bios/vga-copy.rs rename to tetros/src/os/bios/vga-copy.rs diff --git a/bootloader/bootloader/src/os/bios/vga.rs b/tetros/src/os/bios/vga.rs similarity index 100% rename from bootloader/bootloader/src/os/bios/vga.rs rename to tetros/src/os/bios/vga.rs diff --git a/bootloader/bootloader/src/os/mod.rs b/tetros/src/os/mod.rs similarity index 100% rename from bootloader/bootloader/src/os/mod.rs rename to tetros/src/os/mod.rs diff --git a/bootloader/bootloader/src/serial.rs b/tetros/src/serial.rs similarity index 100% rename from bootloader/bootloader/src/serial.rs rename to tetros/src/serial.rs diff --git a/bootloader/bootloader/targets/x86-unknown-none.json b/tetros/targets/x86-unknown-none.json similarity index 100% rename from bootloader/bootloader/targets/x86-unknown-none.json rename to tetros/targets/x86-unknown-none.json