From f344fc52539e3a5ba4ecfb95d1838b586035f77f Mon Sep 17 00:00:00 2001 From: Jarkko Toivanen Date: Tue, 14 Jan 2025 20:27:40 +0200 Subject: [PATCH] Fonting awayy wheeeeee --- Makefile | 4 +++- src/font.asm | 51 ++++++++++--------------------------------------- src/start32.asm | 4 ++++ 3 files changed, 17 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index 0ecd477..695aa47 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,10 @@ all: start32.bin clean: -@rm *.bin 2> /dev/null || true -start32.bin: src/* +start32.bin: src/* font.bin fasm src/start32.asm start32.bin +font.bin: src/font.asm + fasm src/font.asm font.bin image: start32.bin mount grub-cfg roska.img mnt/roska/ cp start32.bin mnt/roska/ sync diff --git a/src/font.asm b/src/font.asm index e8136a4..3df2563 100644 --- a/src/font.asm +++ b/src/font.asm @@ -1,24 +1,16 @@ -;;; Resolution: 8x16 -kfontbasicascii: + format binary +;;; Resolution: 8x8 ;; 0 NULL db 11001100b - db 11001100b - db 00110011b db 00110011b db 11001100b - db 11001100b - db 00110011b db 00110011b db 11001100b - db 11001100b - db 00110011b db 00110011b db 11001100b - db 11001100b - db 00110011b db 00110011b ;; 1-31 control characters - rb 30*16 + rb 30*8 ;; 32 Space db 00000000b db 00000000b @@ -28,43 +20,19 @@ kfontbasicascii: db 00000000b db 00000000b db 00000000b - db 00000000b - db 00000000b - db 00000000b - db 00000000b - db 00000000b - db 00000000b - db 00000000b - db 00000000b ;; 33 ! db 00000000b - db 00000000b - db 00000000b - db 00011000b - db 00011000b - db 00011000b - db 00011000b db 00011000b db 00011000b db 00011000b db 00011000b db 00000000b - db 00000000b db 00011000b db 00011000b - db 00000000b ;; 34 " db 00000000b db 01100110b db 01100110b - db 01100110b - db 01100110b - db 00000000b - db 00000000b - db 00000000b - db 00000000b - db 00000000b - db 00000000b db 00000000b db 00000000b db 00000000b @@ -73,17 +41,18 @@ kfontbasicascii: ;; 35 # db 00000000b db 00000000b - db 00000000b - db 01100110b db 01100110b db 11111111b - db 11111111b - db 01100110b db 01100110b db 11111111b - db 11111111b - db 01100110b db 01100110b db 00000000b + ;; 36 $ db 00000000b + db 00001000b + db 01111110b + db 01010000b + db 01111110b + db 00010010b + db 01111110b db 00000000b diff --git a/src/start32.asm b/src/start32.asm index a196470..e36b4f7 100644 --- a/src/start32.asm +++ b/src/start32.asm @@ -36,6 +36,10 @@ include "src/itoa.asm" include "src/framebuffer.asm" include "src/roskalogoraw.asm" +align 4096 +font FILE "font.bin" +align 4096 + start: ; Setup stack mov ebp, stack_top