From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 19:12:12 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5908A106566C; Sun, 18 Mar 2012 19:12:12 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4285F8FC08; Sun, 18 Mar 2012 19:12:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IJCCg6032187; Sun, 18 Mar 2012 19:12:12 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IJCCwj032182; Sun, 18 Mar 2012 19:12:12 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201203181912.q2IJCCwj032182@svn.freebsd.org> From: Tijl Coosemans Date: Sun, 18 Mar 2012 19:12:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233125 - in head/sys: amd64/ia32 compat/ia32 ia64/ia32 ia64/include x86/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 19:12:12 -0000 Author: tijl Date: Sun Mar 18 19:12:11 2012 New Revision: 233125 URL: http://svn.freebsd.org/changeset/base/233125 Log: Eliminate ia32_reg.h by moving its contents to x86 and ia64 reg.h. Reviewed by: kib Deleted: head/sys/compat/ia32/ia32_reg.h Modified: head/sys/amd64/ia32/ia32_reg.c head/sys/ia64/ia32/ia32_reg.c head/sys/ia64/include/reg.h head/sys/x86/include/reg.h Modified: head/sys/amd64/ia32/ia32_reg.c ============================================================================== --- head/sys/amd64/ia32/ia32_reg.c Sun Mar 18 19:06:38 2012 (r233124) +++ head/sys/amd64/ia32/ia32_reg.c Sun Mar 18 19:12:11 2012 (r233125) @@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: head/sys/ia64/ia32/ia32_reg.c ============================================================================== --- head/sys/ia64/ia32/ia32_reg.c Sun Mar 18 19:06:38 2012 (r233124) +++ head/sys/ia64/ia32/ia32_reg.c Sun Mar 18 19:12:11 2012 (r233125) @@ -27,13 +27,13 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_compat.h" + #include #include #include #include -#include - int fill_regs32(struct thread *td, struct reg32 *regs) { Modified: head/sys/ia64/include/reg.h ============================================================================== --- head/sys/ia64/include/reg.h Sun Mar 18 19:06:38 2012 (r233124) +++ head/sys/ia64/include/reg.h Sun Mar 18 19:12:11 2012 (r233125) @@ -31,9 +31,27 @@ #include -#if defined(_KERNEL) && !defined(_STANDALONE) -#include "opt_compat.h" -#endif +struct reg32 { + unsigned int r_fs; + unsigned int r_es; + unsigned int r_ds; + unsigned int r_edi; + unsigned int r_esi; + unsigned int r_ebp; + unsigned int r_isp; + unsigned int r_ebx; + unsigned int r_edx; + unsigned int r_ecx; + unsigned int r_eax; + unsigned int r_trapno; + unsigned int r_err; + unsigned int r_eip; + unsigned int r_cs; + unsigned int r_eflags; + unsigned int r_esp; + unsigned int r_ss; + unsigned int r_gs; +}; struct reg { struct _special r_special; @@ -41,22 +59,28 @@ struct reg { struct _caller_saved r_scratch; }; +struct fpreg32 { + unsigned int fpr_env[7]; + unsigned char fpr_acc[8][10]; + unsigned int fpr_ex_sw; + unsigned char fpr_pad[64]; +}; + struct fpreg { struct _callee_saved_fp fpr_preserved; struct _caller_saved_fp fpr_scratch; struct _high_fp fpr_high; }; +struct dbreg32 { + unsigned int dr[8]; +}; + struct dbreg { unsigned long dbr_data[8]; unsigned long dbr_inst[8]; }; -#ifdef COMPAT_FREEBSD32 -#include -#include -#endif - #ifdef _KERNEL struct thread; @@ -67,6 +91,14 @@ int fill_fpregs(struct thread *, struct int set_fpregs(struct thread *, struct fpreg *); int fill_dbregs(struct thread *, struct dbreg *); int set_dbregs(struct thread *, struct dbreg *); +#ifdef COMPAT_FREEBSD32 +int fill_regs32(struct thread *, struct reg32 *); +int set_regs32(struct thread *, struct reg32 *); +int fill_fpregs32(struct thread *, struct fpreg32 *); +int set_fpregs32(struct thread *, struct fpreg32 *); +int fill_dbregs32(struct thread *, struct dbreg32 *); +int set_dbregs32(struct thread *, struct dbreg32 *); +#endif #endif #endif /* _MACHINE_REG_H_ */ Modified: head/sys/x86/include/reg.h ============================================================================== --- head/sys/x86/include/reg.h Sun Mar 18 19:06:38 2012 (r233124) +++ head/sys/x86/include/reg.h Sun Mar 18 19:12:11 2012 (r233125) @@ -232,11 +232,6 @@ struct __dbreg64 { #undef __dbreg32 #undef __dbreg64 -#ifdef COMPAT_FREEBSD32 -#include -#include -#endif - #ifdef _KERNEL /* * XXX these interfaces are MI, so they should be declared in a MI place. @@ -248,6 +243,14 @@ int fill_fpregs(struct thread *, struct int set_fpregs(struct thread *, struct fpreg *); int fill_dbregs(struct thread *, struct dbreg *); int set_dbregs(struct thread *, struct dbreg *); +#ifdef COMPAT_FREEBSD32 +int fill_regs32(struct thread *, struct reg32 *); +int set_regs32(struct thread *, struct reg32 *); +int fill_fpregs32(struct thread *, struct fpreg32 *); +int set_fpregs32(struct thread *, struct fpreg32 *); +int fill_dbregs32(struct thread *, struct dbreg32 *); +int set_dbregs32(struct thread *, struct dbreg32 *); +#endif #endif #endif /* !_MACHINE_REG_H_ */