diff options
Diffstat (limited to 'sys/arch/i386/i386/genassym.cf')
| -rw-r--r-- | sys/arch/i386/i386/genassym.cf | 58 |
1 files changed, 55 insertions, 3 deletions
diff --git a/sys/arch/i386/i386/genassym.cf b/sys/arch/i386/i386/genassym.cf index 7f3385945d5..5e0806de7d5 100644 --- a/sys/arch/i386/i386/genassym.cf +++ b/sys/arch/i386/i386/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.45 2018/03/31 13:45:03 bluhm Exp $ +# $OpenBSD: genassym.cf,v 1.46 2018/04/11 15:44:08 bluhm Exp $ # # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -108,6 +108,17 @@ member tf_eflags member tf_eip member tf_err member tf_eax +member tf_ecx +member tf_edx +member tf_ebx +member tf_ebp +member tf_esi +member tf_edi +member tf_ds +member tf_es +member tf_fs +member tf_gs +member tf_ss member tf_esp define FRAMESIZE sizeof(struct trapframe) @@ -115,6 +126,41 @@ define FRAMESIZE sizeof(struct trapframe) struct intrframe member if_ppl +# iret stack frame +struct iretframe +member irf_trapno +member irf_err +member irf_eip +member irf_cs +member irf_eflags +member irf_esp +member irf_ss +member irf_vm86_es +member irf_vm86_ds +member irf_vm86_fs +member irf_vm86_gs +define SIZEOF_IRETFRAME sizeof(struct iretframe) + +# trampoline stack frame +struct trampframe +member trf__deadbeef +member trf__kern_esp +member trf_fs +member trf_eax +member trf_ebp +member trf_trapno +member trf_err +member trf_eip +member trf_cs +member trf_eflags +member trf_esp +member trf_ss +member trf_vm86_es +member trf_vm86_ds +member trf_vm86_fs +member trf_vm86_gs +define SIZEOF_TRAMPFRAME sizeof(struct trampframe) + # signal handling struct sigframe SIGF_ member HANDLER sf_handler @@ -139,6 +185,7 @@ endif define IP_SRC offsetof(struct ip, ip_src) define IP_DST offsetof(struct ip, ip_dst) +define CPU_INFO_SCRATCH offsetof(struct cpu_info, ci_scratch) define CPU_INFO_SELF offsetof(struct cpu_info, ci_self) define CPU_INFO_APICID offsetof(struct cpu_info, ci_apicid) define CPU_INFO_CURPROC offsetof(struct cpu_info, ci_curproc) @@ -160,12 +207,17 @@ ifdef DIAGNOSTIC define CPU_INFO_MUTEX_LEVEL offsetof(struct cpu_info, ci_mutex_level) endif define CPU_INFO_CURPMAP offsetof(struct cpu_info, ci_curpmap) +define CPU_INFO_KERN_ESP offsetof(struct cpu_info, ci_kern_esp) +define CPU_INFO_INTR_ESP offsetof(struct cpu_info, ci_intr_esp) +define CPU_INFO_KERN_CR3 offsetof(struct cpu_info, ci_kern_cr3) +define CPU_INFO_USER_CR3 offsetof(struct cpu_info, ci_user_cr3) + +define SIZEOF_CPU_INFO sizeof(struct cpu_info) struct pmap member pm_pdirpa +member pm_pdirpa_intel struct i386tss member tss_esp0 -define SIZEOF_CPU_INFO sizeof(struct cpu_info) - |