Bit of debug cleanup, fixing bugs found on GrUB2

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

diff --git a/Kernel/arch/x86/desctab.asm b/Kernel/arch/x86/desctab.asm
index a66bfa3..615d6a2 100644 (file)
--- a/Kernel/arch/x86/desctab.asm
+++ b/Kernel/arch/x86/desctab.asm
@@ -3,17 +3,17 @@
 ; desctab.asm
 [BITS 32]
 
-%if ARCH == "i386"
-MAX_CPUS       equ     1
-%else
+%if USE_MP
 MAX_CPUS       equ     8
+%else
+MAX_CPUS       equ     1
 %endif
-GDT_SIZE       equ     (1+2*2+MAX_CPUS)*8      ; 4 Permission levels
+GDT_SIZE       equ     (1+2*2+1+MAX_CPUS)*8
 
 [section .data]
 ; GDT
-[global _gGDT]
-_gGDT:
+[global gGDT]
+gGDT:
        ; PL0 - Kernel
        ; PL3 - User
        dd 0x00000000, 0x00000000       ; 00 NULL Entry
@@ -21,23 +21,28 @@ _gGDT:
        dd 0x0000FFFF, 0x00CF9200       ; 10 PL0 Data
        dd 0x0000FFFF, 0x00CFFA00       ; 18 PL3 Code
        dd 0x0000FFFF, 0x00CFF200       ; 20 PL3 Data
-       times MAX_CPUS  dd 0, 0
-_gGDTptr:
+       dd 26*4-1, 0x00408900   ; 28 Double Fault TSS
+       times MAX_CPUS  dd 26*4-1, 0x00408900   ; 30+ TSSes
+[global gGDTPtr]
+gGDTPtr:
        dw      GDT_SIZE-1
-       dd      _gGDT
+       dd      gGDT
 ; IDT
 ALIGN 8
-_gIDT:
+[global gIDT]
+gIDT:
        times   256     dd      0x00080000,0x00000F00
-_gIDTPtr:
+[global gIDTPtr]
+gIDTPtr:
        dw      256 * 16 - 1    ; Limit
-       dd      _gIDT           ; Base
+       dd      gIDT            ; Base
 
 [section .text]
-[global _Desctab_Install]
-_Desctab_Install:
+
+[global Desctab_Install]
+Desctab_Install:
        ; Set GDT
-       lgdt [_gGDTptr]
+       lgdt [gGDTPtr]
        mov ax, 0x10    ; PL0 Data
        mov ss, ax
        mov ds, ax
@@ -49,18 +54,19 @@ _Desctab_Install:
 
        ; Set IDT
 %macro SETISR  1
-       mov eax, _Isr%1
-       mov     WORD [_gIDT + %1*8], ax
+       mov eax, Isr%1
+       mov     WORD [gIDT + %1*8], ax
        shr eax, 16
-       mov     WORD [_gIDT + %1*8+6], ax
-       mov     ax, WORD [_gIDT + %1*8 + 4]
+       mov     WORD [gIDT + %1*8+6], ax
+       ; Enable
+       mov     ax, WORD [gIDT + %1*8 + 4]
        or ax, 0x8000
-       mov     WORD [_gIDT + %1*8 + 4], ax
+       mov     WORD [gIDT + %1*8 + 4], ax
 %endmacro
 %macro SETUSER 1
-       mov     ax, WORD [_gIDT + %1*8 + 4]
+       mov     ax, WORD [gIDT + %1*8 + 4]
        or ax, 0x6000
-       mov     WORD [_gIDT + %1*8 + 4], ax
+       mov     WORD [gIDT + %1*8 + 4], ax
 %endmacro
        %assign i       0
        %rep 32
@@ -71,6 +77,11 @@ _Desctab_Install:
        SETISR  0xAC
        SETUSER 0xAC
        
+       %if USE_MP
+       SETISR  0xEE    ; 0xEE Timer
+       SETISR  0xEF    ; 0xEF Spurious Interrupt
+       %endif
+       
        %assign i       0xF0
        %rep 16
        SETISR  i
@@ -78,7 +89,7 @@ _Desctab_Install:
        %endrep
 
        ; Load IDT
-       lidt [_gIDTPtr]
+       lidt [gIDTPtr]
 
        ; Remap PIC
        push edx        ; Save EDX
@@ -116,32 +127,32 @@ _Desctab_Install:
 ; = Define ISRs =
 ; ===============
 %macro ISR_ERRNO       1
-[global _Isr%1]
-_Isr%1:
+[global Isr%1]
+Isr%1:
        ;xchg bx, bx
        push    %1
        jmp     ErrorCommon
 %endmacro
 %macro ISR_NOERR       1
-[global _Isr%1]
-_Isr%1:
-       xchg bx, bx
+[global Isr%1]
+Isr%1:
+       ;xchg bx, bx
        push    0
        push    %1
        jmp     ErrorCommon
 %endmacro
 
 %macro DEF_SYSCALL     1
-[global _Isr%1]
-_Isr%1:
+[global Isr%1]
+Isr%1:
        push    0
        push    %1
        jmp     SyscallCommon
 %endmacro
 
 %macro DEF_IRQ 1
-[global _Isr%1]
-_Isr%1:
+[global Isr%1]
+Isr%1:
        push    0
        push    %1
        jmp     IRQCommon
@@ -182,12 +193,36 @@ ISR_NOERR 31; 31: Reserved
 
 DEF_SYSCALL    0xAC    ; Acess System Call
 
+%if USE_MP
+[global Isr0xEE]
+[extern SchedulerBase]
+; AP's Timer Interrupt
+Isr0xEE:
+       push 0
+       xchg bx, bx     ; MAGIC BREAK
+       jmp SchedulerBase
+; Spurious Interrupt
+[global Isr0xEF]
+Isr0xEF:
+       xchg bx, bx     ; MAGIC BREAK
+       iret
+%endif
+
 ; IRQs
 ; - Timer
-[global _Isr240]
-_Isr240:
+[global Isr240]
+[global Isr240.jmp]
+[extern SchedulerBase]
+[extern SetAPICTimerCount]
+Isr240:
        push 0
+       ;xchg bx, bx    ; MAGIC BREAK
+Isr240.jmp:
+       %if USE_MP
+       jmp SetAPICTimerCount   ; This is reset once the bus speed has been calculated
+       %else
        jmp SchedulerBase
+       %endif
 ; - Assignable
 %assign i      0xF1
 %rep 16
@@ -198,16 +233,23 @@ _Isr240:
 ; ---------------------
 ; Common error handling
 ; ---------------------
-[extern _ErrorHandler]
+[extern ErrorHandler]
 ErrorCommon:
+       ;xchg bx, bx    ; MAGIC BREAK
        pusha
        push ds
        push es
        push fs
        push gs
        
+       mov ax, 0x10
+       mov ds, ax
+       mov es, ax
+       mov fs, ax
+       mov gs, ax
+       
        push esp
-       call _ErrorHandler
+       call ErrorHandler
        add esp, 4
        
        pop gs
@@ -221,7 +263,7 @@ ErrorCommon:
 ; --------------------------
 ; Common System Call Handler
 ; --------------------------
-[extern _SyscallHandler]
+[extern SyscallHandler]
 SyscallCommon:
        pusha
        push ds
@@ -230,7 +272,7 @@ SyscallCommon:
        push gs
        
        push esp
-       call _SyscallHandler
+       call SyscallHandler
        add esp, 4
        
        pop gs
@@ -244,7 +286,8 @@ SyscallCommon:
 ; ------------
 ; IRQ Handling
 ; ------------
-[extern _IRQ_Handler]
+[extern IRQ_Handler]
+[global IRQCommon]
 IRQCommon:
        pusha
        push ds
@@ -252,8 +295,14 @@ IRQCommon:
        push fs
        push gs
        
+       mov ax, 0x10
+       mov ds, ax
+       mov es, ax
+       mov fs, ax
+       mov gs, ax
+       
        push esp
-       call _IRQ_Handler
+       call IRQ_Handler
        add esp, 4
        
        pop gs
@@ -263,34 +312,3 @@ IRQCommon:
        popa
        add esp, 8      ; Error Code and ID
        iret
-
-; --------------
-; Task Scheduler
-; --------------
-[extern _Proc_Scheduler]
-SchedulerBase:
-       pusha
-       push ds
-       push es
-       push fs
-       push gs
-       
-       mov eax, [esp+12*4]     ; CPU Number
-       push eax        ; Pus as argument
-       
-       call _Proc_Scheduler
-       
-       add esp, 4      ; Remove Argument
-       
-       pop gs
-       pop fs
-       pop es
-       pop ds
-
-       mov dx, 0x20
-       mov al, 0x20
-       out dx, al              ; ACK IRQ
-       popa
-       add esp, 4      ; CPU ID
-       ; No Error code / int num
-       iret