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

add x86_sregs into x86_user_context

Browse Source 
x86_sregs contains the registers which are included in user_regs_struct
but not included in x86_basic_regs.
This commit is contained in:
NAKAMURA Gou
2015-02-25 18:25:39 +09:00
parent 4aa8ba2eef
commit b66b950129
3 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,9 +25,16 @@
#define USER_DS (56 + 3)
/* struct x86_user_context */
#define RAX_OFFSET 80
#define ERROR_OFFSET 120
#define RSP_OFFSET 152
#define X86_SREGS_BASE (0)
#define X86_SREGS_SIZE 48
#define X86_FLAGS_BASE (X86_SREGS_BASE + X86_SREGS_SIZE)
#define X86_FLAGS_SIZE 8
#define X86_REGS_BASE (X86_FLAGS_BASE + X86_FLAGS_SIZE)
#define RAX_OFFSET (X86_REGS_BASE + 80)
#define ERROR_OFFSET (X86_REGS_BASE + 120)
#define RSP_OFFSET (X86_REGS_BASE + 152)
#define PUSH_ALL_REGS \
pushq %rdi; \
@@ -44,9 +51,13 @@
pushq %r12; \
pushq %r13; \
pushq %r14; \
pushq %r15
pushq %r15; \
pushq $1; /* is_gpr_valid is set, and others are cleared */ \
subq $X86_FLAGS_BASE,%rsp /* for x86_sregs, etc. */
#define POP_ALL_REGS \
movq $0,X86_FLAGS_BASE(%rsp); /* clear all flags */ \
addq $X86_REGS_BASE,%rsp; /* discard x86_sregs, flags, etc. */ \
popq %r15; \
popq %r14; \
popq %r13; \