summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2017-12-02 00:01:55 -0500
committerJoseph Hunkeler <jhunkeler@gmail.com>2017-12-02 00:01:55 -0500
commit34c75618cec0e656be01821e548a95feeebae096 (patch)
tree84659cbbb04eca140fb19612c6fde02aba408bd5
parentc6973ed39ce045425dc553a94bd33894f795fb20 (diff)
downloadminos-34c75618cec0e656be01821e548a95feeebae096.tar.gz
Use new printf function
-rw-r--r--kernel.asm48
1 files changed, 13 insertions, 35 deletions
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