X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fstart64.asm;h=5027a1e8ba302a27b8401277ccc478919decfa32;hb=bc55dc5d60469521269a41928d3d15809e2c8134;hp=c1f1e58be0e474e6308e5676083555b6e8585d44;hpb=9f407c493c33928e0f19b834699d9694036ca42e;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/start64.asm b/Kernel/arch/x86_64/start64.asm
index c1f1e58b..5027a1e8 100644
--- a/Kernel/arch/x86_64/start64.asm
+++ b/Kernel/arch/x86_64/start64.asm
@@ -2,20 +2,60 @@
 ; Acess2 x86_64 Port
 ;
 [bits 64]
+;KERNEL_BASE	equ	0xFFFF800000000000
+KERNEL_BASE	equ	0xFFFFFFFF80000000
+
+[extern kmain]
+
+[extern gMultibootPtr]
+[extern gMultibootMagic]
 
 [section .text]
 [global start64]
 start64:
+	; Load Registers
+	mov ax, 0x10
+	mov ds, ax
+	mov es, ax
+	mov fs, ax
+	mov gs, ax
+	
+	; Go to high memory
+	mov rax, start64.himem
+	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
+	mov ecx, 80*25*2/8
+	rep stosq
+	
 	; Set kernel stack
+	mov rsp, 0xFFFFA00000000000 + 0x10000
+	
 	; Call main
-	jmp $
+	mov edi, [gMultibootMagic - KERNEL_BASE]
+	mov esi, [gMultibootPtr - KERNEL_BASE]
+	call kmain
+	
+	cli
+.hlt:
+	hlt
+	jmp .hlt
 
-[global GetRIP]
-GetRIP:
-	mov rax, [rsp]
+[global GetCPUNum]
+GetCPUNum:
+	xor rax, rax
+	str ax
+	sub ax, 0x38	; TSS Base
+	shr ax, 4	; One 16-byte TSS per CPU
 	ret
 
-KSTACK_USERSTATE_SIZE	equ	(4+8+1+5)*4	; SRegs, GPRegs, CPU, IRET
+KSTACK_USERSTATE_SIZE	equ	(16+1+5)*8	; GPRegs, CPU, IRET
 [global Proc_ReturnToUser]
 [extern Proc_GetCurThread]
 Proc_ReturnToUser:
@@ -38,7 +78,8 @@ Proc_ReturnToUser:
 	mov rcx, [rax+KSTACK_USERSTATE_SIZE-3*8]
 	mov rdx, [rbx+60]	; Get Signal Number
 	mov [rcx-8], rdx
-	mov QWORD [rcx-16], User_Syscall_RetAndExit
+	mov rax, User_Syscall_RetAndExit
+	mov [rcx-16], rax
 	sub rcx, 16
 	
 	; Restore Segment Registers
@@ -54,6 +95,63 @@ Proc_ReturnToUser:
 	
 	iret
 
+; int CallWithArgArray(void *Ptr, int NArgs, Uint *Args)
+; Call a function passing the array as arguments
+[global CallWithArgArray]
+CallWithArgArray:
+	push rbp
+	mov rbp, rsp
+	push r10
+	push r11
+	
+	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
+
 [section .usertext]
 User_Syscall_RetAndExit:
 	mov rdi, rax
@@ -63,8 +161,3 @@ User_Syscall_Exit:
 	; RDI: Return Value
 	int 0xAC
 
-[section .bss]
-[global gInitialKernelStack]
-	resd	1024*1	; 1 Page
-gInitialKernelStack:
-