From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53345) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkKzh-0004Qk-7L for qemu-devel@nongnu.org; Wed, 14 Sep 2016 20:57:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkKzg-0006p6-6H for qemu-devel@nongnu.org; Wed, 14 Sep 2016 20:57:37 -0400 Date: Thu, 15 Sep 2016 10:48:09 +1000 From: David Gibson Message-ID: <20160915004809.GG15077@voom.fritz.box> References: <1473662506-27441-1-git-send-email-nikunj@linux.vnet.ibm.com> <1473662506-27441-7-git-send-email-nikunj@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="FKNvYlRPwIaB7a7A" Content-Disposition: inline In-Reply-To: <1473662506-27441-7-git-send-email-nikunj@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH RESEND v2 06/17] target-ppc: convert st[16, 32, 64]r to use new macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Nikunj A Dadhania Cc: qemu-ppc@nongnu.org, rth@twiddle.net, qemu-devel@nongnu.org, benh@kernel.crashing.org --FKNvYlRPwIaB7a7A Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Sep 12, 2016 at 12:11:35PM +0530, Nikunj A Dadhania wrote: > Make byte-swap routines use the common GEN_QEMU_LOAD macro s/GEN_QEMU_LOAD/GEN_QEMU_STORE/ > Signed-off-by: Nikunj A Dadhania > --- > target-ppc/translate.c | 32 ++++++++++---------------------- > 1 file changed, 10 insertions(+), 22 deletions(-) >=20 > diff --git a/target-ppc/translate.c b/target-ppc/translate.c > index 254ad40..60668c2 100644 > --- a/target-ppc/translate.c > +++ b/target-ppc/translate.c > @@ -2510,6 +2510,9 @@ GEN_QEMU_STORE_TL(st8, DEF_MEMOP(MO_UB)) > GEN_QEMU_STORE_TL(st16, DEF_MEMOP(MO_UW)) > GEN_QEMU_STORE_TL(st32, DEF_MEMOP(MO_UL)) > =20 > +GEN_QEMU_STORE_TL(st16r, BSWAP_MEMOP(MO_UW)) > +GEN_QEMU_STORE_TL(st32r, BSWAP_MEMOP(MO_UL)) > + > #define GEN_QEMU_STORE_64(stop, op) \ > static void glue(gen_qemu_, glue(stop, _i64))(DisasContext *ctx, \ > TCGv_i64 val, \ > @@ -2521,6 +2524,10 @@ static void glue(gen_qemu_, glue(stop, _i64))(Disa= sContext *ctx, \ > GEN_QEMU_STORE_64(st32, DEF_MEMOP(MO_UL)) > GEN_QEMU_STORE_64(st64, DEF_MEMOP(MO_Q)) > =20 > +#if defined(TARGET_PPC64) > +GEN_QEMU_STORE_64(st64r, BSWAP_MEMOP(MO_Q)) > +#endif > + > #define GEN_LD(name, ldop, opc, type) = \ > static void glue(gen_, name)(DisasContext *ctx) = \ > { = \ > @@ -2844,34 +2851,15 @@ GEN_LDX(lwbr, ld32ur, 0x16, 0x10, PPC_INTEGER); > #if defined(TARGET_PPC64) > /* ldbrx */ > GEN_LDX_E(ldbr, ld64ur_i64, 0x14, 0x10, PPC_NONE, PPC2_DBRX, CHK_NONE); > +/* stdbrx */ > +GEN_STX_E(stdbr, st64r_i64, 0x14, 0x14, PPC_NONE, PPC2_DBRX, CHK_NONE); > #endif /* TARGET_PPC64 */ > =20 > /* sthbrx */ > -static inline void gen_qemu_st16r(DisasContext *ctx, TCGv arg1, TCGv arg= 2) > -{ > - TCGMemOp op =3D MO_UW | (ctx->default_tcg_memop_mask ^ MO_BSWAP); > - tcg_gen_qemu_st_tl(arg1, arg2, ctx->mem_idx, op); > -} > GEN_STX(sthbr, st16r, 0x16, 0x1C, PPC_INTEGER); > - > /* stwbrx */ > -static inline void gen_qemu_st32r(DisasContext *ctx, TCGv arg1, TCGv arg= 2) > -{ > - TCGMemOp op =3D MO_UL | (ctx->default_tcg_memop_mask ^ MO_BSWAP); > - tcg_gen_qemu_st_tl(arg1, arg2, ctx->mem_idx, op); > -} > GEN_STX(stwbr, st32r, 0x16, 0x14, PPC_INTEGER); > =20 > -#if defined(TARGET_PPC64) > -/* stdbrx */ > -static inline void gen_qemu_st64r(DisasContext *ctx, TCGv arg1, TCGv arg= 2) > -{ > - TCGMemOp op =3D MO_Q | (ctx->default_tcg_memop_mask ^ MO_BSWAP); > - tcg_gen_qemu_st_i64(arg1, arg2, ctx->mem_idx, op); > -} > -GEN_STX_E(stdbr, st64r, 0x14, 0x14, PPC_NONE, PPC2_DBRX, CHK_NONE); > -#endif /* TARGET_PPC64 */ > - > /*** Integer load and store multiple = ***/ > =20 > /* lmw */ > @@ -6619,7 +6607,7 @@ GEN_STS(stw, st32, 0x04, PPC_INTEGER) > #if defined(TARGET_PPC64) > GEN_STUX(std, st64_i64, 0x15, 0x05, PPC_64B) > GEN_STX(std, st64_i64, 0x15, 0x04, PPC_64B) > -GEN_STX_E(stdbr, st64r, 0x14, 0x14, PPC_NONE, PPC2_DBRX, CHK_NONE) > +GEN_STX_E(stdbr, st64r_i64, 0x14, 0x14, PPC_NONE, PPC2_DBRX, CHK_NONE) > GEN_STX_HVRM(stdcix, st64_i64, 0x15, 0x1f, PPC_CILDST) > GEN_STX_HVRM(stwcix, st32, 0x15, 0x1c, PPC_CILDST) > GEN_STX_HVRM(sthcix, st16, 0x15, 0x1d, PPC_CILDST) --=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 --FKNvYlRPwIaB7a7A Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBAgAGBQJX2e/JAAoJEGw4ysog2bOS0CAQAKh6IjuaYMbssZk8b5eWGNfe 3PUoVK30Ilzu2c/d0v65tBT/AmgveudsRYnNwjqYOphFEMvccGDCcePjfjQaidaZ 4wfjKVRfCH9HMOCLTMThgeoF3pjH4KLRKmRvetTt6IqtRm7Jf7jDQVBmTre+qxq0 2VDMBHQq3zKRTRhh6J8Ri9jw+d/x9d59/JbG0Hp50S3+3LWHL/8Vv5yNqi9eaV7O vckYPzFDCjEhkZbN1hivzV3x3iSmxLZ6eTXc/wzzCA0mcisHLgmR0BSpd/6zDjBN mavl/EJYwYbUmqtBggBvkOJe0pawnf0HkeVQcQXOHYmxIdAU+i+vGiET0Qc+SNC+ DSGyMyAcmXL84FsQwUmVKmCvC29Ihts9aw3UwuUuInSVWn4epcrR38S4Mpe9+30/ kcc2c7dp1WJTjYIuEyRzbVzR6h9fNgkEZ6GHGOOlRP5t9RRJp2RypyO4Dy1hrHMR mybhhzGFP+XO1rXP4mvwboFAT8M0ZP1HiNGGznmDfMaxCvE6dIuSGAcDlWfUdhhd yTHs+VOp456QMxPuFRoInfbev0PFTD06a0mgfSQEGmfB+28T2Sbt0QlPdh1T4/7g gG8jxt3V2rSmWvj37KU3ViuM9lBcZzijy+ItCTYEFGa7OILgy12YHp0JbVrnN4M3 8e5ueuaRQBwG5mWPNUuo =tL4N -----END PGP SIGNATURE----- --FKNvYlRPwIaB7a7A--