From 34c75618cec0e656be01821e548a95feeebae096 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Sat, 2 Dec 2017 00:01:55 -0500 Subject: Use new printf function --- kernel.asm | 48 +++++++++++++----------------------------------- 1 file changed, 13 insertions(+), 35 deletions(-) (limited to 'kernel.asm') diff --git a/kernel.asm b/kernel.asm index 39a8077..46ab984 100644 --- a/kernel.asm +++ b/kernel.asm @@ -34,46 +34,21 @@ kmain: push 0 ; home the cursor call setcursor - push msg_entry_point - call puts - add sp, 2 - - push cs - call printh - - mov al, ':' - call putc - - mov ax, kmain - push ax - call printh - add sp, 4 - - mov al, CR - call putc - - ;--- stack - - push msg_entry_point_stack + push banner call puts add sp, 2 + push sp push ss - call printh - - mov al, ':' - call putc - push sp - call printh - add sp, 4 - - mov al, CR - call putc - - push banner - call puts - add sp, 2 + push ss + push kmain + push cs + push kmain + push cs + push msg_test + call printf + add sp, 12 .mainloop: call kbd_read @@ -111,6 +86,9 @@ banner: db "+========================+", CR db "+========================+", CR db CR, 0 +msg_test: db 'Kernel address: %x:%x (%d:%d)', CR + db 'Stack address : %x:%x (%d:%d)', CR, CR, 0 + ; Error messages error_msg_panic: db "PANIC: ", 0 -- cgit