diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | bochsrc | 2 | ||||
| -rw-r--r-- | stage1/main.asm | 2 | ||||
| -rw-r--r-- | stage2/main.asm | 2 |
4 files changed, 8 insertions, 8 deletions
@@ -26,8 +26,8 @@ STAGE3 = \ stage3/font.o \ stage3/letters.o -lizzyx.img: stage1.out stage2.out stage3.out - cat stage{1,2,3}.out > lizzyx.img +cuddles.img: stage1.out stage2.out stage3.out + cat stage{1,2,3}.out > cuddles.img stage1.out: stage1/main.asm stage1/print.asm stage2.out stage3.out nasm -f bin stage1/main.asm -o stage1.out \ @@ -51,14 +51,14 @@ stage3/isr.asm: stage3/isr.lua .PHONY: run clean flash disas map -run: lizzyx.img +run: cuddles.img echo c | bochs -q clean: rm -rf stage3/*.o *.out *.img *.map stage3/isr.asm -flash: lizzyx.img - dd if=lizzyx.img of=$(DEV) +flash: cuddles.img + dd if=cuddles.img of=$(DEV) disas: stage3.out objdump -b binary -D -M intel -m i386:x86-64 stage3.out --adjust-vma 0x9000 --disassembler-color=on @@ -1,4 +1,4 @@ -floppya: 1_44=lizzyx.img, status=inserted +floppya: 1_44=cuddles.img, status=inserted boot: a #display_library: x, options="gui_debug" megs: 32 diff --git a/stage1/main.asm b/stage1/main.asm index e25b220..c51fc59 100644 --- a/stage1/main.asm +++ b/stage1/main.asm @@ -36,7 +36,7 @@ boot: ; jump into stage2 jmp KSTART -.msg: db 10, 13, "nyax stage1", 10, 13, "boot drive: 0x", 0 +.msg: db 10, 13, "cuddles stage1", 10, 13, "boot drive: 0x", 0 load_stages: mov ebx, .msg diff --git a/stage2/main.asm b/stage2/main.asm index 2181999..7eec56d 100644 --- a/stage2/main.asm +++ b/stage2/main.asm @@ -26,7 +26,7 @@ setup: jmp 0x0008:long_mode .msg: - db 10, 13, "nyax stage2", 10, 13, 0 + db 10, 13, "cuddles stage2", 10, 13, 0 %include "stage2/vesa.asm" %include "stage2/mmap.asm" |