diff options
| author | Marvin Borner | 2019-10-31 17:46:31 +0100 |
|---|---|---|
| committer | Marvin Borner | 2019-10-31 17:46:31 +0100 |
| commit | 40a214f3c69a3d7da8c2f9bed5038dfa0ab72d4b (patch) | |
| tree | ad14da17e6d0d883e68cc6eacc99ae522036dda8 | |
| parent | 2c7b6e0431d6dfbaf385d30e87e7eb9fd4a0e61d (diff) | |
Fixed build
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/userspace/main.c | 1 |
2 files changed, 2 insertions, 3 deletions
@@ -18,7 +18,7 @@ build: clean nasm -f elf ./src/kernel/boot.asm -o ./build/boot.o || exit; \ # Make all C files - find ./src/kernel/ -name \*.c >./build/tmp; \ + find ./src/kernel/ ./src/userspace/ -name \*.c >./build/tmp; \ while read -r line; do \ stripped=$$(echo "$${line}" | sed -r 's/\//_/g'); \ stripped=$${stripped#??????}; \ @@ -78,7 +78,7 @@ debug: @rm -f qemu.log @echo "Starting simulation" @echo "[SERIAL OUTPUT]" - @qemu-system-x86_64 -no-reboot -soundhw pcspk -M accel=kvm:tcg -vga std -serial stdio -d cpu_reset -D qemu.log -m 512M -cdrom ./build/melvix.iso + @qemu-system-x86_64 -no-reboot -soundhw pcspk -M accel=kvm:tcg -vga std -serial stdio -rtc base=localtime -d cpu_reset -D qemu.log -m 512M -cdrom ./build/melvix.iso @echo "[END OF CONNECTION]" .PHONY: build clean cross test debug
\ No newline at end of file diff --git a/src/userspace/main.c b/src/userspace/main.c index d332d8e..526144e 100644 --- a/src/userspace/main.c +++ b/src/userspace/main.c @@ -1,6 +1,5 @@ #include <kernel/syscall/syscall.h> void test_user() { - asm volatile ("hlt"); syscall_serial_write("Hello, user world!\n"); }
\ No newline at end of file |