RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:07:36 +00:00
Code Issues Activity Actions

Kernel: Fix struct layout for interrupt entries on x86_64

Browse source
This commit is contained in:
Gunnar Beutner 2021-06-29 10:30:37 +02:00 • committed by Andreas Kling
parent 5afec84cc2
commit 36ce2a2b76
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Arch/x86/RegisterState.h
View file

@ -47,11 +47,11 @@ struct [[gnu::packed]] RegisterState {
FlatPtr r14; FlatPtr r14;
FlatPtr r15; FlatPtr r15;
#endif #endif
u16 exception_code;
u16 isr_number;
#if ARCH(X86_64) #if ARCH(X86_64)
u32 padding; u32 padding;
#endif #endif
u16 exception_code;
u16 isr_number;
#if ARCH(I386) #if ARCH(I386)
FlatPtr eip; FlatPtr eip;
#else #else

6
Kernel/Arch/x86/x86_64/InterruptEntry.cpp
View file

@ -14,7 +14,11 @@ asm(
"interrupt_common_asm_entry: \n" "interrupt_common_asm_entry: \n"
// add the padding field in RegisterState // add the padding field in RegisterState
" subq $4, %rsp\n" " subq $4, %rsp\n"
" movl $0, 0(%rsp)\n" " pushq %rax\n"
" movl 12(%rsp), %eax\n"
" movl $0, 12(%rsp)\n"
" movl %eax, 8(%rsp)\n"
" popq %rax\n"
// save all the other registers // save all the other registers
" pushq %r15\n" " pushq %r15\n"
" pushq %r14\n" " pushq %r14\n"