X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Farch%2Fx86_64%2Fstart64.asm;h=04bac26918e35e35576286b5a622b1dcca5a91ce;hb=423a80d361af804155c2918a477850a49ce41869;hp=699c79319398a45b7c3e0b0f1df0bb3bd9076e43;hpb=f186a44f826d17786b464b2fcdc7b88b3c55876a;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/start64.asm b/Kernel/arch/x86_64/start64.asm
index 699c7931..04bac269 100644
--- a/Kernel/arch/x86_64/start64.asm
+++ b/Kernel/arch/x86_64/start64.asm
@@ -2,6 +2,12 @@
 ; Acess2 x86_64 Port
 ;
 [bits 64]
+KERNEL_BASE	equ	0xFFFF800000000000
+
+[extern kmain]
+
+[extern gMultibootPtr]
+[extern gMultibootMagic]
 
 [section .text]
 [global start64]
@@ -28,6 +34,10 @@ start64:
 	mov rsp, gInitialKernelStack
 	
 	; Call main
+	mov edi, [gMultibootMagic - KERNEL_BASE]
+	mov esi, [gMultibootPtr - KERNEL_BASE]
+	call kmain
+	
 	cli
 .hlt:
 	hlt
@@ -117,6 +127,6 @@ User_Syscall_Exit:
 
 [section .bss]
 [global gInitialKernelStack]
-	resd	1024*1	; 1 Page
+	resd	1024*4	; 4 Pages
 gInitialKernelStack: