gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

push/pop r12,r13 and r14 as well when entering/leaving kernel space

Browse Source
This commit is contained in:
bgerofi@riken.jp
2014-07-15 17:31:16 +09:00
committed by Balazs Gerofi bgerofi@riken.jp
parent 99931179e1
commit 35b8716966
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/kernel/interrupt.S
View File

@ -36,9 +36,15 @@
pushq %r9; \
pushq %r10; \
pushq %r11; \
pushq %r12; \
pushq %r13; \
pushq %r14; \
pushq %r15;
#define POP_ALL_REGS \
popq %r15; \
popq %r14; \
popq %r13; \
popq %r12; \
popq %r11; \
popq %r10; \
popq %r9; \
@ -69,7 +75,7 @@ vector=vector+1
common_interrupt:
PUSH_ALL_REGS
movq 96(%rsp), %rdi
movq 120(%rsp), %rdi
movq %rsp, %rsi
call handle_interrupt /* Enter C code */
POP_ALL_REGS
@ -85,7 +91,7 @@ page_fault:
cld
PUSH_ALL_REGS
movq %cr2, %rdi
movq 96(%rsp),%rsi
movq 120(%rsp),%rsi
movq %rsp,%rdx
movq __page_fault_handler_address(%rip), %rax
andq %rax, %rax
@ -122,13 +128,13 @@ x86_syscall:
movq %gs:24, %rcx
movq %rcx, 32(%rsp)
PUSH_ALL_REGS
movq 80(%rsp), %rdi
movq 104(%rsp), %rdi
movw %ss, %ax
movw %ax, %ds
movq %rsp, %rsi
callq *__x86_syscall_handler(%rip)
1:
movq %rax, 80(%rsp)
movq %rax, 104(%rsp)
POP_ALL_REGS
#ifdef USE_SYSRET
movq 8(%rsp), %rcx