X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fstart.asm;h=0988a7733f36958ee24834f64f0487a6d9973a39;hb=3662ceff5d51ba5a3c31796da73f8f5568f68209;hp=6b6a6116b017a015765e27d02a25b5e4f2783e21;hpb=b7d27cb988daadd457370e7e1a19aaec342e8415;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/start.asm b/Kernel/arch/x86/start.asm
index 6b6a6116..0988a773 100644
--- a/Kernel/arch/x86/start.asm
+++ b/Kernel/arch/x86/start.asm
@@ -4,6 +4,7 @@
 [bits 32]
 
 KERNEL_BASE	equ 0xC0000000
+%define MAX_CPUS	16
 
 [extern __load_addr]
 [extern __bss_start]
@@ -93,17 +94,26 @@ start:
 [extern gGDTPtr]
 [extern gIDTPtr]
 [extern gpMP_LocalAPIC]
+[extern giMP_TimerCount]
 [extern gaAPIC_to_CPU]
 [extern gaCPUs]
 [extern giNumInitingCPUs]
+[extern MM_NewKStack]
+
 lGDTPtr:	; Local GDT Pointer
-	dw	2*8-1
+	dw	3*8-1
 	dd	gGDT-KERNEL_BASE
 
 [bits 16]
+[global APWait]
+APWait:
+	;xchg bx, bx
+.hlt:
+	;hlt
+	jmp .hlt
 [global APStartup]
 APStartup:
-	xchg bx, bx	; MAGIC BREAK!
+	;xchg bx, bx	; MAGIC BREAK!
 	mov ax, 0xFFFF
 	mov ds, ax
 	lgdt [DWORD ds:lGDTPtr-KERNEL_BASE-0xFFFF0]
@@ -113,6 +123,13 @@ APStartup:
 	jmp 08h:DWORD .ProtectedMode-KERNEL_BASE
 [bits 32]
 .ProtectedMode:
+	; Load segment registers
+	mov ax, 0x10
+	mov ss, ax
+	mov ds, ax
+	mov es, ax
+	mov fs, ax
+	mov gs, ax
 	; Start Paging
 	mov eax, gaInitPageDir - KERNEL_BASE
 	mov cr3, eax
@@ -127,18 +144,48 @@ APStartup:
 	lgdt [gGDTPtr]
 	lidt [gIDTPtr]
 
-	mov eax, [gpMP_LocalAPIC]
-	mov DWORD [eax], 0
-	xor ecx, ecx
-	mov cl, BYTE [eax+0x10]
+	mov ebp, [gpMP_LocalAPIC]
+	mov ebx, [ebp+0x20]	; Read ID
+	shr ebx, 24
+	;xchg bx, bx	; MAGIC BREAK
 	; 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
+	mov cl, BYTE [gaAPIC_to_CPU+ebx]
+	xor ebx, ebx
+	mov bl, cl
+	; BL is now the CPU ID
+	mov BYTE [gaCPUs+ebx*8+1], 1
 	; Decrement the remaining CPU count
 	dec DWORD [giNumInitingCPUs]
+	
+	; Create a stack
+	lea edx, [ebx+1]
+	shl edx, 5+2	; *32 *4
+	lea esp, [gInitAPStacks+edx]
+	call MM_NewKStack
+	mov esp, eax
+	
+	; Set TSS
+	lea ecx, [ebx*8+0x30]
+	ltr cx
+	; Save the CPU number to a debug register
+	mov dr1, ebx
+	
+	;xchg bx, bx	; MAGIC_BREAK
+	; Enable Local APIC
+	mov DWORD [ebp+0x0F0], 0x000001EF	; Spurious Interrupt Vector (0xEF)
+	mov ecx, DWORD [giMP_TimerCount]
+	mov DWORD [ebp+0x380], ecx	; Set Initial Count
+	mov DWORD [ebp+0x320], 0x000200EE	; Enable timer on IVT#0xEE
+	mov DWORD [ebp+0x330], 0x000100E0	; ##Enable thermal sensor on IVT#0xE0
+	mov DWORD [ebp+0x340], 0x000100D0	; ##Enable performance counters on IVT#0xD0
+	mov DWORD [ebp+0x350], 0x000100D1	; ##Enable LINT0 on IVT#0xD1
+	mov DWORD [ebp+0x360], 0x000100D2	; ##Enable LINT1 on IVT#0xD2
+	mov DWORD [ebp+0x370], 0x000100E1	; ##Enable Error on IVT#0xE1
+	mov DWORD [ebp+0x0B0], 0	; Send an EOI (just in case)
+	
 	; CPU is now marked as initialised
 	sti
+	;xchg bx, bx	; MAGIC BREAK
 .hlt:
 	hlt
 	jmp .hlt
@@ -189,4 +236,6 @@ gaInitPageTable:
 ALIGN 0x1000
 	times 1024	dd	0
 Kernel_Stack_Top:
+gInitAPStacks:
+	times 32*MAX_CPUS	dd	0