summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kernel/arch/i386/interrupts/isr_stub.s13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/kernel/arch/i386/interrupts/isr_stub.s b/src/kernel/arch/i386/interrupts/isr_stub.s
index a8a97b3..614dc7f 100644
--- a/src/kernel/arch/i386/interrupts/isr_stub.s
+++ b/src/kernel/arch/i386/interrupts/isr_stub.s
@@ -16,10 +16,19 @@ _isr_stage2:
pop %eax
add $-_isr_stubs, %eax
shr $3, %eax
- push %eax
+ // disable paging, if present
+ // it's done here so the stuff on the stack is in the right order
+ mov %cr0, %ebx
+ push %ebx
+ and $0x7FFFFFFF, %ebx
+ mov %ebx, %cr0
+
+ push %eax // push the vector nr
call isr_stage3
- add $4, %esp
+ add $4, %esp // "pop" the vector nr
+ pop %eax // restore old cr0
+ mov %eax, %cr0
popal
iret