Date: Sat, 21 Sep 2002 03:21:20 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17850 for review Message-ID: <200209211021.g8LALKOD025758@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17850 Change 17850 by peter@peter_overcee on 2002/09/21 03:21:19 Update for x86-64. Still *very* subject to change. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/frame.h#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/frame.h#4 (text+ko) ==== @@ -49,78 +49,102 @@ */ struct trapframe { - int tf_fs; - int tf_es; - int tf_ds; - int tf_edi; - int tf_esi; - int tf_ebp; - int tf_isp; - int tf_ebx; - int tf_edx; - int tf_ecx; - int tf_eax; - int tf_trapno; + int64_t tf_gs; + int64_t tf_fs; + int64_t tf_es; + int64_t tf_ds; + int64_t tf_r15; + int64_t tf_r14; + int64_t tf_r13; + int64_t tf_r12; + int64_t tf_r11; + int64_t tf_r10; + int64_t tf_r9; + int64_t tf_r8; + int64_t tf_rdi; + int64_t tf_rsi; + int64_t tf_rbp; + int64_t tf_rbx; + int64_t tf_rdx; + int64_t tf_rcx; + int64_t tf_rax; + int64_t tf_trapno; /* below portion defined in 386 hardware */ - int tf_err; - int tf_eip; - int tf_cs; - int tf_eflags; + int64_t tf_err; + int64_t tf_rip; + int64_t tf_cs; + int64_t tf_rflags; /* below only when crossing rings (e.g. user to kernel) */ - int tf_esp; - int tf_ss; + int64_t tf_rsp; + int64_t tf_ss; }; /* Interrupt stack frame */ struct intrframe { - int if_vec; - int if_fs; - int if_es; - int if_ds; - int if_edi; - int if_esi; - int if_ebp; - int :32; - int if_ebx; - int if_edx; - int if_ecx; - int if_eax; - int :32; /* for compat with trap frame - trapno */ - int :32; /* for compat with trap frame - err */ + int64_t if_vec; + int64_t if_gs; + int64_t if_fs; + int64_t if_es; + int64_t if_ds; + int64_t if_r15; + int64_t if_r14; + int64_t if_r13; + int64_t if_r12; + int64_t if_r11; + int64_t if_r10; + int64_t if_r9; + int64_t if_r8; + int64_t if_rdi; + int64_t if_rsi; + int64_t if_rbp; + int64_t if_rbx; + int64_t if_rdx; + int64_t if_rcx; + int64_t if_rax; + int64_t :64; /* for compat with trap frame - trapno */ + int64_t :64; /* for compat with trap frame - err */ /* below portion defined in 386 hardware */ - int if_eip; - int if_cs; - int if_eflags; + int64_t if_rip; + int64_t if_cs; + int64_t if_rflags; /* below only when crossing rings (e.g. user to kernel) */ - int if_esp; - int if_ss; + int64_t if_rsp; + int64_t if_ss; }; /* frame of clock (same as interrupt frame) */ struct clockframe { - int cf_vec; - int cf_fs; - int cf_es; - int cf_ds; - int cf_edi; - int cf_esi; - int cf_ebp; - int :32; - int cf_ebx; - int cf_edx; - int cf_ecx; - int cf_eax; - int :32; /* for compat with trap frame - trapno */ - int :32; /* for compat with trap frame - err */ + int64_t cf_vec; + int64_t cf_gs; + int64_t cf_fs; + int64_t cf_es; + int64_t cf_ds; + int64_t cf_r15; + int64_t cf_r14; + int64_t cf_r13; + int64_t cf_r12; + int64_t cf_r11; + int64_t cf_r10; + int64_t cf_r9; + int64_t cf_r8; + int64_t cf_rdi; + int64_t cf_rsi; + int64_t cf_rbp; + int64_t cf_rbx; + int64_t cf_rdx; + int64_t cf_rcx; + int64_t cf_rax; + int64_t :64; /* for compat with trap frame - trapno */ + int64_t :64; /* for compat with trap frame - err */ /* below portion defined in 386 hardware */ - int cf_eip; - int cf_cs; - int cf_eflags; + int64_t cf_rip; + int64_t cf_cs; + int64_t cf_rflags; /* below only when crossing rings (e.g. user to kernel) */ - int cf_esp; - int cf_ss; + int64_t cf_rsp; + int64_t cf_ss; }; int kdb_trap(int, int, struct trapframe *); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209211021.g8LALKOD025758>