Interrupt analysis - removed many useless cli/sti

3 files changed, 47 insertions, 47 deletions

diff --git a/src/kernel/interrupts/irq.asm b/src/kernel/interrupts/irq.asm
index f616944..da7323e 100644
--- a/src/kernel/interrupts/irq.asm
+++ b/src/kernel/interrupts/irq.asm
@@ -1,10 +1,10 @@
 %macro IRQ 2
   global irq%1
   irq%1:
-    cli
-    push byte 0
-    push byte %2
-    jmp irq_common_stub
+	cli
+	push byte 0
+	push byte %2
+	jmp irq_common_stub
 %endmacro
 
 IRQ 0, 32
@@ -26,29 +26,30 @@ IRQ 15, 47
 
 extern irq_handler
 irq_common_stub:
-    pusha
+	pusha
 
-    push ds
-    push es
-    push fs
-    push gs
+	push ds
+	push es
+	push fs
+	push gs
 
-    mov ax, 0x10
-    mov ds, ax
-    mov es, ax
-    mov fs, ax
-    mov gs, ax
-    cld
+	mov ax, 0x10
+	mov ds, ax
+	mov es, ax
+	mov fs, ax
+	mov gs, ax
+	cld
 
-    push esp
-    call irq_handler
-    add esp, 4
+	push esp
+	call irq_handler
+	add esp, 4
 
-    pop gs
-    pop fs
-    pop es
-    pop ds
-    popa
+	pop gs
+	pop fs
+	pop es
+	pop ds
+	popa
 
-    add esp, 8
-    iret
\ No newline at end of file
+	add esp, 8
+	sti
+	iret
\ No newline at end of file
diff --git a/src/kernel/interrupts/isr.asm b/src/kernel/interrupts/isr.asm
index 00d986a..7bfa876 100644
--- a/src/kernel/interrupts/isr.asm
+++ b/src/kernel/interrupts/isr.asm
@@ -1,18 +1,18 @@
 %macro ISR_NOERRCODE 1
-    global isr%1
-    isr%1:
-        cli
-        push byte 0
-        push %1
-        jmp isr_common_stub
+	global isr%1
+	isr%1:
+		cli
+		push byte 0
+		push %1
+		jmp isr_common_stub
 %endmacro
 
 %macro ISR_ERRCODE 1
-    global isr%1
-    isr%1:
-        cli
-        push byte %1
-        jmp isr_common_stub
+	global isr%1
+	isr%1:
+		cli
+		push byte %1
+		jmp isr_common_stub
 %endmacro
 
 ISR_NOERRCODE 0
@@ -51,11 +51,11 @@ ISR_NOERRCODE 128
 
 extern fault_handler
 isr_common_stub:
-    pusha
+	pusha
 
-    push ds
-    push es
-    push fs
+	push ds
+	push es
+	push fs
 	push gs
 
 	mov ax, 0x10
@@ -70,10 +70,11 @@ isr_common_stub:
 	add esp, 4
 
 	pop gs
-    pop fs
-    pop es
+	pop fs
+	pop es
 	pop ds
-    popa
+	popa
 
-    add esp, 8
+	add esp, 8
+	sti
 	iret
\ No newline at end of file
diff --git a/src/kernel/interrupts/isr.c b/src/kernel/interrupts/isr.c
index 9222406..3bfc2b8 100644
--- a/src/kernel/interrupts/isr.c
+++ b/src/kernel/interrupts/isr.c
@@ -103,14 +103,12 @@ const char *exception_messages[32] = { "Division By Zero",
 				       "Reserved",
 				       "Reserved" };
 
-// Master exception/interrupt/fault handler - halt via panic
+// Master exception/interrupt/fault handler - called by asm
 void fault_handler(struct regs *r)
 {
-	cli();
 	irq_handler_t handler = isr_routines[r->int_no];
 	if (handler) {
 		handler(r);
-		sti();
 	} else {
 		u32 faulting_address;
 		asm("mov %%cr2, %0" : "=r"(faulting_address));