From f836157c902e5b4d2289caa8f271c6549b03d2ff Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 12 Mar 2019 18:24:27 +0100 Subject: [PATCH] stuff --- boot/loader/loader.asm | 4 ++-- kaleid/kernel/init/init.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/boot/loader/loader.asm b/boot/loader/loader.asm index fffa136..1a12b81 100644 --- a/boot/loader/loader.asm +++ b/boot/loader/loader.asm @@ -162,8 +162,8 @@ _loader64: extern StartKern - push qword 12 - push qword 12 + mov rsi, [mbInfo] + mov rdi, [mbMagic] call StartKern ;; We must never reach this point ------------------------------------------- ;; diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index 1d56806..39ad1ed 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -33,9 +33,6 @@ extern void testf(void); // noreturn void StartKern(void *mbInfo, int mbMagic) { - (void)mbInfo; - (void)mbMagic; - // We're not ready to deal with interrupts DisableIRQs(); @@ -43,6 +40,6 @@ noreturn void StartKern(void *mbInfo, int mbMagic) InitTerms(); // We're out - StartPanic("We had\n *mbInfo : %x\n mbMagic : %x\n\nGoodbye World :(", mbInfo, mbMagic); + StartPanic("We had\n *mbInfo : %p\n mbMagic : %x\n\nGoodbye World :(", mbInfo, mbMagic); }