diff options
| author | Luca Dariz <luca@orpolo.org> | 2024-09-04 22:18:06 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2024-09-08 00:59:06 +0200 |
| commit | 3a6147244fa0fcadec05e3426a35660682858df8 (patch) | |
| tree | f3d44dac67b79c3091476ef4edc688d609b1358a | |
| parent | ca7f98dab6ae77802a7d861ad76d9c4a4700b084 (diff) | |
| download | gnumach-3a6147244fa0fcadec05e3426a35660682858df8.tar.gz gnumach-3a6147244fa0fcadec05e3426a35660682858df8.tar.bz2 gnumach-3a6147244fa0fcadec05e3426a35660682858df8.zip | |
x86_64: fix double fault handler
* x86_64/locore.S: adjust to the changes in the thread state
structure (segment registers), and add the missing opcode.
Message-ID: <20240904201806.510082-3-luca@orpolo.org>
| -rw-r--r-- | x86_64/locore.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/x86_64/locore.S b/x86_64/locore.S index 8f39a677..376f41c1 100644 --- a/x86_64/locore.S +++ b/x86_64/locore.S @@ -435,10 +435,10 @@ ENTRY(start_timer) ENTRY(t_dbl_fault) INT_FIX cli /* disable interrupts that might corrupt the state*/ + pushq $(T_DOUBLE_FAULT) /* indicate fault type */ pusha movq %cr2,%rax movq %rax,R_CR2-R_R15(%rsp) /* CR2 might contain the faulting address */ - subq $48,%rsp // FIXME remove when segments are cleaned up movq %rsp,%rdi /* pass the saved state */ call handle_double_fault jmp cpu_shutdown /* reset */ |