From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bU3fU-0005pZ-0k for qemu-devel@nongnu.org; Sun, 31 Jul 2016 23:13:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bU3fO-0007cG-R0 for qemu-devel@nongnu.org; Sun, 31 Jul 2016 23:13:26 -0400 Date: Mon, 1 Aug 2016 11:39:08 +1000 From: David Gibson Message-ID: <20160801013908.GU2588@voom.fritz.box> References: <1469781317.5978.280.camel@kernel.crashing.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Y2illNFYgwJwqOHD" Content-Disposition: inline In-Reply-To: <1469781317.5978.280.camel@kernel.crashing.org> Subject: Re: [Qemu-devel] [PATCH v3] ppc: Rename #include'd .c files to .inc.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Benjamin Herrenschmidt Cc: qemu-ppc@nongnu.org, Richard Henderson , qemu-devel@nongnu.org --Y2illNFYgwJwqOHD Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 29, 2016 at 06:35:17PM +1000, Benjamin Herrenschmidt wrote: > Also while at it, group the #include statements in translate.c >=20 > Signed-off-by: Benjamin Herrenschmidt Urgh.. now I'm getting a: fatal: corrupt patch at line 35 > --- >=20 > v3. Stupid typo I corrected locally but din't commit... > v2. Rebase on top of ppc-for-2.8 > =A0=A0=A0=A0Use git renames >=20 > =A0target-ppc/translate.c=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0| 40 +++++++++++----------- > =A0.../translate/{dfp-impl.c =3D> dfp-impl.inc.c}=A0=A0=A0=A0=A0=A0=A0|= =A0=A00 > =A0target-ppc/translate/{dfp-ops.c =3D> dfp-ops.inc.c}=A0=A0|=A0=A00 > =A0target-ppc/translate/{fp-impl.c =3D> fp-impl.inc.c}=A0=A0|=A0=A00 > =A0target-ppc/translate/{fp-ops.c =3D> fp-ops.inc.c}=A0=A0=A0=A0|=A0=A00 > =A0.../translate/{spe-impl.c =3D> spe-impl.inc.c}=A0=A0=A0=A0=A0=A0=A0|= =A0=A00 > =A0target-ppc/translate/{spe-ops.c =3D> spe-ops.inc.c}=A0=A0|=A0=A00 > =A0.../translate/{vmx-impl.c =3D> vmx-impl.inc.c}=A0=A0=A0=A0=A0=A0=A0|= =A0=A00 > =A0target-ppc/translate/{vmx-ops.c =3D> vmx-ops.inc.c}=A0=A0|=A0=A00 > =A0.../translate/{vsx-impl.c =3D> vsx-impl.inc.c}=A0=A0=A0=A0=A0=A0=A0|= =A0=A00 > =A0target-ppc/translate/{vsx-ops.c =3D> vsx-ops.inc.c}=A0=A0|=A0=A00 > =A011 files changed, 20 insertions(+), 20 deletions(-) > =A0rename target-ppc/translate/{dfp-impl.c =3D> dfp-impl.inc.c} (100%) > =A0rename target-ppc/translate/{dfp-ops.c =3D> dfp-ops.inc.c} (100%) > =A0rename target-ppc/translate/{fp-impl.c =3D> fp-impl.inc.c} (100%) > =A0rename target-ppc/translate/{fp-ops.c =3D> fp-ops.inc.c} (100%) > =A0rename target-ppc/translate/{spe-impl.c =3D> spe-impl.inc.c} (100%) > =A0rename target-ppc/translate/{spe-ops.c =3D> spe-ops.inc.c} (100%) > =A0rename target-ppc/translate/{vmx-impl.c =3D> vmx-impl.inc.c} (100%) > =A0rename target-ppc/translate/{vmx-ops.c =3D> vmx-ops.inc.c} (100%) > =A0rename target-ppc/translate/{vsx-impl.c =3D> vsx-impl.inc.c} (100%) > =A0rename target-ppc/translate/{vsx-ops.c =3D> vsx-ops.inc.c} (100%) >=20 > diff --git a/target-ppc/translate.c b/target-ppc/translate.c > index fc3d371..d1837f8 100644 > --- a/target-ppc/translate.c > +++ b/target-ppc/translate.c > @@ -5315,12 +5315,6 @@ static void gen_rfsvc(DisasContext *ctx) > =A0#endif /* defined(CONFIG_USER_ONLY) */ > =A0} > =A0 > -#include "translate/fp-impl.c" > - > -#include "translate/vmx-impl.c" > - > -#include "translate/vsx-impl.c" > - > =A0/* svc is not implemented for now */ > =A0 > =A0/* BookE specific instructions */ > @@ -6107,10 +6101,6 @@ static void gen_maddhd_maddhdu(DisasContext *ctx) > =A0} > =A0#endif /* defined(TARGET_PPC64) */ > =A0 > -#include "translate/dfp-impl.c" > - > -#include "translate/spe-impl.c" > - > =A0static void gen_tbegin(DisasContext *ctx) > =A0{ > =A0=A0=A0=A0=A0if (unlikely(!ctx->tm_enabled)) { > @@ -6190,6 +6180,16 @@ static inline void gen_##name(DisasContext *ctx)= =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0\ > =A0GEN_TM_PRIV_NOOP(treclaim); > =A0GEN_TM_PRIV_NOOP(trechkpt); > =A0 > +#include "translate/fp-impl.inc.c" > + > +#include "translate/vmx-impl.inc.c" > + > +#include "translate/vsx-impl.inc.c" > + > +#include "translate/dfp-impl.inc.c" > + > +#include "translate/spe-impl.inc.c" > + > =A0static opcode_t opcodes[] =3D { > =A0GEN_HANDLER(invalid, 0x00, 0x00, 0x00, 0xFFFFFFFF, PPC_NONE), > =A0GEN_HANDLER(cmp, 0x1F, 0x00, 0x00, 0x00400000, PPC_INTEGER), > @@ -6714,16 +6714,6 @@ GEN_MAC_HANDLER(mulhhwu, 0x08, 0x00), > =A0GEN_MAC_HANDLER(mullhw, 0x08, 0x0D), > =A0GEN_MAC_HANDLER(mullhwu, 0x08, 0x0C), > =A0 > -#include "translate/fp-ops.c" > - > -#include "translate/vmx-ops.c" > - > -#include "translate/vsx-ops.c" > - > -#include "translate/dfp-ops.c" > - > -#include "translate/spe-ops.c" > - > =A0GEN_HANDLER2_E(tbegin, "tbegin", 0x1F, 0x0E, 0x14, 0x01DFF800, \ > =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0PPC_NONE, PPC2_TM), > =A0GEN_HANDLER2_E(tend,=A0=A0=A0"tend",=A0=A0=A00x1F, 0x0E, 0x15, 0x01FFF= 800, \ > @@ -6746,6 +6736,16 @@ GEN_HANDLER2_E(treclaim, "treclaim", 0x1F, 0x0E, 0= x1D, 0x03E0F800, \ > =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0PPC_NONE, PPC2_TM), > =A0GEN_HANDLER2_E(trechkpt, "trechkpt", 0x1F, 0x0E, 0x1F, 0x03FFF800, \ > =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0PPC_NONE, PPC2_TM), > + > +#include "translate/fp-ops.inc.c" > + > +#include "translate/vmx-ops.inc.c" > + > +#include "translate/vsx-ops.inc.c" > + > +#include "translate/dfp-ops.inc.c" > + > +#include "translate/spe-ops.inc.c" > =A0}; > =A0 > =A0#include "helper_regs.h" > diff --git a/target-ppc/translate/dfp-impl.c b/target-ppc/translate/dfp-i= mpl.inc.c > similarity index 100% > rename from target-ppc/translate/dfp-impl.c > rename to target-ppc/translate/dfp-impl.inc.c > diff --git a/target-ppc/translate/dfp-ops.c b/target-ppc/translate/dfp-op= s.inc.c > similarity index 100% > rename from target-ppc/translate/dfp-ops.c > rename to target-ppc/translate/dfp-ops.inc.c > diff --git a/target-ppc/translate/fp-impl.c b/target-ppc/translate/fp-imp= l.inc.c > similarity index 100% > rename from target-ppc/translate/fp-impl.c > rename to target-ppc/translate/fp-impl.inc.c > diff --git a/target-ppc/translate/fp-ops.c b/target-ppc/translate/fp-ops.= inc.c > similarity index 100% > rename from target-ppc/translate/fp-ops.c > rename to target-ppc/translate/fp-ops.inc.c > diff --git a/target-ppc/translate/spe-impl.c b/target-ppc/translate/spe-i= mpl.inc.c > similarity index 100% > rename from target-ppc/translate/spe-impl.c > rename to target-ppc/translate/spe-impl.inc.c > diff --git a/target-ppc/translate/spe-ops.c b/target-ppc/translate/spe-op= s.inc.c > similarity index 100% > rename from target-ppc/translate/spe-ops.c > rename to target-ppc/translate/spe-ops.inc.c > diff --git a/target-ppc/translate/vmx-impl.c b/target-ppc/translate/vmx-i= mpl.inc.c > similarity index 100% > rename from target-ppc/translate/vmx-impl.c > rename to target-ppc/translate/vmx-impl.inc.c > diff --git a/target-ppc/translate/vmx-ops.c b/target-ppc/translate/vmx-op= s.inc.c > similarity index 100% > rename from target-ppc/translate/vmx-ops.c > rename to target-ppc/translate/vmx-ops.inc.c > diff --git a/target-ppc/translate/vsx-impl.c b/target-ppc/translate/vsx-i= mpl.inc.c > similarity index 100% > rename from target-ppc/translate/vsx-impl.c > rename to target-ppc/translate/vsx-impl.inc.c > diff --git a/target-ppc/translate/vsx-ops.c b/target-ppc/translate/vsx-op= s.inc.c > similarity index 100% > rename from target-ppc/translate/vsx-ops.c > rename to target-ppc/translate/vsx-ops.inc.c >=20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --Y2illNFYgwJwqOHD Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXnqg8AAoJEGw4ysog2bOSDaQQANu1tL6UNODGFgRM54EwUckV 53i4lvBRklKr1GRQzBJ5rxDMSNFwjCTDcL2LsttuTjrrWXFD83I39v6L0hgLs7RO ZErwSuC5AtdQpwULFRyX5ROJkpT0r4pr/P4bsV+K/BgBe1ab5I8X7z4H7dy/gOZj FNPTd/Zvn3bm9IWGMBP+uU+goUW8O/DGfrYhzJ7XBtdnACuYe8dCfBKBA+qCK4Ec hTbIKy96eg6fJDzzzwFkI4/x4gsz1bZH3BCwo5yOwMWjHo6/iIsrHn62ECph+8XB pm+8twc9RS0jiJhfbz/ZMNkf2K5VUfiOmDO1vnAlPDUGBK0bIaUrVejWRIlGDOrA Sam5YB5ai0uw4EcUUfvddFwy6G7sJlIYi4MoUqYjkBWzgpJ5NnO3OzGXZefXnDiY Z4BkX1vLjVewW4X1mrLNlqdRv5Q/QXtrHhtiISjRMoPaVf7MCYdX2VWSMbcNJ+WN bPdfaT4Vi3fESwCgWf5cplP5PAiq3tTVRKKyqiYfjQptAmyxnBI1jm5A2zV1lNlj tB02sPTgOwqiiOvqYWjmwzYItB+PxNZJMZ/p5FG/d7i0tQEm5lycWUhlSh9BMv0E la1dNrtVSp5n41/D9o95kcS5WUJXOEA/sFMMEnSG4WyuMED6SMCUEX8Yr9FXA88I OXA9HQXuwDN3lONUsmJ3 =VbAf -----END PGP SIGNATURE----- --Y2illNFYgwJwqOHD--