From 87293b0a1150b1bc7467f6916419f56f9f2be075 Mon Sep 17 00:00:00 2001 From: Daniel Weipert Date: Mon, 24 Sep 2018 23:23:19 +0200 Subject: Initial commit --- asm/.gitignore | 1 + asm/Makefile | 36 ++++++++++++++++++++++++++++++++ asm/src/arch/x86_64/boot.asm | 18 ++++++++++++++++ asm/src/arch/x86_64/grub.cfg | 7 +++++++ asm/src/arch/x86_64/linker.ld | 16 ++++++++++++++ asm/src/arch/x86_64/multiboot_header.asm | 15 +++++++++++++ 6 files changed, 93 insertions(+) create mode 100644 asm/.gitignore create mode 100644 asm/Makefile create mode 100644 asm/src/arch/x86_64/boot.asm create mode 100644 asm/src/arch/x86_64/grub.cfg create mode 100644 asm/src/arch/x86_64/linker.ld create mode 100644 asm/src/arch/x86_64/multiboot_header.asm (limited to 'asm') diff --git a/asm/.gitignore b/asm/.gitignore new file mode 100644 index 0000000..d163863 --- /dev/null +++ b/asm/.gitignore @@ -0,0 +1 @@ +build/ \ No newline at end of file diff --git a/asm/Makefile b/asm/Makefile new file mode 100644 index 0000000..c05f7f4 --- /dev/null +++ b/asm/Makefile @@ -0,0 +1,36 @@ +arch ?= x86_64 +kernel := build/kernel-$(arch).bin +iso := build/os-$(arch).iso + +linker_script := src/arch/$(arch)/linker.ld +grub_cfg := src/arch/$(arch)/grub.cfg +assembly_source_files := $(wildcard src/arch/$(arch)/*.asm) +assembly_object_files := $(patsubst src/arch/$(arch)/%.asm, \ + build/arch/$(arch)/%.o, $(assembly_source_files)) + +.PHONY: all clean run iso + +all: $(kernel) + +clean: + @rm -r build + +run: $(iso) + @qemu-system-x86_64 -cdrom $(iso) + +iso: $(iso) + +$(iso): $(kernel) $(grub_cfg) + @mkdir -p build/isofiles/boot/grub + @cp $(kernel) build/isofiles/boot/kernel.bin + @cp $(grub_cfg) build/isofiles/boot/grub + @grub-mkrescue -o $(iso) build/isofiles 2> /dev/null + +$(kernel): $(assembly_object_files) $(linker_script) + @ld -n -T $(linker_script) -o $(kernel) $(assembly_object_files) + +# compile assembly files +build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm + @mkdir -p $(shell dirname $@) + @nasm -felf64 $< -o $@ + diff --git a/asm/src/arch/x86_64/boot.asm b/asm/src/arch/x86_64/boot.asm new file mode 100644 index 0000000..0a5f650 --- /dev/null +++ b/asm/src/arch/x86_64/boot.asm @@ -0,0 +1,18 @@ +global start + +section .text +bits 32 +start: + ; print to the screen + mov dword [0xb8000], 0x2f632f49 + mov dword [0xb8004], 0x00202f68 + mov dword [0xb8008], 0x4f694f6c + mov dword [0xb800c], 0x4f624f65 + mov dword [0xb8010], 0x00204f65 + mov dword [0xb8014], 0x2f732f49 + mov dword [0xb8018], 0x00202f65 + mov dword [0xb801c], 0x00204f26 + mov dword [0xb8020], 0x2f612f4d + mov dword [0xb8024], 0x2f692f72 + mov dword [0xb8028], 0x2f732f75 + hlt diff --git a/asm/src/arch/x86_64/grub.cfg b/asm/src/arch/x86_64/grub.cfg new file mode 100644 index 0000000..03f4c4a --- /dev/null +++ b/asm/src/arch/x86_64/grub.cfg @@ -0,0 +1,7 @@ +set timeout=0 +set default=0 + +menuentry "VulkanOS" { + multiboot2 /boot/kernel.bin + boot +} diff --git a/asm/src/arch/x86_64/linker.ld b/asm/src/arch/x86_64/linker.ld new file mode 100644 index 0000000..5d788f1 --- /dev/null +++ b/asm/src/arch/x86_64/linker.ld @@ -0,0 +1,16 @@ +ENTRY(start) + +SECTIONS { + . = 1M; + + .boot : + { + /* ensure that the multiboot header is at the beginning */ + *(.multiboot_header) + } + + .text : + { + *(.text) + } +} diff --git a/asm/src/arch/x86_64/multiboot_header.asm b/asm/src/arch/x86_64/multiboot_header.asm new file mode 100644 index 0000000..9a9289c --- /dev/null +++ b/asm/src/arch/x86_64/multiboot_header.asm @@ -0,0 +1,15 @@ +section .multiboot_header +header_start: + dd 0xe85250d6 ; magic number (multiboot 2) + dd 0 ; architecture 0 (protected mode i386) + dd header_end - header_start ; header length + ; checksum + dd 0x100000000 - (0xe85250d6 + 0 + (header_end - header_start)) + + ; insert optional multiboot tags here + + ; required end tag + dw 0 ; type + dw 0 ; flags + dd 8 ; size +header_end: -- cgit v1.2.3