LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 01:37:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

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
Notes: sideshowbarker 2024-07-18 11:20:17 +09:00 
Author: https://github.com/gunnarbeutner
Commit: https://github.com/SerenityOS/serenity/commit/36ce2a2b765
Pull-request: https://github.com/SerenityOS/serenity/pull/8317
2 changed files with 7 additions and 3 deletions
Show Stats 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 r15;
#endif
u16 exception_code;
u16 isr_number;
#if ARCH(X86_64)
u32 padding;
#endif
u16 exception_code;
u16 isr_number;
#if ARCH(I386)
FlatPtr eip;
#else

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

@ -14,7 +14,11 @@ asm(
"interrupt_common_asm_entry: \n"
// add the padding field in RegisterState
" 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
" pushq %r15\n"
" pushq %r14\n"