X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fstart.asm;h=8b3e18c51d63d8391ad0a8402dd7ee3626a45ccc;hb=e29b02ca55d580b2f7f10d1093c3d6ad1bc59458;hp=41351600054e84eb198b94487dd4b781b14570de;hpb=6749674b892a0865abc22f9a6ec9a624ff40a283;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/start.asm b/Kernel/arch/x86/start.asm
index 41351600..8b3e18c5 100644
--- a/Kernel/arch/x86/start.asm
+++ b/Kernel/arch/x86/start.asm
@@ -5,21 +5,55 @@
 
 KERNEL_BASE	equ 0xC0000000
 
+[extern __load_addr]
+[extern __bss_start]
+[extern gKernelEnd]
 [section .multiboot]
 mboot:
-    ; Multiboot macros to make a few lines later more readable
-    MULTIBOOT_PAGE_ALIGN	equ 1<<0
-    MULTIBOOT_MEMORY_INFO	equ 1<<1
-    MULTIBOOT_HEADER_MAGIC	equ 0x1BADB002
-    MULTIBOOT_HEADER_FLAGS	equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO
-    MULTIBOOT_CHECKSUM	equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
+	; Multiboot macros to make a few lines later more readable
+	MULTIBOOT_PAGE_ALIGN	equ 1<<0
+	MULTIBOOT_MEMORY_INFO	equ 1<<1
+	MULTIBOOT_HEADER_MAGIC	equ 0x1BADB002
+	MULTIBOOT_HEADER_FLAGS	equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO
+	MULTIBOOT_CHECKSUM	equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
 	
-    ; This is the GRUB Multiboot header. A boot signature
-    dd MULTIBOOT_HEADER_MAGIC
-    dd MULTIBOOT_HEADER_FLAGS
-    dd MULTIBOOT_CHECKSUM
+	; This is the GRUB Multiboot header. A boot signature
+	dd MULTIBOOT_HEADER_MAGIC
+	dd MULTIBOOT_HEADER_FLAGS
+	dd MULTIBOOT_CHECKSUM
 	dd mboot - KERNEL_BASE	;Location of Multiboot Header
 	
+; Multiboot 2 Header
+mboot2:
+	MULTIBOOT2_HEADER_MAGIC	equ 0xE85250D6
+	MULTIBOOT2_HEADER_ARCH	equ 0
+	MULTIBOOT2_HEADER_LENGTH	equ (mboot2_end-mboot2)
+	MULTIBOOT2_CHECKSUM	equ -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_HEADER_ARCH + MULTIBOOT2_HEADER_LENGTH)
+	
+	dd MULTIBOOT2_HEADER_MAGIC
+	dd MULTIBOOT2_HEADER_ARCH
+	dd MULTIBOOT2_HEADER_LENGTH
+	dd MULTIBOOT2_CHECKSUM
+	; MBoot2 Address Header
+	dw	2, 0
+	dd	8 + 16
+	dd	mboot2	; Location of Multiboot Header
+	dd	__load_addr - KERNEL_BASE	; Kernel Load base
+	dd	__bss_start - KERNEL_BASE	; Kernel Data End
+	dd	gKernelEnd - KERNEL_BASE	; Kernel BSS End
+	; MBoot2 Entry Point Tag
+	dw	3, 0
+	dd	8 + 4
+	dd	start - KERNEL_BASE
+	; MBoot2 Module Alignment Tag
+	dw	6, 0
+	dd	12	; ???
+	dd	0	; Search me, seems it wants padding
+	; Terminator
+	dw	0, 0
+	dd	8
+mboot2_end:
+	
 [section .text]
 [extern kmain]
 [global start]
@@ -39,8 +73,6 @@ start:
 	jmp ecx
 .higherHalf:
 
-	mov DWORD [gaInitPageDir], 0
-
 	; Call the kernel
 	push ebx	; Multiboot Info
 	push eax	; Multiboot Magic Value
@@ -52,34 +84,88 @@ start:
 	hlt
 	jmp .hlt
 
+; 
+; Multiprocessing AP Startup Code (Must be within 0x10FFF0)
+;
+%if USE_MP
+[extern gGDT]
+[extern gGDTPtr]
+[extern gIDTPtr]
+[extern gpMP_LocalAPIC]
+[extern gaAPIC_to_CPU]
+[extern gaCPUs]
+[extern giNumInitingCPUs]
+lGDTPtr:	; Local GDT Pointer
+	dw	2*8-1
+	dd	gGDT-KERNEL_BASE
+
+[bits 16]
+[global APStartup]
+APStartup:
+	xchg bx, bx	; MAGIC BREAK!
+	mov ax, 0xFFFF
+	mov ds, ax
+	lgdt [DWORD ds:lGDTPtr-KERNEL_BASE-0xFFFF0]
+	mov eax, cr0
+	or	al, 1
+	mov	cr0, eax
+	jmp 08h:DWORD .ProtectedMode-KERNEL_BASE
+[bits 32]
+.ProtectedMode:
+	; Start Paging
+	mov eax, gaInitPageDir - KERNEL_BASE
+	mov cr3, eax
+	mov eax, cr0
+	or	eax, 0x80010000	; PG and WP
+	mov cr0, eax
+	; Jump to higher half
+	lea eax, [.higherHalf]
+	jmp eax
+.higherHalf:
+	; Load True GDT & IDT
+	lgdt [gGDTPtr]
+	lidt [gIDTPtr]
+
+	mov eax, [gpMP_LocalAPIC]
+	mov DWORD [eax], 0
+	xor ecx, ecx
+	mov cl, BYTE [eax+0x10]
+	; CL is now local APIC ID
+	mov cl, BYTE [gaAPIC_to_CPU+ecx]
+	; CL is now the CPU ID
+	mov BYTE [gaCPUs+ecx*8+1], 1
+	; Decrement the remaining CPU count
+	dec DWORD [giNumInitingCPUs]
+	; CPU is now marked as initialised
+	sti
+.hlt:
+	hlt
+	jmp .hlt
+%endif
+
 [global GetEIP]
 GetEIP:
 	mov eax, [esp]
 	ret
 
-[extern Proc_Clone]
-[extern Threads_Exit]
-[global SpawnTask]
-SpawnTask:
-	; Call Proc_Clone with Flags=0
-	xor eax, eax
-	push eax
+; int CallWithArgArray(void *Ptr, int NArgs, Uint *Args)
+; Call a function passing the array as arguments
+[global CallWithArgArray]
+CallWithArgArray:
+	push ebp
+	mov ebp, esp
+	mov ecx, [ebp+12]	; Get NArgs
+	mov edx, [ebp+16]
+
+.top:
+	mov eax, [edx+ecx*4-4]
 	push eax
-	call Proc_Clone
-	add esp, 8	; Remove arguments from stack
-	
-	test eax, eax
-	jnz .parent
-	
-	; In child, so now set up stack frame
-	mov ebx, [esp+4]	; Child Function
-	mov edx, [esp+8]	; Argument
-	; Child
-	push edx	; Argument
-	call ebx	; Function
-	call Threads_Exit	; Kill Thread
+	loop .top
 	
-.parent:
+	mov eax, [ebp+8]
+	call eax
+	lea esp, [ebp]
+	pop ebp
 	ret
 
 [section .initpd]