; 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
[section .data]
; GDT
-[global _gGDT]
-_gGDT:
+[global gGDT]
+gGDT:
; PL0 - Kernel
; PL3 - User
dd 0x00000000, 0x00000000 ; 00 NULL Entry
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
+ 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
; 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
+ 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
%endrep
; Load IDT
- lidt [_gIDTPtr]
+ lidt [gIDTPtr]
; Remap PIC
push edx ; Save EDX
; = 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:
+[global Isr%1]
+Isr%1:
xchg bx, bx
push 0
push %1
%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:
- ;cli ; HACK!
+[global Isr%1]
+Isr%1:
push 0
push %1
jmp IRQCommon
; IRQs
; - Timer
-[global _Isr240]
-_Isr240:
+[global Isr240]
+Isr240:
push 0
jmp SchedulerBase
; - Assignable
; ---------------------
; Common error handling
; ---------------------
-[extern _ErrorHandler]
+[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
+ call ErrorHandler
add esp, 4
pop gs
; --------------------------
; Common System Call Handler
; --------------------------
-[extern _SyscallHandler]
+[extern SyscallHandler]
SyscallCommon:
pusha
push ds
push gs
push esp
- call _SyscallHandler
+ call SyscallHandler
add esp, 4
pop gs
; ------------
; IRQ Handling
; ------------
-[extern _IRQ_Handler]
+[extern IRQ_Handler]
IRQCommon:
pusha
push ds
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
; --------------
; Task Scheduler
; --------------
-[extern _Proc_Scheduler]
+[extern Proc_Scheduler]
SchedulerBase:
pusha
push ds
push fs
push gs
+ mov ax, 0x10
+ mov ds, ax
+ mov es, ax
+ mov fs, ax
+ mov gs, ax
+
mov eax, [esp+12*4] ; CPU Number
push eax ; Pus as argument
- call _Proc_Scheduler
+ call Proc_Scheduler
add esp, 4 ; Remove Argument