Re: [Qemu-devel] [PATCH 18/40] Add v{add, sub}{s, u}{b, h, w}s instructions.

[Aurelien Jarno]

On Wed, Jan 07, 2009 at 01:24:30PM -0800, Nathan Froyd wrote:
> On Sat, Jan 03, 2009 at 10:13:20PM +0100, Aurelien Jarno wrote:
> > This patch introduces some new warnings:
> > /home/aurel32/git/qemu/target-ppc/op_helper.c: In function ‘helper_vaddsws’:
> > /home/aurel32/git/qemu/target-ppc/op_helper.c:2122: warning: overflow in 
> > implicit constant conversion
> > /home/aurel32/git/qemu/target-ppc/op_helper.c:2122: warning: overflow in 
> > implicit constant conversion
> > /home/aurel32/git/qemu/target-ppc/op_helper.c: In function ‘helper_vsubsws’:
> > /home/aurel32/git/qemu/target-ppc/op_helper.c:2122: warning: overflow in 
> > implicit constant conversion
> > /home/aurel32/git/qemu/target-ppc/op_helper.c:2122: warning: overflow in 
> > implicit constant conversion
> > /home/aurel32/git/qemu/target-ppc/op_helper.c: In function ‘helper_vadduws’:
> > /home/aurel32/git/qemu/target-ppc/op_helper.c:2125: warning: overflow in 
> > implicit constant conversion
> > /home/aurel32/git/qemu/target-ppc/op_helper.c: In function ‘helper_vsubuws’:
> > /home/aurel32/git/qemu/target-ppc/op_helper.c:2125: warning: overflow in 
> > implicit constant conversion
> 
> Fixed thusly.  (I still get a warning for cvtuhub, which can be fixed
> separately.)
> 
> -Nathan
> 
> Fix compilation warnings by using the cvt* family of functions.

Thanks, applied with minor fixes to pass the testsuite (use the signed
to unsigned conversion for unsigned instructions to correctly clamp the
value to 0 in case of a subtraction).

> Signed-off-by: Nathan Froyd <address@hidden>
> ---
>  target-ppc/helper.h    |   12 ++++++++++++
>  target-ppc/op_helper.c |   39 +++++++++++++++++++++++++++++++++++++++
>  target-ppc/translate.c |   12 ++++++++++++
>  3 files changed, 63 insertions(+), 0 deletions(-)
> 
> diff --git a/target-ppc/helper.h b/target-ppc/helper.h
> index bae137b..009f516 100644
> --- a/target-ppc/helper.h
> +++ b/target-ppc/helper.h
> @@ -170,6 +170,18 @@ DEF_HELPER_3(vaddcuw, void, avr, avr, avr)
>  DEF_HELPER_3(vsubcuw, void, avr, avr, avr)
>  DEF_HELPER_2(lvsl, void, avr, tl);
>  DEF_HELPER_2(lvsr, void, avr, tl);
> +DEF_HELPER_3(vaddsbs, void, avr, avr, avr)
> +DEF_HELPER_3(vaddshs, void, avr, avr, avr)
> +DEF_HELPER_3(vaddsws, void, avr, avr, avr)
> +DEF_HELPER_3(vsubsbs, void, avr, avr, avr)
> +DEF_HELPER_3(vsubshs, void, avr, avr, avr)
> +DEF_HELPER_3(vsubsws, void, avr, avr, avr)
> +DEF_HELPER_3(vaddubs, void, avr, avr, avr)
> +DEF_HELPER_3(vadduhs, void, avr, avr, avr)
> +DEF_HELPER_3(vadduws, void, avr, avr, avr)
> +DEF_HELPER_3(vsububs, void, avr, avr, avr)
> +DEF_HELPER_3(vsubuhs, void, avr, avr, avr)
> +DEF_HELPER_3(vsubuws, void, avr, avr, avr)
>  DEF_HELPER_3(vrlb, void, avr, avr, avr)
>  DEF_HELPER_3(vrlh, void, avr, avr, avr)
>  DEF_HELPER_3(vrlw, void, avr, avr, avr)
> diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c
> index eb155aa..ef19bde 100644
> --- a/target-ppc/op_helper.c
> +++ b/target-ppc/op_helper.c
> @@ -2082,6 +2082,45 @@ VARITH(uwm, u32)
>  #undef VARITH_DO
>  #undef VARITH
>  
> +#define VARITHSAT_CASE(type, op, cvt, element)                          \
> +    {                                                                   \
> +        type result = (type)a->element[i] op (type)b->element[i];       \
> +        r->element[i] = cvt(result, &sat);                              \
> +    }
> +
> +#define VARITHSAT_DO(name, op, optype, cvt, element)                    \
> +    void helper_v##name (ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)      \
> +    {                                                                   \
> +        int sat = 0;                                                    \
> +        int i;                                                          \
> +        for (i = 0; i < ARRAY_SIZE(r->element); i++) {                  \
> +            switch (sizeof(r->element[0])) {                            \
> +            case 1: VARITHSAT_CASE(optype, op, cvt, element); break;    \
> +            case 2: VARITHSAT_CASE(optype, op, cvt, element); break;    \
> +            case 4: VARITHSAT_CASE(optype, op, cvt, element); break;    \
> +            }                                                           \
> +        }                                                               \
> +        if (sat) {                                                      \
> +            env->vscr |= (1 << VSCR_SAT);                               \
> +        }                                                               \
> +    }
> +#define VARITHSAT_SIGNED(suffix, element, optype, cvt)        \
> +    VARITHSAT_DO(adds##suffix##s, +, optype, cvt, element)    \
> +    VARITHSAT_DO(subs##suffix##s, -, optype, cvt, element)
> +#define VARITHSAT_UNSIGNED(suffix, element, optype, cvt)       \
> +    VARITHSAT_DO(addu##suffix##s, +, optype, cvt, element)     \
> +    VARITHSAT_DO(subu##suffix##s, -, optype, cvt, element)
> +VARITHSAT_SIGNED(b, s8, int16_t, cvtshsb)
> +VARITHSAT_SIGNED(h, s16, int32_t, cvtswsh)
> +VARITHSAT_SIGNED(w, s32, int64_t, cvtsdsw)
> +VARITHSAT_UNSIGNED(b, u8, uint16_t, cvtuhub)
> +VARITHSAT_UNSIGNED(h, u16, uint32_t, cvtuwuh)
> +VARITHSAT_UNSIGNED(w, u32, uint64_t, cvtuduw)
> +#undef VARITHSAT_CASE
> +#undef VARITHSAT_DO
> +#undef VARITHSAT_SIGNED
> +#undef VARITHSAT_UNSIGNED
> +
>  #define VAVG_DO(name, element, etype)                                   \
>      void helper_v##name (ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)      \
>      {                                                                   \
> diff --git a/target-ppc/translate.c b/target-ppc/translate.c
> index 20e9e0c..e92156f 100644
> --- a/target-ppc/translate.c
> +++ b/target-ppc/translate.c
> @@ -6341,6 +6341,18 @@ GEN_VXFORM(vslo, 6, 16);
>  GEN_VXFORM(vsro, 6, 17);
>  GEN_VXFORM(vaddcuw, 0, 6);
>  GEN_VXFORM(vsubcuw, 0, 22);
> +GEN_VXFORM(vaddubs, 0, 8);
> +GEN_VXFORM(vadduhs, 0, 9);
> +GEN_VXFORM(vadduws, 0, 10);
> +GEN_VXFORM(vaddsbs, 0, 12);
> +GEN_VXFORM(vaddshs, 0, 13);
> +GEN_VXFORM(vaddsws, 0, 14);
> +GEN_VXFORM(vsububs, 0, 24);
> +GEN_VXFORM(vsubuhs, 0, 25);
> +GEN_VXFORM(vsubuws, 0, 26);
> +GEN_VXFORM(vsubsbs, 0, 28);
> +GEN_VXFORM(vsubshs, 0, 29);
> +GEN_VXFORM(vsubsws, 0, 30);
>  GEN_VXFORM(vrlb, 2, 0);
>  GEN_VXFORM(vrlh, 2, 1);
>  GEN_VXFORM(vrlw, 2, 2);
> -- 
> 1.6.0.5
> 
> 
> 
> 

-- 
  .''`.  Aurelien Jarno             | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   address@hidden         | address@hidden
   `-    people.debian.org/~aurel32 | www.aurel32.net