Re: [PATCH gnumach 3/3] x86_64: fix double fault handler

[Samuel Thibault]

Luca Dariz, le mer. 04 sept. 2024 22:18:06 +0200, a ecrit:
> * x86_64/locore.S: adjust to the changes in the thread state
>   structure (segment registers), and add the missing opcode.

Applied, thanks!

> ---
>  x86_64/locore.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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 */
> -- 
> 2.39.2
>