X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fstart64.asm;h=5027a1e8ba302a27b8401277ccc478919decfa32;hb=58c7107eb0a5ae254c135f2eaa6263751f1ebe67;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..5027a1e8 100644
--- a/Kernel/arch/x86_64/start64.asm
+++ b/Kernel/arch/x86_64/start64.asm
@@ -2,6 +2,13 @@
 ; Acess2 x86_64 Port
 ;
 [bits 64]
+;KERNEL_BASE	equ	0xFFFF800000000000
+KERNEL_BASE	equ	0xFFFFFFFF80000000
+
+[extern kmain]
+
+[extern gMultibootPtr]
+[extern gMultibootMagic]
 
 [section .text]
 [global start64]
@@ -18,6 +25,9 @@ start64:
 	jmp rax
 .himem:
 	
+	xor rax, rax
+	mov dr0, rax	; Set CPU0
+	
 	; Clear the screen
 	mov rax, 0x1F201F201F201F20	; Set the screen to White on blue, space (4 characters)
 	mov edi, 0xB8000
@@ -25,25 +35,24 @@ start64:
 	rep stosq
 	
 	; Set kernel stack
-	mov rsp, gInitialKernelStack
+	mov rsp, 0xFFFFA00000000000 + 0x10000
 	
 	; Call main
+	mov edi, [gMultibootMagic - KERNEL_BASE]
+	mov esi, [gMultibootPtr - KERNEL_BASE]
+	call kmain
+	
 	cli
 .hlt:
 	hlt
 	jmp .hlt
 
-[global GetRIP]
-GetRIP:
-	mov rax, [rsp]
-	ret
-
 [global GetCPUNum]
 GetCPUNum:
-	str ax
-	mov gs, ax
 	xor rax, rax
-	mov al, [gs:104]	; End of TSS
+	str ax
+	sub ax, 0x38	; TSS Base
+	shr ax, 4	; One 16-byte TSS per CPU
 	ret
 
 KSTACK_USERSTATE_SIZE	equ	(16+1+5)*8	; GPRegs, CPU, IRET
@@ -92,16 +101,53 @@ Proc_ReturnToUser:
 CallWithArgArray:
 	push rbp
 	mov rbp, rsp
-	mov rcx, [rbp+3*8]	; Get NArgs
-	mov rdx, [rbp+4*8]
-
-.top:
-	mov rax, [rdx+rcx*8-8]
-	push rax
-	loop .top
+	push r10
+	push r11
 	
-	mov rax, [rbp+2*8]
+	mov [rbp+2*8], rdi	; Save Ptr to stack
+	
+	mov r11, rsi	; NArgs
+	mov r10, rdx	; Args
+
+	; Arg 1: RDI
+	mov rdi, [r10]
+	add r10, 8
+	dec r11
+	jz .call
+	; Arg 2: RSI
+	mov rsi, [r10]
+	add r10, 8
+	dec r11
+	jz .call
+	; Arg 3: RDX
+	mov rdx, [r10]
+	add r10, 8
+	dec r11
+	jz .call
+	; Arg 4: RCX
+	mov rcx, [r10]
+	add r10, 8
+	dec r11
+	jz .call
+	; Arg 5: R8
+	mov r8, [r10]
+	add r10, 8
+	dec r11
+	jz .call
+	; Arg 6: R9
+	mov r9, [r10]
+	add r10, 8
+	dec r11
+	jz .call
+	; No support for more
+
+.call:
+	mov rax, [rbp+2*8]	; Ptr
 	call rax
+	
+	pop r11
+	pop r10
+	
 	lea rsp, [rbp]
 	pop rbp
 	ret
@@ -115,8 +161,3 @@ User_Syscall_Exit:
 	; RDI: Return Value
 	int 0xAC
 
-[section .bss]
-[global gInitialKernelStack]
-	resd	1024*1	; 1 Page
-gInitialKernelStack:
-