From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c10JH-0001au-Bz for qemu-devel@nongnu.org; Sun, 30 Oct 2016 20:18:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c10JE-0002Nt-58 for qemu-devel@nongnu.org; Sun, 30 Oct 2016 20:18:43 -0400 Date: Mon, 31 Oct 2016 11:16:29 +1100 From: David Gibson Message-ID: <20161031001629.GD18226@umbus.fritz.box> References: <1477487938-23921-1-git-send-email-joserz@linux.vnet.ibm.com> <1477487938-23921-3-git-send-email-joserz@linux.vnet.ibm.com> <20161027012017.GB19918@umbus.fritz.box> <20161027161313.GB19890@pacoca> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="TybLhxa8M7aNoW+V" Content-Disposition: inline In-Reply-To: <20161027161313.GB19890@pacoca> Subject: Re: [Qemu-devel] [PATCH] 2/4] target-ppc: Implement bcdctn. instruction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: joserz@linux.vnet.ibm.com Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, nikunj@linux.vnet.ibm.com, bharata@linux.vnet.ibm.com --TybLhxa8M7aNoW+V Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 27, 2016 at 02:13:13PM -0200, joserz@linux.vnet.ibm.com wrote: > On Thu, Oct 27, 2016 at 12:20:17PM +1100, David Gibson wrote: > > On Wed, Oct 26, 2016 at 11:18:56AM -0200, Jose Ricardo Ziviani wrote: > > > bcdctn. converts from BCD to National numeric format. National format > > > uses a byte to represent a digit where the most significant nibble is > > > always 0x3 and the least sign. nibbles is the digit itself. > > >=20 > > > Signed-off-by: Jose Ricardo Ziviani > > > --- > > > target-ppc/helper.h | 1 + > > > target-ppc/int_helper.c | 46 +++++++++++++++++++++++++++= ++++++++++ > > > target-ppc/translate/vmx-impl.inc.c | 24 ++++++++++++++++++- > > > 3 files changed, 70 insertions(+), 1 deletion(-) > > >=20 > > > diff --git a/target-ppc/helper.h b/target-ppc/helper.h > > > index d30ec60..92eaaf0 100644 > > > --- a/target-ppc/helper.h > > > +++ b/target-ppc/helper.h > > > @@ -370,6 +370,7 @@ DEF_HELPER_4(vpermxor, void, avr, avr, avr, avr) > > > 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) > > > =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 494c74e..cffe82c 100644 > > > --- a/target-ppc/int_helper.c > > > +++ b/target-ppc/int_helper.c > > > @@ -2494,6 +2494,17 @@ static uint8_t get_national_digit(ppc_avr_t *r= eg, int n) > > > #endif > > > } > > > =20 > > > +static void set_national_digit(ppc_avr_t *reg, uint8_t val, int n) > > > +{ > > > +#if defined(HOST_WORDS_BIGENDIAN) > > > + reg->u16[8 - n] &=3D 0; > > > + reg->u16[8 - n] |=3D val; > >=20 > > The &=3D always sets the value to 0, so you might as well just use a > > plain assignment in place of the &=3D, |=3D. >=20 > OK! I'll fix it in v2. >=20 > >=20 > > > +#else > > > + reg->u16[n] &=3D 0; > > > + reg->u16[n] |=3D val; > > > +#endif > > > +} > > > + > > > static int bcd_cmp_mag(ppc_avr_t *a, ppc_avr_t *b) > > > { > > > int i; > > > @@ -2667,6 +2678,41 @@ uint32_t helper_bcdcfn(ppc_avr_t *r, ppc_avr_t= *b, uint32_t ps) > > > return cr; > > > } > > > =20 > > > +uint32_t helper_bcdctn(ppc_avr_t *r, ppc_avr_t *b) > > > +{ > > > + int i; > > > + int cr =3D 0; > > > + int invalid =3D 0; > > > + int sgnb =3D bcd_get_sgn(b); > > > + ppc_avr_t ret =3D { .u64 =3D { 0, 0 } }; > > > + > > > + int eq_flag =3D (b->u64[HI_IDX] =3D=3D 0) && ((b->u64[LO_IDX] >>= 4) =3D=3D 0); > > > + int ox_flag =3D (b->u64[HI_IDX] !=3D 0) || ((b->u64[LO_IDX] >> 8= ) !=3D 0); > >=20 > > This looks wrong. You're shifing the low half right 8 bits =3D=3D 2 > > nybbles =3D=3D 1 digit + sign. So this will set the overflow flag if y= our > > input is a number of >1 digit. I think you want >>32, so it only sets > > overflow if the input exceeds 7 decimal digits + sign. >=20 > OK! I'll fix it in v2. >=20 > >=20 > > > + for (i =3D 1; i < 8; i++) { > > > + set_national_digit(&ret, 0x30 + bcd_get_digit(b, i, &invalid= ), i); > > > + } > > > + set_national_digit(&ret, (sgnb =3D=3D -1) ? NATIONAL_NEG : NATIO= NAL_PLUS, 0); > > > + > > > + if (!eq_flag) { > > > + cr =3D (sgnb =3D=3D -1) ? 1 << CRF_LT : 1 << CRF_GT; > > > + } else { > > > + cr =3D 1 << CRF_EQ; > > > + } > > > + > > > + if (ox_flag) { > > > + cr |=3D 1 << CRF_SO; > > > + } > > > + > > > + 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/transla= te/vmx-impl.inc.c > > > index 2abdcac..4364881 100644 > > > --- a/target-ppc/translate/vmx-impl.inc.c > > > +++ b/target-ppc/translate/vmx-impl.inc.c > > > @@ -894,9 +894,29 @@ static void gen_##op(DisasContext *ctx) = \ > > > tcg_temp_free_i32(ps); \ > > > } > > > =20 > > > +#define GEN_BCD3(op) \ > > > +static void gen_##op(DisasContext *ctx) \ > > > +{ \ > > > + TCGv_ptr rb, rd; \ > > > + \ > > > + if (unlikely(!ctx->altivec_enabled)) { \ > > > + gen_exception(ctx, POWERPC_EXCP_VPU); \ > > > + return; \ > > > + } \ > > > + \ > > > + rb =3D gen_avr_ptr(rB(ctx->opcode)); \ > > > + rd =3D gen_avr_ptr(rD(ctx->opcode)); \ > > > + \ > > > + gen_helper_##op(cpu_crf[6], rd, rb); \ > > > + \ > > > + tcg_temp_free_ptr(rb); \ > > > + tcg_temp_free_ptr(rd); \ > > > +} > > > GEN_BCD(bcdadd) > > > GEN_BCD(bcdsub) > > > GEN_BCD2(bcdcfn) > > > +GEN_BCD3(bcdctn) > > > =20 > > > static void gen_xpnd04_1(DisasContext *ctx) > > > { > > > @@ -908,7 +928,8 @@ static void gen_xpnd04_1(DisasContext *ctx) > > > case 4: > > > break; /* bcdctz. */ > > > case 5: > > > - break; /* bcdctn. */ > > > + gen_bcdctn(ctx); > > > + break; > > > case 6: > > > break; /* bcdcfz. */ > > > case 7: > >=20 > > Uh.. doesn't adding bcdctn to this make it identical to gen_xpnd04_2? >=20 > Actually this opcode is invalid for bcdctn as per ISA3.0. >=20 > Do you think that I should throw something like a SIGILL for this particu= lar case? Yes, if the opcode is invalid, you absolutely should be throwing an invalid instruction exception. > >=20 > > > @@ -1024,3 +1045,4 @@ GEN_VXFORM_DUAL(vsldoi, PPC_ALTIVEC, PPC_NONE, > > > #undef GEN_VAFORM_PAIRED > > > =20 > > > #undef GEN_BCD2 > > > +#undef GEN_BCD3 > >=20 >=20 >=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 --TybLhxa8M7aNoW+V Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYFo1dAAoJEGw4ysog2bOS5XgQAKev2bnkM5+zGTZXNj0Krjpr gVHuk1NdBDmA8RapNVUhYO6WUZR9Bs/LWCzhN4zclp/kqu9yHd2VVDjL0Bgp1uwJ U6YXwinS+HxVXICilenLkBUt042pOb5BcZofLNb04aQcv/O3OU71dnpAOFyGalN4 awJDBJZx7uiVbpKxGDMlY6CSMj5N3bYEaVn0nfGsvtZMWU84og5bOR9D4gX462W/ ++NB4DEtUPzYV000oMYwKNjUIYkY4IYKc/qJhAGShdy1cc9F64xGC3Y55Fw7AjHZ PYmiQ94syrNAVNPyimix9y3GuZ2X8UxaDcg918t+JW8ZVl1Zweby2K0A2Xgz0V5O gV7x/1DoK954kqzKZn9pvKJ7PH6YRuN5u77LBsfG8wvgUS8aiJJLyQGTJj1Hy3D1 LFVAWBvKBZyppBn/dkgDfyMehAruGeYF7sKm7SiiMDknSr4mnOlqmhs1Sdbhlgrf OpRBY3mfrQ/B7R4ZMAWN7/e3xWMyQXdLU/6hn7I7L1Mu6k1XtSamdejLb8ANOvhh VVeQV18fGfDj3A8oxusPESCsk/sQBsCMZ+6Kq4B32vxFG5SBS8LKjLE5uXhsNT29 WQqOyGt7JzpFgqEoKdhlgQRb6BAvxzrTOHa+lshWeqmvXApuP2+yE1ASsJnwlaCd kKOrkO+V9Wwq1gL69Er8 =RNGG -----END PGP SIGNATURE----- --TybLhxa8M7aNoW+V--