diff options
| author | dzwdz | 2022-07-15 11:10:50 +0200 |
|---|---|---|
| committer | dzwdz | 2022-07-15 11:10:50 +0200 |
| commit | 7138c8427d7e635189468b8f60e41dbbab05ea23 (patch) | |
| tree | 63620c01c9e7226e451c9f0d972c35bd2c0b3a72 /src/kernel | |
| parent | c5ad54a55123582b09f9d9d8046623916c2dec4a (diff) | |
i386/isr: don't use pushal; push registers manually
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/arch/i386/interrupts/isr_stub.s | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/src/kernel/arch/i386/interrupts/isr_stub.s b/src/kernel/arch/i386/interrupts/isr_stub.s index 42f2aa6..fdbae6f 100644 --- a/src/kernel/arch/i386/interrupts/isr_stub.s +++ b/src/kernel/arch/i386/interrupts/isr_stub.s @@ -3,16 +3,30 @@ .global _isr_stubs _isr_stubs: .rept 256 - pushal + .set _stub_start, . + + cli call _isr_stage2 + + .if . - _stub_start > 8 + .error "isr stubs over maximum size" + .abort + .endif .align 8 .endr _isr_stage2: - cli + // pushal order, without %esp + push %eax + push %ecx + push %edx + push %ebx + push %ebp + push %esi + push %edi // convert the return address into the vector nr - pop %eax + mov 28(%esp), %eax add $-_isr_stubs, %eax shr $3, %eax @@ -31,7 +45,16 @@ _isr_stage2: pop %eax // restore old cr0 mov %eax, %cr0 - popal + // restore registers + pop %edi + pop %esi + pop %ebp + pop %ebx + pop %edx + pop %ecx + pop %eax + + add $4, %esp // skip call's return address iret .align 8 |