From 3c3ac567f836b1a6cbc593d55dcfc56007a9b3bd Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Wed, 21 Sep 2022 20:37:01 +0200 Subject: [PATCH] Add bochs support --- .gitignore | 1 + Makefile | 9 ++++++--- bochsrc | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 bochsrc diff --git a/.gitignore b/.gitignore index 6eb3468..89b9a05 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ nothing.img +bx_enh_dbg.ini diff --git a/Makefile b/Makefile index b03459f..b487105 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -default_target: vm -.PHONY: vm clean +default_target: bochs +.PHONY: qemu bochs clean stage1/boot.bin: stage1/boot.asm stage2/target/x86-loadnothing/release/stage2 nasm -DSTAGE2SIZE=$$(du -b stage2/target/x86-loadnothing/release/stage2 | cut -f1) -f bin -o stage1/boot.bin stage1/boot.asm @@ -13,7 +13,10 @@ nothing.img: stage2/target/x86-loadnothing/release/stage2 stage1/boot.bin echo -en "\x55\xAA" | dd of=nothing.img bs=1 seek=510 count=2 conv=notrunc dd if=stage2/target/x86-loadnothing/release/stage2 of=nothing.img bs=512 seek=1 conv=notrunc -vm: nothing.img +bochs: nothing.img + bochs -q + +qemu: nothing.img qemu-system-x86_64 -drive format=raw,file=nothing.img clean: diff --git a/bochsrc b/bochsrc new file mode 100644 index 0000000..03c3fd3 --- /dev/null +++ b/bochsrc @@ -0,0 +1,3 @@ +ata0-master: type=disk, path="nothing.img" +boot: disk +display_library: x, options="gui_debug" -- 2.44.0