summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-03-10 13:46:33 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-03-28 16:23:32 +0100
commitbcc9ec2c0ad0a8a4dbf2d0d6d374cb9278a50bf0 (patch)
tree56cf279c0e04bea1848a6294e4294bcc0a712dea
parentfc56ed063e52cca89e42b56f472d40796df28471 (diff)
i386asm.sym: Add 64bit variant
* i386/i386/i386asm.sym (KSS_ESI, KSS_EDI): Remove. (KSS_R12, KSS_R13, KSS_R14, KSS_R15, r15): Add.
-rw-r--r--i386/i386/i386asm.sym11
1 files changed, 11 insertions, 0 deletions
diff --git a/i386/i386/i386asm.sym b/i386/i386/i386asm.sym
index dd1a2edf..9485f97a 100644
--- a/i386/i386/i386asm.sym
+++ b/i386/i386/i386asm.sym
@@ -63,9 +63,17 @@ offset eml_dispatch eml disp_vector DISP_VECTOR
expr &STACK_IKS(0)->k_ebx KSS_EBX
expr &STACK_IKS(0)->k_esp KSS_ESP
expr &STACK_IKS(0)->k_ebp KSS_EBP
+#ifdef __i386__
expr &STACK_IKS(0)->k_esi KSS_ESI
expr &STACK_IKS(0)->k_edi KSS_EDI
+#endif
expr &STACK_IKS(0)->k_eip KSS_EIP
+#ifdef __x86_64__
+expr &STACK_IKS(0)->k_r12 KSS_R12
+expr &STACK_IKS(0)->k_r13 KSS_R13
+expr &STACK_IKS(0)->k_r14 KSS_R14
+expr &STACK_IKS(0)->k_r15 KSS_R15
+#endif
size i386_kernel_state iks
size i386_exception_link iel
@@ -79,6 +87,9 @@ offset i386_saved_state r efl R_EFLAGS
offset i386_saved_state r eip
offset i386_saved_state r cr2
offset i386_saved_state r edi
+#ifdef __x86_64__
+offset i386_saved_state r r15
+#endif
offset i386_interrupt_state i eip
offset i386_interrupt_state i cs