From 90c70043be70a557ae55807b7a907133df0b5f02 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 27 Jan 2024 03:37:48 -0500 Subject: [PATCH] Ununfixed kmain, fixed boot.S --- src/arch/amd64/boot.S | 2 +- src/kmain.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/arch/amd64/boot.S b/src/arch/amd64/boot.S index 9771fe2..36e4bc6 100644 --- a/src/arch/amd64/boot.S +++ b/src/arch/amd64/boot.S @@ -116,7 +116,7 @@ start: bits 64 code64: call amd64_shim - push rax + mov rdi, rax call kmain cli halt: diff --git a/src/kmain.c b/src/kmain.c index b9ceb77..381ceb9 100644 --- a/src/kmain.c +++ b/src/kmain.c @@ -1,7 +1,9 @@ -void kmain() { +#include +#include +void kmain(void *info) { + char buf[20]; *(char*)0xB8000 = 'c'; *(char*)(0xB8002 + 0x20'0000) = 'd'; - while(1) { - __asm("cli; hlt"); - } + itoa((long)info, buf, 10); + serial_out_str(buf); }