Cleanup (debug statements removed)

[tpg/acess2.git] / Kernel / arch / x86 / start.asm

diff --git a/Kernel/arch/x86/start.asm b/Kernel/arch/x86/start.asm
index 74b5c71..737ff2e 100644 (file)
--- 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]
@@ -21,7 +22,7 @@ mboot:
        dd MULTIBOOT_HEADER_MAGIC
        dd MULTIBOOT_HEADER_FLAGS
        dd MULTIBOOT_CHECKSUM
-       dd mboot - KERNEL_BASE  ;Location of Multiboot Header
+       dd mboot; - KERNEL_BASE ;Location of Multiboot Header
        
 ; Multiboot 2 Header
 ;mboot2:
@@ -97,6 +98,8 @@ start:
 [extern gaAPIC_to_CPU]
 [extern gaCPUs]
 [extern giNumInitingCPUs]
+[extern MM_NewKStack]
+
 lGDTPtr:       ; Local GDT Pointer
        dw      3*8-1
        dd      gGDT-KERNEL_BASE
@@ -115,8 +118,8 @@ APStartup:
        mov ds, ax
        lgdt [DWORD ds:lGDTPtr-KERNEL_BASE-0xFFFF0]
        mov eax, cr0
-       or      al, 1
-       mov     cr0, eax
+       or al, 1
+       mov cr0, eax
        jmp 08h:DWORD .ProtectedMode-KERNEL_BASE
 [bits 32]
 .ProtectedMode:
@@ -131,7 +134,7 @@ APStartup:
        mov eax, gaInitPageDir - KERNEL_BASE
        mov cr3, eax
        mov eax, cr0
-       or      eax, 0x80010000 ; PG and WP
+       or eax, 0x80010000      ; PG and WP
        mov cr0, eax
        ; Jump to higher half
        lea eax, [.higherHalf]
@@ -141,24 +144,44 @@ APStartup:
        lgdt [gGDTPtr]
        lidt [gIDTPtr]
 
-       mov eax, [gpMP_LocalAPIC]
-       mov ecx, [eax+0x20]     ; Read ID
-       shr ecx, 24
+       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
-       shl cx, 3
-       add cx, 0x30
+       lea ecx, [ebx*8+0x30]
        ltr cx
-       ; Enable Local APIC Timer
-       mov ecx, [giMP_TimerCount]
-       mov [eax+0x380], ecx    ; Set Initial Count
-       mov DWORD [eax+0x320], 0x000200EF       ; Enable the timer on IVT#0xEF
+       ; 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
@@ -198,10 +221,12 @@ CallWithArgArray:
 [global gaInitPageTable]
 align 0x1000
 gaInitPageDir:
-       dd      gaInitPageTable-KERNEL_BASE+3   ; 0x00
-       times 1024-256-1        dd      0
-       dd      gaInitPageTable-KERNEL_BASE+3   ; 0xC0
-       times 256-1     dd      0
+       dd      gaInitPageTable-KERNEL_BASE+3   ; 0x000 - Low kernel
+       times 0x300-1   dd      0
+       dd      gaInitPageTable-KERNEL_BASE+3   ; 0xC00 - High kernel
+       times 0x3F0-0x300-1     dd      0
+       dd      gaInitPageDir-KERNEL_BASE+3     ; 0xFC0 - Fractal
+       times 0x400-0x3F0-1     dd      0
 align 0x1000
 gaInitPageTable:
        %assign i 0
@@ -213,4 +238,6 @@ gaInitPageTable:
 ALIGN 0x1000
        times 1024      dd      0
 Kernel_Stack_Top:
+gInitAPStacks:
+       times 32*MAX_CPUS       dd      0