From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c12Tv-0005jt-17 for qemu-devel@nongnu.org; Sun, 30 Oct 2016 22:37:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c12Ts-0005XO-57 for qemu-devel@nongnu.org; Sun, 30 Oct 2016 22:37:51 -0400 Date: Mon, 31 Oct 2016 13:28:37 +1100 From: David Gibson Message-ID: <20161031022837.GF18226@umbus.fritz.box> References: <1477675084-7713-1-git-send-email-joserz@linux.vnet.ibm.com> <1477675084-7713-4-git-send-email-joserz@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="GV0iVqYguTV4Q9ER" Content-Disposition: inline In-Reply-To: <1477675084-7713-4-git-send-email-joserz@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH v2 3/4] target-ppc: Implement bcdcfz. instruction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jose Ricardo Ziviani Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, nikunj@linux.vnet.ibm.com, bharata@linux.vnet.ibm.com --GV0iVqYguTV4Q9ER Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Oct 28, 2016 at 03:18:03PM -0200, Jose Ricardo Ziviani wrote: > bcdcfz. converts from Zoned numeric format to BCD. Zoned format uses > a byte to represent a digit where the most significant nibble is 0x3 > or 0xf, depending on the preferred signal. >=20 > Signed-off-by: Jose Ricardo Ziviani Only a trivial fix, otherwise looks ok now (I wouldn't mention something this small, except that the series will need a respin anyway, so it might as well get fixed). > --- > target-ppc/helper.h | 1 + > target-ppc/int_helper.c | 47 +++++++++++++++++++++++++++++++= ++++++ > target-ppc/translate/vmx-impl.inc.c | 7 ++++-- > 3 files changed, 53 insertions(+), 2 deletions(-) >=20 > diff --git a/target-ppc/helper.h b/target-ppc/helper.h > index 53d1e7a..a9ac28b 100644 > --- a/target-ppc/helper.h > +++ b/target-ppc/helper.h > @@ -373,6 +373,7 @@ DEF_HELPER_4(bcdadd, i32, avr, avr, avr, i32) > DEF_HELPER_4(bcdsub, i32, avr, avr, avr, i32) > DEF_HELPER_3(bcdcfn, i32, avr, avr, i32) > DEF_HELPER_2(bcdctn, i32, avr, avr) > +DEF_HELPER_3(bcdcfz, i32, avr, avr, i32) > =20 > DEF_HELPER_2(xsadddp, void, env, i32) > DEF_HELPER_2(xssubdp, void, env, i32) > diff --git a/target-ppc/int_helper.c b/target-ppc/int_helper.c > index a58ed30..19e6a3a 100644 > --- a/target-ppc/int_helper.c > +++ b/target-ppc/int_helper.c > @@ -2727,6 +2727,53 @@ uint32_t helper_bcdctn(ppc_avr_t *r, ppc_avr_t *b) > return cr; > } > =20 > +uint32_t helper_bcdcfz(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps) > +{ > + int i; > + int j; > + int cr =3D 0; > + int invalid =3D 0; > + int neq_flag =3D 0; > + int zone_digit =3D 0; > + int zone_lead =3D (ps) ? 0xF : 0x3; No need to bracket ps here. > + int digit =3D 0; > + ppc_avr_t ret =3D { .u64 =3D { 0, 0 } }; > + int sgnb =3D b->u8[BCD_DIG_BYTE(0)] >> 4; > + > + if (unlikely((sgnb < 0xA) && ps)) { > + invalid =3D 1; > + } > + > + for (i =3D 0, j =3D 1; i < 31; i +=3D 2, j++) { > + zone_digit =3D (i) ? b->u8[BCD_DIG_BYTE(i)] >> 4 : zone_lead; > + digit =3D b->u8[BCD_DIG_BYTE(i)] & 0xF; > + > + if (unlikely(zone_digit !=3D zone_lead || digit > 0x9)) { > + invalid =3D 1; > + break; > + } > + > + neq_flag +=3D (digit !=3D 0); > + bcd_put_digit(&ret, digit, j); > + } > + > + if ((ps && (sgnb =3D=3D 0xB || sgnb =3D=3D 0xD)) || > + (!ps && (sgnb & 0x4))) { > + bcd_put_digit(&ret, BCD_NEG_PREF, 0); > + cr =3D (neq_flag) ? 1 << CRF_LT : 1 << CRF_EQ; > + } else { > + bcd_put_digit(&ret, BCD_PLUS_PREF_1, 0); > + cr =3D (neq_flag) ? 1 << CRF_GT : 1 << CRF_EQ; > + } > + > + if (unlikely(invalid)) { > + cr =3D 1 << CRF_SO; > + } > + > + *r =3D ret; > + > + return cr; > +} > void helper_vsbox(ppc_avr_t *r, ppc_avr_t *a) > { > int i; > diff --git a/target-ppc/translate/vmx-impl.inc.c b/target-ppc/translate/v= mx-impl.inc.c > index e37fc11..6e54437 100644 > --- a/target-ppc/translate/vmx-impl.inc.c > +++ b/target-ppc/translate/vmx-impl.inc.c > @@ -991,6 +991,7 @@ GEN_BCD(bcdadd) > GEN_BCD(bcdsub) > GEN_BCD2(bcdcfn) > GEN_BCD3(bcdctn) > +GEN_BCD2(bcdcfz) > =20 > static void gen_xpnd04_1(DisasContext *ctx) > { > @@ -1005,7 +1006,8 @@ static void gen_xpnd04_1(DisasContext *ctx) > gen_bcdctn(ctx); > break; > case 6: > - break; /* bcdcfz. */ > + gen_bcdcfz(ctx); > + break; > case 7: > gen_bcdcfn(ctx); > break; > @@ -1026,7 +1028,8 @@ static void gen_xpnd04_2(DisasContext *ctx) > case 4: > break; /* bcdctz. */ > case 6: > - break; /* bcdcfz. */ > + gen_bcdcfz(ctx); > + break; > case 7: > gen_bcdcfn(ctx); > break; --=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 --GV0iVqYguTV4Q9ER Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYFqxUAAoJEGw4ysog2bOSyi0QAL2JkmpTzJv2PGoLKBYZLhC3 hxbJC77BVjFgMLwS/lzDx7fIHVktCwE8EtQnO/5Vt7F5fp1NaFX4IR1Y705QxoGs LgEfztSBTaIKYXQcRijjHKswODxgmiYmEmnkr+NKiLQbzn4BPLzxBMzBgXYa8crZ hyKNKvPGhCTAzaueGZ3M+VZWrYwLYQ5zJPLBPC0Y2ktlut6i//Zm6/uH8iNMwBtA zf8tHy1aeX0YiyaKa8psQAE23KjYTB4wW9CLwjUkEQ9hhdE7VTwnq3kwE8ByhhOJ uY4NXhKOc5sDE0ktt8BPV2XespqBcMwWr2Rjc/jNPuSVT7ZecTC0Ru2RuZUnww0Z MitEvJy23FVzS/B6mMpNGHlrWeabqr00ZeCnYKbJD5X3dClsf0WwcEb5lz/mRWIS eAsbQcWSoILkp/TuQqnhSLs77neEoIkCMLzYAEduDoNE9dV0r7FipQaL80kyTKlj tKmZc33vSUAw5ni3/aQm3eT2eQpPkAL0Cz651S1zoT/+FuL0BJefrhFUKGyfK/Rf pBMURd+j3zA6ZQtnOs3l5rO/9qGqyhAkFhT7nsFnrn0SLkEQ/2ICNOvHDT56bp4y HfgW5m79SVCBrNEUUCp3+pG2jlyJxU3Qcpf+DqDYfFMYEDSxu2Tr3ujt7H/hoqW9 pt1aulk/ERHOYj/uk19V =Y569 -----END PGP SIGNATURE----- --GV0iVqYguTV4Q9ER--