The great 64-bit rewrite

* We did loose tasking and only have a paging skeleton, but hey it took like 4 months so i'm happy that there's something :p

kernel/src/isr.s

@@ -1,123 +1,129 @@
-; ISR Assembly
-[bits 32]
+[bits 64]
 
+[section .text]
 isr_common:
-	;; Push registers to the int_frame_t struct
-	
-	pushad
-	;; push eax
-	;; push ecx
-	;; push edx
-	;; push ebx
-	;; push esp
-	;; push ebp
-	;; push esi
-	;; push edi
-	push ds
-	push es
-	push fs
-	push gs
+	push rax
+	push rbx
+	push rcx
+	push rdx
+	push rsi
+	push rdi
+	push rbp
+	push r8
+	push r9
+	push r10
+	push r11
+	push r12
+	push r13
+	push r14
+	push r15
+	mov rbp, ds
+	push rbp
+
+	mov rdi, rsp
 
-	;; Load kernel data segment
-	push ebx
-	mov bx, 0x10
-	mov ds, bx
-	mov es, bx
-	mov fs, bx
-	mov gs, bx
-	pop ebx
-	
 	[extern isr_handle_interrupt]
 	call isr_handle_interrupt
+
 [global isr_return]
-isr_return:	; Also used by a newly created task
-	pop gs
-	pop fs
-	pop es
-	pop ds
-	popad
-	add esp, 8 ; Pop interupt number and error code
-	iret ; Pop CS, EIP & EFLAGS (Also SS & ESP if it's from userspace)
+isr_return:
+	pop rbp
+	pop r15
+	pop r14
+	pop r13
+	pop r12
+	pop r11
+	pop r10
+	pop r9
+	pop r8
+	pop rbp
+	pop rdi
+	pop rsi
+	pop rdx
+	pop rcx
+	pop rbx
+	pop rax
+
+	add rsp, 16	; Pop errno and int number
+	iretq
 
 %macro ISR_WITH_ERRNO 1
+[global isr%1]
 isr%1:
-	push dword %1
+	push %1
 	jmp isr_common
 %endmacro
-	
+
 %macro ISR_WITHOUT_ERRNO 1
+[global isr%1]
 isr%1:
-	push dword 0	; Instead of error code
-	push dword %1
+	push 0
+	push %1
 	jmp isr_common
 %endmacro
 
 ;; Exceptions
-ISR_WITHOUT_ERRNO	0
-ISR_WITHOUT_ERRNO	1
-ISR_WITHOUT_ERRNO	2
-ISR_WITHOUT_ERRNO	3
-ISR_WITHOUT_ERRNO	4
-ISR_WITHOUT_ERRNO	5
-ISR_WITHOUT_ERRNO	6
-ISR_WITHOUT_ERRNO	7
-ISR_WITH_ERRNO		8
-ISR_WITHOUT_ERRNO	9
-ISR_WITH_ERRNO		10
-ISR_WITH_ERRNO		11
-ISR_WITH_ERRNO		12
-ISR_WITH_ERRNO		13
-ISR_WITH_ERRNO		14
-ISR_WITHOUT_ERRNO 	15
-ISR_WITHOUT_ERRNO 	16
-ISR_WITHOUT_ERRNO	17
-ISR_WITHOUT_ERRNO	18
-ISR_WITHOUT_ERRNO	19
-ISR_WITHOUT_ERRNO	20
-ISR_WITHOUT_ERRNO	21
-ISR_WITHOUT_ERRNO	22
-ISR_WITHOUT_ERRNO	23
-ISR_WITHOUT_ERRNO	24
-ISR_WITHOUT_ERRNO	25
-ISR_WITHOUT_ERRNO	26
-ISR_WITHOUT_ERRNO	27
-ISR_WITHOUT_ERRNO	28
-ISR_WITHOUT_ERRNO	29
-ISR_WITHOUT_ERRNO	30
-ISR_WITHOUT_ERRNO	31
+ISR_WITHOUT_ERRNO 0
+ISR_WITHOUT_ERRNO 1
+ISR_WITHOUT_ERRNO 2
+ISR_WITHOUT_ERRNO 3
+ISR_WITHOUT_ERRNO 4
+ISR_WITHOUT_ERRNO 5
+ISR_WITHOUT_ERRNO 6
+ISR_WITHOUT_ERRNO 7
+ISR_WITH_ERRNO    8
+ISR_WITHOUT_ERRNO 9
+ISR_WITH_ERRNO    10
+ISR_WITH_ERRNO    11
+ISR_WITH_ERRNO    12
+ISR_WITH_ERRNO    13
+ISR_WITH_ERRNO    14
+ISR_WITHOUT_ERRNO 15
+ISR_WITHOUT_ERRNO 16
+ISR_WITHOUT_ERRNO 17
+ISR_WITHOUT_ERRNO 18
+ISR_WITHOUT_ERRNO 19
+ISR_WITHOUT_ERRNO 20
+ISR_WITHOUT_ERRNO 21
+ISR_WITHOUT_ERRNO 22
+ISR_WITHOUT_ERRNO 23
+ISR_WITHOUT_ERRNO 24
+ISR_WITHOUT_ERRNO 25
+ISR_WITHOUT_ERRNO 26
+ISR_WITHOUT_ERRNO 27
+ISR_WITHOUT_ERRNO 28
+ISR_WITHOUT_ERRNO 29
+ISR_WITHOUT_ERRNO 30
+ISR_WITHOUT_ERRNO 31
 
-;; IRQs 0-15 (mapped 32-47)
-ISR_WITHOUT_ERRNO	32
-ISR_WITHOUT_ERRNO	33
-ISR_WITHOUT_ERRNO	34
-ISR_WITHOUT_ERRNO	35
-ISR_WITHOUT_ERRNO	36
-ISR_WITHOUT_ERRNO	37
-ISR_WITHOUT_ERRNO	38
-ISR_WITHOUT_ERRNO	39
-ISR_WITHOUT_ERRNO	40
-ISR_WITHOUT_ERRNO	41
-ISR_WITHOUT_ERRNO	42
-ISR_WITHOUT_ERRNO	43
-ISR_WITHOUT_ERRNO	44
-ISR_WITHOUT_ERRNO	45
-ISR_WITHOUT_ERRNO	46
-ISR_WITHOUT_ERRNO	47
+;; IRQs
+ISR_WITHOUT_ERRNO 32
+ISR_WITHOUT_ERRNO 33
+ISR_WITHOUT_ERRNO 34
+ISR_WITHOUT_ERRNO 35
+ISR_WITHOUT_ERRNO 36
+ISR_WITHOUT_ERRNO 37
+ISR_WITHOUT_ERRNO 38
+ISR_WITHOUT_ERRNO 39
+ISR_WITHOUT_ERRNO 40
+ISR_WITHOUT_ERRNO 41
+ISR_WITHOUT_ERRNO 42
+ISR_WITHOUT_ERRNO 43
+ISR_WITHOUT_ERRNO 44
+ISR_WITHOUT_ERRNO 45
+ISR_WITHOUT_ERRNO 46
+ISR_WITHOUT_ERRNO 47
 
-;; Syscall ISR128
-[global isr128]
-isr128:
-	cli	; Prevent race condition & other issues
-	push dword 0
-	push dword 128
-	jmp isr_common
+; Syscall
+ISR_WITHOUT_ERRNO 128
+ISR_WITHOUT_ERRNO 255
 
-;; Create table of ISRs
+[section .data]
 [global isr_redirect_table]
 isr_redirect_table:
 %assign i 0
 %rep 48
-	dd isr%+i
+	dq isr%+i
 %assign i i+1
 %endrep