From f4e9072e6e01c662f2331f6373ea7bc3871764f1 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sat, 9 Mar 2019 22:29:30 +0100 Subject: [PATCH] makefile update --- Makefile | 6 ++++-- boot/loader/loader.asm | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1c96a8d..2662a08 100644 --- a/Makefile +++ b/Makefile @@ -91,13 +91,15 @@ make_disk: @$(MBRDIR)/create_disk.sh $(BINDIR)/disk.img @echo ${CL2}[make_disk]${CL} OK${CL3} -test: kernel loader +kaleid: kernel loader + +test: kaleid @qemu-system-x86_64 -hda build/bin/disk.img -d cpu_reset,guest_errors,pcall,int -enable-kvm 2> qemu.log & @ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 64 > loader_disasm64.asm @ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 32 > loader_disasm32.asm -test32: kernel loader +test32: kaleid @qemu-system-i386 -hda build/bin/disk.img -d cpu_reset,guest_errors,pcall,int -enable-kvm 2> qemu.log & @ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 64 > loader_disasm64.asm @ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 32 > loader_disasm32.asm diff --git a/boot/loader/loader.asm b/boot/loader/loader.asm index 0ddf7b6..ed1b828 100644 --- a/boot/loader/loader.asm +++ b/boot/loader/loader.asm @@ -152,7 +152,7 @@ _loader64: call tritemporize ; Let time to see extern StartKern - jmp StartKern + ;jmp StartKern ;; We must never reach this point ------------------------------------------- ;; jmp Die