; 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+1+MAX_CPUS)*8
dd 0x0000FFFF, 0x00CF9200 ; 10 PL0 Data
dd 0x0000FFFF, 0x00CFFA00 ; 18 PL3 Code
dd 0x0000FFFF, 0x00CFF200 ; 20 PL3 Data
- dd 0, 0 ; Double Fault TSS
- times MAX_CPUS dd 0, 0
-gGDTptr:
+ dd 26*4-1, 0x00408900 ; Double Fault TSS
+ times MAX_CPUS dd 26*4-1, 0x00408900
+[global gGDTPtr]
+gGDTPtr:
dw GDT_SIZE-1
dd gGDT
; IDT
ALIGN 8
+[global gIDT]
gIDT:
times 256 dd 0x00080000,0x00000F00
+[global gIDTPtr]
gIDTPtr:
dw 256 * 16 - 1 ; Limit
dd gIDT ; Base
[section .text]
+
[global Desctab_Install]
Desctab_Install:
; Set GDT
- lgdt [gGDTptr]
+ lgdt [gGDTPtr]
mov ax, 0x10 ; PL0 Data
mov ss, ax
mov ds, ax
%macro DEF_IRQ 1
[global Isr%1]
Isr%1:
- ;cli ; HACK!
push 0
push %1
jmp IRQCommon
; IRQs
; - Timer
[global Isr240]
+[extern SchedulerBase]
Isr240:
push 0
jmp SchedulerBase
; ---------------------
[extern ErrorHandler]
ErrorCommon:
+ ;xchg bx, bx
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
add esp, 4
push fs
push gs
+ mov ax, 0x10
+ mov ds, ax
+ mov es, ax
+ mov fs, ax
+ mov gs, ax
+
push esp
call IRQ_Handler
add esp, 4
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