diff --git a/Makefile b/Makefile index 1bbd423..9801c1f 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ PPC=powerpc-linux-gnu -DISK.APM: kernel.elf bootinfo.txt kpartx.sh +DISK.APM: kernel.elf bootinfo.txt scripts/kpartx.sh dd bs=512K count=2 if=/dev/zero of=DISK.APM parted DISK.APM --script mklabel mac mkpart primary hfs+ 32.8KB 100% - sudo chmod +x kpartx.sh - sudo ./kpartx.sh + sudo chmod +x scripts/kpartx.sh + sudo ./scripts/kpartx.sh sudo mkdir /mnt/ppc sudo mkdir /mnt/boot sudo cp bootinfo.txt /mnt/ppc @@ -23,8 +23,8 @@ start.elf: entry/start.s clean: rm DISK.APM *elf *txt run: - qemu-system-ppc -M mac99 DISK.APM + qemu-system-ppc DISK.APM -g 1024x768x32 debug: - qemu-system-ppc DISK.APM -d in_asm + qemu-system-ppc DISK.APM -d in_asm -g 1024x768x32 all: make clean && make && make run diff --git a/entry/start.s b/entry/start.s index 8e167f6..cf5ad66 100644 --- a/entry/start.s +++ b/entry/start.s @@ -1,3 +1,4 @@ .globl _start _start: -b main +li 1, 0xac +b main diff --git a/loader/load.fth b/loader/load.fth index 7c56e1c..a32c5d5 100644 --- a/loader/load.fth +++ b/loader/load.fth @@ -11,15 +11,10 @@ variable run -1 run ! -fba 100 dump - fba beige-vram = if ." Beige" cr 7000 0 do 0BE i beige-vram + c! loop then fba mac99-vram = if ." mac99" cr 7000 0 do 05A i mac99-vram + c! loop then fba beige-vram diff fba mac99-vram diff and if ." Hardware not supported." cr 0 run ! then -fba 100 dump run @ 0 = if 1 0 do 0 +loop then - - boot hd:,\boot\kernel.elf diff --git a/kpartx.sh b/scripts/kpartx.sh similarity index 100% rename from kpartx.sh rename to scripts/kpartx.sh