Merge pull request #74 from hawkw/new-rust-boot

Pure-Rust boot sequence

Author: hawkw

.gitignore

@@ -2,7 +2,6 @@
 # Created by https://www.gitignore.io/api/assembler,rust,emacs,osx,sublimetext,tags,vagrant,vim,linux
 
 ### Kernel binaries ###
-/build/
 *.iso
 *.bin
 *.elf
@@ -156,6 +155,8 @@ Session.vim
 tags
 .tags1
 
+### GDB ###
+.gdb_history
 
 ### Linux ###
 *~

.travis.yml

@@ -41,6 +41,12 @@ before_install: |
     brew update && brew tap homebrew/bundle &&
     travis_wait 120 brew bundle;
     printf "\n\n[target.x86_64-sos-kernel-gnu]\nlinker = \"/usr/local/bin/x86_64-pc-elf-gcc\"" >> $HOME/.cargo/config;
+  elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+    objcopy=$(which objcopy) &&
+    strip=$(which strip) &&
+    mkdir -p $HOME/bin &&
+    ln -s $objcopy $HOME/bin/x86_64-elf-objcopy &&
+    ln -s $strip $HOME/bin/x86_64-elf-strip
   fi
 
 install:
@@ -74,7 +80,7 @@ install:
 
 script:
   - make test
-  - xargo build --target x86_64-sos-kernel-gnu
+  - make kernel
 
 # after_success:
 #   - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then travis-cargo doc && travis-cargo doc-upload; fi
@@ -92,4 +98,5 @@ env:
   global:
     # override the default `--features unstable` used for the nightly branch (optional)
     - TRAVIS_CARGO_NIGHTLY_FEATURE=""
+    - PATH="$PATH:$HOME/bin"
     - secure: Vv4bFCkxM3o7FpKjcxTzQRWdkp5aSfrkmFcxSRLYFhm8tyeh+TRiC2+ucNfscFeOzPTC/hTwatbbpdTIaAZKpyrD/gB4hNiGFdKV1x1pw23KQkiPmQdFKxAHtIS20jeIa44q6kPltTQtZXXuM8s0xc6r+C14Q6igd4HkD0nLhAlKIQpcS/srXoeMheL3vNIroasHUwFgpv1LLJnMqYhCHzNk2Y6CaxYygg5Cy2gS9G1nfxdNVfF4iaUXYZKgU0s3C1GL0ApTtUxW0uT/NS0UBZwttsq9NvwmZSZQIXpfTnn0wHd4cl8MhokUQNEumFouU5rlEIcFS9ulohxaHnn50cqfos+seblKs2E+MJoX8rBO5Kz3dNE3+otZw9CpImskO4EKA2MYwtTC3Ds4uVoleS9PskCMz32jKXqp6WqZkJgpimHrdv0jNBy2ucTMdw91XjRXLA557GPRa/28TPpKkMYrSB02c2IadftexWKDP5Q9uMsfTEgIpXzx/XRQvPoxtJo+rOn9hTbyHWexKEMAuic12FBoYFOMSbRKtpT8kjtd8WeBzc1RmXZYpg5td5EN3v/2fmvM6F6Sz/db4HgNZIccC/j/fWvXN7njRl8bgMC002/tkQs0Ugl1aE5onaK9DTMHquqCLnd9CADwXdQf1YsfxryjhhBfd1WIfuqe1Ww=

Cargo.toml

@@ -8,7 +8,7 @@ authors = [ # hacked around by
           ]
 
 build = "build.rs"
-
+# build = false
 # [[bin]]
 # name = "sos_kernel_full"
 
@@ -62,7 +62,7 @@ features = ["spin_no_std"]
 
 [dependencies.vga]
 path = "vga"
-features = ["kinfo"]
+features = ["kinfo", "system_term"]
 
 [dependencies.alloc]
 path = "alloc"
@@ -71,6 +71,3 @@ features = ["buddy_as_system"]
 [dependencies.clippy]
 version = "0.0.60"
 optional = true
-
-[build-dependencies]
-nasm-rs = { git = "https://github.com/medek/nasm-rs" }

Makefile

@@ -1,11 +1,19 @@
 arch ?= x86_64
 target ?= $(arch)-sos-kernel-gnu
 
+boot_target := x86_32-sos-bootstrap-gnu
+boot_outdir := boot/target/$(boot_target)
+
 iso := target/$(target)/debug/sos-$(arch).iso
 kernel := target/$(target)/debug/sos_kernel
+isofiles := target/$(target)/debug/isofiles
+boot := $(boot_outdir)/debug/libboot.a
+
 
 release_iso := target/$(target)/release/sos-$(arch).iso
 release_kernel := target/$(target)/release/sos_kernel
+release_isofiles := target/$(target)/release/isofiles
+release_boot := $(boot_outdir)/release/libboot.a
 
 grub_cfg := src/arch/$(arch)/grub.cfg
 
@@ -39,6 +47,9 @@ HELP_FUN = \
 
 .PHONY: all clean kernel run iso cargo help gdb test doc release-iso release-run release-kernel
 
+exception: $(iso) ##@build Run the kernel, dumping the state from QEMU if an exception occurs
+	@qemu-system-x86_64 -s -hda $(iso) -d int -no-reboot
+
 doc: ##@utilities Make RustDoc documentation
 	@xargo doc
 
@@ -52,7 +63,7 @@ env: ##@utilities Install dev environment dependencies
 
 clean: ##@utilities Delete all build artefacts.
 	@xargo clean
-
+	@cd boot && xargo clean
 
 kernel: $(kernel).bin ##@build Compile the debug kernel binary
 
@@ -67,7 +78,7 @@ release-iso: $(release_iso) ##@release Compile the release kernel binary and mak
 release-run: run-release ##@release Make the release kernel ISO image and boot QEMU from it.
 
 debug: $(iso) ##@build Run the kernel, redirecting serial output to a logfile.
-	@qemu-system-x86_64 -s -hda $(iso) -serial file:$(CURDIR)/target/$(target)/serial-$(TIMESTAMP).log
+	@qemu-system-x86_64 -s -S -hda $(iso) -serial file:$(CURDIR)/target/$(target)/serial-$(TIMESTAMP).log
 
 test: ##@build Test crate dependencies
 	@cargo test -p sos_intrusive
@@ -86,13 +97,37 @@ $(wild_iso): $(wild_kernel).bin $(wild_isofiles) $(grub_cfg)
 $(wild_isofiles):
 	@mkdir -p $@/boot/grub
 
-$(release_kernel):
+$(boot):
+	@cd boot && xargo rustc --target $(boot_target) -- \
+		--emit=obj=target/$(boot_target)/debug/boot32.o
+	# # Place 32-bit bootstrap code into a 64-bit ELF
+	@x86_64-elf-objcopy -O elf64-x86-64 $(boot_outdir)/debug/boot32.o \
+	 	$(boot_outdir)/debug/boot.o
+	# @x86_64-elf-objcopy --strip-debug -G _start boot/target/boot.o
+	@cd $(boot_outdir)/debug && ar -crus libboot.a boot.o
+
+$(release_boot):
+	@cd boot && xargo rustc --target $(boot_target) -- --release \
+	 	--emit=obj=target/$(boot_target)release/boot32.o
+	# # Place 32-bit bootstrap code into a 64-bit ELF
+	@x86_64-elf-objcopy -O elf64-x86-64 $(boot_outdir)/release/boot32.o $(boot_outdir)/release/boot.o
+	@x86_64-elf-objcopy --strip-debug -G _start $(boot_outdir)/release/boot.o
+	@cd $(boot_outdir)/release && ar -crus libboot.a boot.o
+
+$(release_kernel): $(release_boot)
 	@xargo build --target $(target) --release
 
 $(release_kernel).bin: $(release_kernel)
 	@cp $(release_kernel) $(release_kernel).bin
 
-$(kernel):
+$(release_iso): $(release_kernel).bin $(grub_cfg)
+	@mkdir -p $(release_isofiles)/boot/grub
+	@cp $(release_kernel).bin $(release_isofiles)/boot/
+	@cp $(grub_cfg) $(release_isofiles)/boot/grub
+	@grub-mkrescue -o $(release_iso) $(release_isofiles)/
+	@rm -r $(release_isofiles)
+
+$(kernel): $(boot)
 	@xargo build --target $(target)
 
 $(kernel).debug: $(kernel)
@@ -103,4 +138,4 @@ $(kernel).bin: $(kernel) $(kernel).debug
 	@x86_64-elf-objcopy --add-gnu-debuglink=$(kernel).debug $(kernel)
 
 gdb: $(kernel).bin $(kernel).debug ##@utilities Connect to a running QEMU instance with gdb.
-	@rust-gdb -ex "target remote tcp:127.0.0.1:1234" $(kernel)
+	@rust-os-gdb -ex "target remote tcp:127.0.0.1:1234" $(kernel)

boot/Cargo.toml

@@ -0,0 +1,33 @@
+[package]
+name = "boot"
+version = "0.1.0"
+authors = ["Eliza Weisman <hi@hawkweisman.me>"]
+
+# [lib]
+# crate-type = ["staticlib"]
+
+# [[bin]]
+# name = "libboot.a"
+
+[features]
+default = ["log"]
+log = []
+
+[profile.dev]
+opt-level = 3
+debug = true
+rpath = false
+lto = false
+debug-assertions = true
+codegen-units = 1
+panic = "abort"
+
+[profile.release]
+opt-level = 3
+debug = true
+rpath = false
+lto = false
+panic = "abort"
+
+[dependencies]
+rlibc = "0.1.4"