From owner-svn-src-head@FreeBSD.ORG Sun Mar 18 19:25:38 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF0D6106567C; Sun, 18 Mar 2012 19:25:38 +0000 (UTC) (envelope-from tijl@coosemans.org) Received: from mailrelay012.isp.belgacom.be (mailrelay012.isp.belgacom.be [195.238.6.179]) by mx1.freebsd.org (Postfix) with ESMTP id 95C638FC22; Sun, 18 Mar 2012 19:25:37 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EAIU1Zk9bsV1u/2dsb2JhbABChT6xAYEIggkBAQUjMyMQCxQEKgICOR6IJwenUpEcj2aBFgSmEIJn Received: from 110.93-177-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.177.93.110]) by relay.skynet.be with ESMTP; 18 Mar 2012 20:25:35 +0100 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.5/8.14.5) with ESMTP id q2IJPYNm006216; Sun, 18 Mar 2012 20:25:34 +0100 (CET) (envelope-from tijl@coosemans.org) From: Tijl Coosemans To: src-committers@freebsd.org Date: Sun, 18 Mar 2012 20:25:25 +0100 User-Agent: KMail/1.13.7 (FreeBSD/10.0-CURRENT; KDE/4.7.3; i386; ; ) References: <201203181912.q2IJCCwj032182@svn.freebsd.org> In-Reply-To: <201203181912.q2IJCCwj032182@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart3461237.WHTPOhDjKD"; protocol="application/pgp-signature"; micalg=pgp-sha256 Content-Transfer-Encoding: 7bit Message-Id: <201203182025.32111.tijl@coosemans.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r233125 - in head/sys: amd64/ia32 compat/ia32 ia64/ia32 ia64/include x86/include X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 19:25:38 -0000 --nextPart3461237.WHTPOhDjKD Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On Sunday 18 March 2012 20:12:12 Tijl Coosemans wrote: > Author: tijl > Date: Sun Mar 18 19:12:11 2012 > New Revision: 233125 > URL: http://svn.freebsd.org/changeset/base/233125 >=20 > Log: > Eliminate ia32_reg.h by moving its contents to x86 and ia64 reg.h. > =20 > Reviewed by: kib >=20 > 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 >=20 > Modified: head/sys/amd64/ia32/ia32_reg.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 >=20 > Modified: head/sys/ia64/ia32/ia32_reg.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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$"); > =20 > +#include "opt_compat.h" > + > #include > #include > #include > #include > =20 > -#include > - > int > fill_regs32(struct thread *td, struct reg32 *regs) > { >=20 > Modified: head/sys/ia64/include/reg.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 @@ > =20 > #include > =20 > -#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; > +}; > =20 > struct reg { > struct _special r_special; > @@ -41,22 +59,28 @@ struct reg { > struct _caller_saved r_scratch; > }; > =20 > +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; > }; > =20 > +struct dbreg32 { > + unsigned int dr[8]; > +}; > + > struct dbreg { > unsigned long dbr_data[8]; > unsigned long dbr_inst[8]; > }; > =20 > -#ifdef COMPAT_FREEBSD32 > -#include > -#include > -#endif > - > #ifdef _KERNEL > struct thread; > =20 > @@ -67,6 +91,14 @@ int fill_fpregs(struct thread *, struct=20 > 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 > =20 > #endif /* _MACHINE_REG_H_ */ >=20 > Modified: head/sys/x86/include/reg.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 > =20 > -#ifdef COMPAT_FREEBSD32 > -#include > -#include > -#endif > - > #ifdef _KERNEL > /* > * XXX these interfaces are MI, so they should be declared in a MI place. I didn't want to move them to an MI place in this patch because it involves all other architectures, but this might be a good time to discuss what that MI place should be. > @@ -248,6 +243,14 @@ int fill_fpregs(struct thread *, struct=20 > 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 > =20 > #endif /* !_MACHINE_REG_H_ */ >=20 --nextPart3461237.WHTPOhDjKD Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iF4EABEIAAYFAk9mNqsACgkQfoCS2CCgtiuTswD+I5VocfYe22S0cuN1Z3kmZiee atn0HhdzpsY/WmZoYjoA/2xQu5qU6gu2nKc1DfPAFZZcfSJDT/qQaGhWtgA9f64t =+3AF -----END PGP SIGNATURE----- --nextPart3461237.WHTPOhDjKD--