X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fdesctab.asm;h=838f67e6f783ba0f5e9291220d59819456fe89f9;hb=eecce4b7a55315f6c385ad8be35c25dbb12d43d8;hp=de606ea63f6a1bc00586aebfa2185bd80659b071;hpb=9f407c493c33928e0f19b834699d9694036ca42e;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/desctab.asm b/Kernel/arch/x86_64/desctab.asm
index de606ea6..838f67e6 100644
--- a/Kernel/arch/x86_64/desctab.asm
+++ b/Kernel/arch/x86_64/desctab.asm
@@ -47,8 +47,84 @@ MM_LOCALAPIC	equ	0xFFFFFD0000000000
 %endmacro
 
 [section .text]
-Desctab_Init:
-	; Install IRQ Handlers
+[global Desctab_Init]
+Desctab_Init:	
+	; Save to make following instructions smaller
+	mov rdi, gIDT
+	
+	; Set an IDT entry to a callback
+	%macro SETIDT 2
+	mov rax, %2
+	mov	WORD [rdi + %1*16], ax
+	shr rax, 16
+	mov	WORD [rdi + %1*16 + 6], ax
+	shr rax, 16
+	mov DWORD [rdi + %1*16 + 8], eax
+	; Enable
+	mov	ax, WORD [rdi + %1*16 + 4]
+	or ax, 0x8000
+	mov	WORD [rdi + %1*16 + 4], ax
+	%endmacro
+	
+	; Install error handlers
+	%macro SETISR 1
+	SETIDT %1, Isr%1
+	%endmacro
+	
+	%assign i 0
+	%rep 32
+	SETISR i
+	%assign i i+1
+	%endrep
+	
+	; Install IRQs
+	%macro SETIRQ 1
+	SETIDT 0xF0+%1, Irq%1
+	%endmacro
+	
+	%assign i 0
+	%rep 16
+	SETIRQ i
+	%assign i i+1
+	%endrep
+
+	; Remap PIC
+	push rdx	; Save RDX
+	mov dx, 0x20
+	mov al, 0x11
+	out dx, al	;	Init Command
+    mov dx, 0x21
+	mov al, 0xF0
+	out dx, al	;	Offset (Start of IDT Range)
+    mov al, 0x04
+	out dx, al	;	IRQ connected to Slave (00000100b) = IRQ2
+    mov al, 0x01
+	out dx, al	;	Set Mode
+    mov al, 0x00
+	out dx, al	;	Set Mode
+	
+	mov dx, 0xA0
+	mov al, 0x11
+	out dx, al	;	Init Command
+    mov dx, 0xA1
+	mov al, 0xF8
+	out dx, al	;	Offset (Start of IDT Range)
+    mov al, 0x02
+	out dx, al	;	IRQ Line connected to master
+    mov al, 0x01
+	out dx, al	;	Set Mode
+    mov dl, 0x00
+	out dx, al	;	Set Mode
+	pop rdx
+	
+	
+	; Install IDT
+	mov rax, gIDTPtr
+	lidt [rax]
+	
+	; Start interrupts
+	sti
+	
 	ret
 
 ; int IRQ_AddHandler(int IRQ, void (*Handler)(int IRQ))
@@ -94,18 +170,71 @@ IRQ_AddHandler:
 .ret:
 	ret
 
-%macro DEFERR	1
+%macro ISR_NOERRNO	1
 Isr%1:
 	push	0
 	push	%1
 	jmp	ErrorCommon
 %endmacro
-%macro DEFERRNO	1
+%macro ISR_ERRNO	1
 Isr%1:
 	push	%1
 	jmp	ErrorCommon
 %endmacro
 
+ISR_NOERRNO	0;  0: Divide By Zero Exception
+ISR_NOERRNO	1;  1: Debug Exception
+ISR_NOERRNO	2;  2: Non Maskable Interrupt Exception
+ISR_NOERRNO	3;  3: Int 3 Exception
+ISR_NOERRNO	4;  4: INTO Exception
+ISR_NOERRNO	5;  5: Out of Bounds Exception
+ISR_NOERRNO	6;  6: Invalid Opcode Exception
+ISR_NOERRNO	7;  7: Coprocessor Not Available Exception
+ISR_ERRNO	8;  8: Double Fault Exception (With Error Code!)
+ISR_NOERRNO	9;  9: Coprocessor Segment Overrun Exception
+ISR_ERRNO	10; 10: Bad TSS Exception (With Error Code!)
+ISR_ERRNO	11; 11: Segment Not Present Exception (With Error Code!)
+ISR_ERRNO	12; 12: Stack Fault Exception (With Error Code!)
+ISR_ERRNO	13; 13: General Protection Fault Exception (With Error Code!)
+ISR_ERRNO	14; 14: Page Fault Exception (With Error Code!)
+ISR_NOERRNO	15; 15: Reserved Exception
+ISR_NOERRNO	16; 16: Floating Point Exception
+ISR_NOERRNO	17; 17: Alignment Check Exception
+ISR_NOERRNO	18; 18: Machine Check Exception
+ISR_NOERRNO	19; 19: Reserved
+ISR_NOERRNO	20; 20: Reserved
+ISR_NOERRNO	21; 21: Reserved
+ISR_NOERRNO	22; 22: Reserved
+ISR_NOERRNO	23; 23: Reserved
+ISR_NOERRNO	24; 24: Reserved
+ISR_NOERRNO	25; 25: Reserved
+ISR_NOERRNO	26; 26: Reserved
+ISR_NOERRNO	27; 27: Reserved
+ISR_NOERRNO	28; 28: Reserved
+ISR_NOERRNO	29; 29: Reserved
+ISR_NOERRNO	30; 30: Reserved
+ISR_NOERRNO	31; 31: Reserved
+
+[extern Error_Handler]
+[global ErrorCommon]
+ErrorCommon:
+	PUSH_GPR
+	push gs
+	push fs
+	;PUSH_FPU
+	;PUSH_XMM
+	
+	mov rsi, rsp
+	call Error_Handler
+	
+	;POP_XMM
+	;POP_FPU
+	pop fs
+	pop gs
+	POP_GPR
+	add rsp, 2*8
+	iret
+
 %macro DEFIRQ	1
 Irq%1:
 	push	0
@@ -113,6 +242,12 @@ Irq%1:
 	jmp	IrqCommon
 %endmacro
 
+%assign i 0
+%rep 16
+DEFIRQ	i
+%assign i i+1
+%endrep
+
 IrqCommon:
 	PUSH_GPR
 	
@@ -166,7 +301,10 @@ SchedulerIRQ:
 
 [section .data]
 gIDT:
-	times 256	dw	0x00080000, 0x00008E00, 0, 0	; 64-bit Interrupt Gate, CS = 0x8, IST0
+	times 256	dd	0x00080000, 0x00000E00, 0, 0	; 64-bit Interrupt Gate, CS = 0x8, IST0
+gIDTPtr:
+	dw	256*16-1
+	dq	gIDT
 
 gaIRQ_Handlers:
 	times	16*NUM_IRQ_CALLBACKS	dq	0