diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Cargo.toml | 24 | ||||
| -rw-r--r-- | asm/.gitignore | 1 | ||||
| -rw-r--r-- | asm/Makefile | 36 | ||||
| -rw-r--r-- | asm/src/arch/x86_64/boot.asm | 18 | ||||
| -rw-r--r-- | asm/src/arch/x86_64/grub.cfg | 7 | ||||
| -rw-r--r-- | asm/src/arch/x86_64/linker.ld | 16 | ||||
| -rw-r--r-- | asm/src/arch/x86_64/multiboot_header.asm | 15 | ||||
| -rw-r--r-- | rust-toolchain | 1 | ||||
| -rw-r--r-- | src/main.rs | 29 | ||||
| -rw-r--r-- | x86_64-vulkan_os.json | 15 |
11 files changed, 164 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..53eaa21 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/target +**/*.rs.bk diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..f7da070 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "vulkan_os" +version = "0.1.0" +authors = ["Daniel Weipert <code@drogueronin.de>"] + +[package.metadata.bootimage] +default-target = "x86_64-vulkan_os.json" + +[dependencies] +bootloader_precompiled = "0.2.0" + +# steps to create VDI for VirtualBox +# dd if=target/x86_64-vulkan_os/debug/bootimage-vulkan_os.bin of=target/x86_64-vulkan_os/debug/vulkan_os.padded.bin bs=100M conv=sync +# VBoxManage convertdd vulkan_os.padded.bin vulkan_os.vdi --format VDI +# Use as existing disk for VirtualBox => start + +# steps to create VMDK for VirtualBox +# VBoxManage convertfromraw target/x86_64-vulkan_os/debug/bootimage-vulkan_os.bin target/x86_64-vulkan_os/debug/bootimage-vulkan_os.vmdk --format vmdk +# Use as existing disk for VirtualBox => start + +# QEMU on Windows run command +# "F:\Windows\Programme\qemu\qemu-system-x86_64.exe" -drive format=raw,file=E:\dweipert\JetbrainsProjects\IdeaProjects\VulkanOS\target\x86_64-vulkan_os\debug\bootimage-vulkan_os.bin +# "F:\Windows\Programme\qemu\qemu-system-x86_64.exe" -drive format=raw,file=target\x86_64-vulkan_os\debug\bootimage-vulkan_os.bin + 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: diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 0000000..07ade69 --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +nightly
\ No newline at end of file diff --git a/src/main.rs b/src/main.rs new file mode 100644 index 0000000..0d36800 --- /dev/null +++ b/src/main.rs @@ -0,0 +1,29 @@ +#![no_std] +#![no_main] + +extern crate bootloader_precompiled; + +use core::panic::PanicInfo; + +/// This function is called on panic. +#[panic_handler] +#[no_mangle] +pub fn panic(_info: &PanicInfo) -> ! { + loop {} +} + +static TEXT: &[u8] = b"Hello Marius! I do cool operating system development stuff look at meeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee!"; + +#[no_mangle] +pub extern "C" fn _start() -> ! { + let vga_buffer = 0xb8000 as *mut u8; + + for (i, &byte) in TEXT.iter().enumerate() { + unsafe { + *vga_buffer.offset(i as isize * 2) = byte; + *vga_buffer.offset(i as isize * 2 + 1) = 0x6; + } + } + + loop {} +} diff --git a/x86_64-vulkan_os.json b/x86_64-vulkan_os.json new file mode 100644 index 0000000..7d2110d --- /dev/null +++ b/x86_64-vulkan_os.json @@ -0,0 +1,15 @@ +{ + "llvm-target": "x86_64-unknown-none", + "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128", + "arch": "x86_64", + "target-endian": "little", + "target-pointer-width": "64", + "target-c-int-width": "32", + "os": "none", + "executables": true, + "linker-flavor": "ld.lld", + "linker": "rust-lld", + "panic-strategy": "abort", + "disable-redzone": true, + "features": "-mmx,-sse,+soft-float" +} |