diff --git a/Makefile b/Makefile index 65ca75c..9d78ab9 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,9 @@ DISK.APM: kernel.elf bootinfo.txt scripts/kpartx.sh sudo cp kernel.elf /mnt/boot sudo umount /mnt/ sudo kpartx -d DISK.APM -bootinfo.txt: loader/load.fth +bootinfo.txt: loader/*.fth echo "" >> bootinfo.txt + cat loader/def.fth >> bootinfo.txt cat loader/load.fth >> bootinfo.txt echo "" >> bootinfo.txt kernel.elf: start.elf boot.elf diff --git a/loader/def.fth b/loader/def.fth new file mode 100644 index 0000000..97117f8 --- /dev/null +++ b/loader/def.fth @@ -0,0 +1,14 @@ +: msg ." powerpc-ofw-boot : Booting through OpenFirmware..." cr ; +: sup - dup abs = ; +: inf dup sup 1 + ; +: diff = if 0 else -1 then ; +: fba frame-buffer-adr ; +: beige-vram 80000000 ; : mac99-vram 81000000 ; +: hardware-error ." Hardware not supported." cr ; +: beige-message ." Beige hardware detected" cr ; +: mac99-message ." mac99 hardware detected" cr ; +: beige-magic-number 0BE ; +: mac99-magic-number 05A ; +: magic-number-offset 0 ; +: width-offset 4 ; +: height-offset 8 ; diff --git a/loader/load.fth b/loader/load.fth index bb1b5bf..f469ec2 100644 --- a/loader/load.fth +++ b/loader/load.fth @@ -1,19 +1,4 @@ -." powerpc-ofw-boot : Booting through OpenFirmware..." cr -\ storing 0xBE for beige, 0x5A for mac99 -\ cannot use superior, inferior, different symbols (bootinfo.txt) -: sup - dup abs = ; -: inf dup sup 1 + ; -: diff = if 0 else -1 then ; -: fba frame-buffer-adr ; -: beige-vram 80000000 ; : mac99-vram 81000000 ; -: hardware-error ." Hardware not supported." cr ; -: beige-message ." Beige hardware detected" cr ; -: mac99-message ." mac99 hardware detected" cr ; -: beige-magic-number 0BE ; -: mac99-magic-number 05A ; -: magic-number-offset 0 ; -: width-offset 4 ; -: height-offset 8 ; +msg fba beige-vram = if beige-message beige-magic-number beige-vram c! then fba mac99-vram = if mac99-message mac99-magic-number mac99-vram c! then fba beige-vram = if screen-width 4 beige-vram + l! then