diff options
Diffstat (limited to 'src/kernel/interrupts/isr.asm')
| -rw-r--r-- | src/kernel/interrupts/isr.asm | 39 |
1 files changed, 20 insertions, 19 deletions
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 |