From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LUiUR-0004jO-7k for qemu-devel@nongnu.org; Wed, 04 Feb 2009 09:12:31 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LUiUQ-0004j3-Nc for qemu-devel@nongnu.org; Wed, 04 Feb 2009 09:12:30 -0500 Received: from [199.232.76.173] (port=45121 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LUiUQ-0004iu-FP for qemu-devel@nongnu.org; Wed, 04 Feb 2009 09:12:30 -0500 Received: from hall.aurel32.net ([88.191.82.174]:32990) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LUiUP-0003q4-TA for qemu-devel@nongnu.org; Wed, 04 Feb 2009 09:12:30 -0500 Date: Wed, 4 Feb 2009 15:12:25 +0100 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH 09/14] Add vcmp{eq,ge,gt,b}fp{,.} instructions Message-ID: <20090204141225.GD19995@volta.aurel32.net> References: <1232657054-30100-1-git-send-email-froydnj@codesourcery.com> <1232657054-30100-10-git-send-email-froydnj@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <1232657054-30100-10-git-send-email-froydnj@codesourcery.com> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Nathan Froyd On Thu, Jan 22, 2009 at 12:44:09PM -0800, Nathan Froyd wrote: > > Signed-off-by: Nathan Froyd > --- > target-ppc/helper.h | 8 +++++ > target-ppc/op_helper.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ > target-ppc/translate.c | 4 +++ > 3 files changed, 80 insertions(+), 0 deletions(-) > > diff --git a/target-ppc/helper.h b/target-ppc/helper.h > index 6f5d6a6..ff4b0db 100644 > --- a/target-ppc/helper.h > +++ b/target-ppc/helper.h > @@ -132,6 +132,10 @@ DEF_HELPER_3(vcmpgtuw, void, avr, avr, avr) > DEF_HELPER_3(vcmpgtsb, void, avr, avr, avr) > DEF_HELPER_3(vcmpgtsh, void, avr, avr, avr) > DEF_HELPER_3(vcmpgtsw, void, avr, avr, avr) > +DEF_HELPER_3(vcmpeqfp, void, avr, avr, avr) > +DEF_HELPER_3(vcmpgefp, void, avr, avr, avr) > +DEF_HELPER_3(vcmpgtfp, void, avr, avr, avr) > +DEF_HELPER_3(vcmpbfp, void, avr, avr, avr) > DEF_HELPER_3(vcmpequb_dot, void, avr, avr, avr) > DEF_HELPER_3(vcmpequh_dot, void, avr, avr, avr) > DEF_HELPER_3(vcmpequw_dot, void, avr, avr, avr) > @@ -141,6 +145,10 @@ DEF_HELPER_3(vcmpgtuw_dot, void, avr, avr, avr) > DEF_HELPER_3(vcmpgtsb_dot, void, avr, avr, avr) > DEF_HELPER_3(vcmpgtsh_dot, void, avr, avr, avr) > DEF_HELPER_3(vcmpgtsw_dot, void, avr, avr, avr) > +DEF_HELPER_3(vcmpeqfp_dot, void, avr, avr, avr) > +DEF_HELPER_3(vcmpgefp_dot, void, avr, avr, avr) > +DEF_HELPER_3(vcmpgtfp_dot, void, avr, avr, avr) > +DEF_HELPER_3(vcmpbfp_dot, void, avr, avr, avr) > DEF_HELPER_3(vmrglb, void, avr, avr, avr) > DEF_HELPER_3(vmrglh, void, avr, avr, avr) > DEF_HELPER_3(vmrglw, void, avr, avr, avr) > diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c > index 532a08a..4b62735 100644 > --- a/target-ppc/op_helper.c > +++ b/target-ppc/op_helper.c > @@ -2223,6 +2223,74 @@ VCMP(gtsw, >, s32) > #undef VCMP_DO > #undef VCMP > > +#define VCMPFP_DO(suffix, compare, order, record) \ > + void helper_vcmp##suffix (ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) \ > + { \ > + uint32_t ones = (uint32_t)-1; \ > + uint32_t all = ones; \ > + uint32_t none = 0; \ > + int i; \ > + for (i = 0; i < ARRAY_SIZE(r->f); i++) { \ > + uint32_t result; \ > + int rel = float32_compare_quiet(a->f[i], b->f[i], &env->vec_status); \ > + if (rel == float_relation_unordered) { \ > + result = 0; \ > + } else if (rel compare order) { \ > + result = ones; \ > + } else { \ > + result = 0; \ > + } \ > + r->u32[i] = result; \ > + all &= result; \ > + none |= result; \ > + } \ > + if (record) { \ > + env->crf[6] = ((all != 0) << 3) | ((none == 0) << 1); \ > + } \ > + } > +#define VCMPFP(suffix, compare, order) \ > + VCMPFP_DO(suffix, compare, order, 0) \ > + VCMPFP_DO(suffix##_dot, compare, order, 1) > +VCMPFP(eqfp, ==, float_relation_equal) > +VCMPFP(gefp, !=, float_relation_less) > +VCMPFP(gtfp, ==, float_relation_greater) > +#undef VCMPFP_DO > +#undef VCMPFP > + > +static always_inline void vcmpbfp_internal (ppc_avr_t *r, ppc_avr_t *a, > + ppc_avr_t *b, int record) > +{ > + int i; > + int all_in = 0; > + for (i = 0; i < ARRAY_SIZE(r->f); i++) { > + int le_rel = float32_compare_quiet(a->f[i], b->f[i], &env->vec_status); > + if (le_rel == float_relation_unordered) { > + r->u32[i] = 0xc0000000; > + /* ALL_IN does not need to be updated here. */ > + } else { > + float32 bneg = float32_chs(b->f[i]); > + int ge_rel = float32_compare_quiet(a->f[i], bneg, &env->vec_status); > + int le = le_rel != float_relation_greater; > + int ge = ge_rel != float_relation_less; > + r->u32[i] = ((!le) << 31) | ((!ge) << 30); > + all_in |= (!le | !ge); > + } > + } > + if (record) { > + env->crf[6] = (all_in == 0) << 1; > + } > +} > + > +void helper_vcmpbfp (ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) > +{ > + vcmpbfp_internal(r, a, b, 0); > +} > + > +void helper_vcmpbfp_dot (ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) > +{ > + vcmpbfp_internal(r, a, b, 1); > +} > + > void helper_vmaddfp (ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, ppc_avr_t *c) > { > int i; > diff --git a/target-ppc/translate.c b/target-ppc/translate.c > index 8b67333..312cbcb 100644 > --- a/target-ppc/translate.c > +++ b/target-ppc/translate.c > @@ -6430,6 +6430,10 @@ GEN_VXRFORM(vcmpgtsw, 3, 14) > GEN_VXRFORM(vcmpgtub, 3, 8) > GEN_VXRFORM(vcmpgtuh, 3, 9) > GEN_VXRFORM(vcmpgtuw, 3, 10) > +GEN_VXRFORM(vcmpeqfp, 3, 3) > +GEN_VXRFORM(vcmpgefp, 3, 7) > +GEN_VXRFORM(vcmpgtfp, 3, 11) > +GEN_VXRFORM(vcmpbfp, 3, 3) This is obviously wrong, as two different instructions can't have the same opcode. The correct value for vcmpbfp is 15. > #define GEN_VXFORM_SIMM(name, opc2, opc3) \ > GEN_HANDLER(name, 0x04, opc2, opc3, 0x00000000, PPC_ALTIVEC) \ > -- > 1.6.0.5 > > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net