Merge branch 'master' into rust-boot

Author: hawkw

.gitignore

@@ -7,6 +7,9 @@
 *.bin
 *.elf
 
+# serial output
+serial-*.log
+
 ### Assembler ###
 *.[sS]
 *.bc

.travis.yml

@@ -22,8 +22,7 @@ install:
 - export PATH="$PATH:$(rustc --print sysroot)/cargo/bin"
 - curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | bash -s -- --from japaric/xargo
 script:
-- cd lib/sos_alloc && cargo test
-- cd ../.. && cargo test -p sos_intrusive
+- make test
 - make
 after_success:
 - travis-cargo doc && travis-cargo doc-upload

Cargo.toml

@@ -7,21 +7,28 @@ authors = [ # hacked around by
             "Philipp Oppermann <dev@phil-opp.com>"
           ]
 
-          build = "build.rs"
+build = "build.rs"
 
-[[bin]]
-name = "sos_kernel_full"
+# [[bin]]
+# name = "sos_kernel_full"
 
 # [lib]
 # crate-type = ["staticlib"]
 #
 
 [profile.dev]
+opt-level = 3
+debug = true
+rpath = false
+lto = false
+debug-assertions = true
+codegen-units = 1
 panic = "abort"
 
 [profile.release]
+
 panic = "abort"
-debug = true
+debug = false
 
 [features]
 default = []
@@ -43,11 +50,11 @@ version = "0.2.*"
 features = ["spin_no_std"]
 
 [dependencies.sos_alloc]
-path = "lib/sos_alloc"
+path = "sos_alloc"
 features = ["buddy_as_system"]
 
 [dependencies.sos_vga]
-path = "lib/sos_vga"
+path = "sos_vga"
 features = ["system_term"]
 
 [dependencies.clippy]

Makefile

@@ -1,12 +1,18 @@
 arch ?= x86_64
-target ?= $(arch)-unknown-sos-gnu
+target ?= $(arch)-sos-kernel-gnu
 
-iso := target/$(target)/release/sos-$(arch).iso
-kernel := target/$(target)/release/sos_kernel
-isofiles := target/$(target)/release/isofiles
+iso := target/$(target)/debug/sos-$(arch).iso
+kernel := target/$(target)/debug/sos_kernel
+isofiles := target/$(target)/debug/isofiles
+
+release_iso := target/$(target)/release/sos-$(arch).iso
+release_kernel := target/$(target)/release/sos_kernel
+release_isofiles := target/$(target)/release/isofiles
 
 grub_cfg := src/arch/$(arch)/grub.cfg
 
+TIMESTAMP := $(shell /bin/date "+%Y-%m-%d-%H:%M:%S")
+
 #COLORS
 GREEN  := $(shell tput -Txterm setaf 2)
 WHITE  := $(shell tput -Txterm setaf 7)
@@ -23,47 +29,78 @@ HELP_FUN = \
     for (sort keys %help) { \
     print "${WHITE}$$_:${RESET}\n"; \
     for (@{$$help{$$_}}) { \
-    $$sep = " " x (32 - length $$_->[0]); \
+    $$sep = " " x (20 - length $$_->[0]); \
     print "  ${YELLOW}$$_->[0]${RESET}$$sep${GREEN}$$_->[1]${RESET}\n"; \
     }; \
     print "\n"; }
 
-.PHONY: all clean kernel run iso cargo help gdb
+.PHONY: all clean kernel run iso cargo help gdb test doc release-iso release-run release-kernel
+
+doc: ##@utilities Make RustDoc documentation
+	@xargo doc
 
 help: ##@miscellaneous Show this help.
 	@perl -e '$(HELP_FUN)' $(MAKEFILE_LIST)
 
-all: kernel
+all: help
 
 env: ##@utilities Install dev environment dependencies
 	./scripts/install-env.sh
 
 clean: ##@utilities Delete all build artefacts.
-	@cargo clean
+	@xargo clean
 
-kernel: $(kernel) ##@build Compile the kernel binary
+
+kernel: $(kernel).bin ##@build Compile the debug kernel binary
 
 iso: $(iso) ##@build Compile the kernel binary and make an ISO image
 
 run: $(iso) ##@build Make the kernel ISO image and boot QEMU from it.
 	@qemu-system-x86_64 -s -hda $(iso)
 
-$(iso): $(kernel) $(grub_cfg)
+release-kernel: $(release_kernel).bin ##@release Compile the release kernel binary
+
+release-iso: $(release_iso) ##@release Compile the release kernel binary and make an ISO image
+
+release-run: $(release_iso) ##@release Make the release kernel ISO image and boot QEMU from it.
+	@qemu-system-x86_64 -s -hda $(release_iso)
+
+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
+
+test: ##@build Test crate dependencies
+	@xargo test -p sos_intrusive
+	@cd sos_alloc && xargo test
+
+$(iso): $(kernel).bin $(grub_cfg)
 	@mkdir -p $(isofiles)/boot/grub
-	@cp $(kernel) $(isofiles)/boot/
+	@cp $(kernel).bin $(isofiles)/boot/
 	@cp $(grub_cfg) $(isofiles)/boot/grub
 	@grub-mkrescue -o $(iso) $(isofiles)/
 	@rm -r $(isofiles)
 
-$(kernel)_full:
-	@xargo build --release --target $(target)
+$(release_kernel):
+	@xargo build --target $(target) --release
+
+$(release_kernel).bin: $(release_kernel)
+	@cp $(release_kernel) $(release_kernel).bin
+
+$(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):
+	@xargo build --target $(target)
 
-$(kernel).debug: $(kernel)_full
-	@x86_64-elf-objcopy --only-keep-debug $(kernel)_full $(kernel).debug
+$(kernel).debug: $(kernel)
+	@x86_64-elf-objcopy --only-keep-debug $(kernel) $(kernel).debug
 
-$(kernel): $(kernel)_full $(kernel).debug
-	@x86_64-elf-strip -g -o $(kernel) $(kernel)_full
+$(kernel).bin: $(kernel) $(kernel).debug
+	@x86_64-elf-strip -g -o $(kernel).bin $(kernel)
 	@x86_64-elf-objcopy --add-gnu-debuglink=$(kernel).debug $(kernel)
 
-gdb: $(kernel) $(kernel).debug ##@utilities Connect to a running QEMU instance with gdb.
+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)