| Message ID | 1484169085-2962-1-git-send-email-joserz@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Jan 11, 2017 at 07:11:25PM -0200, Jose Ricardo Ziviani wrote: > This commit fixes a warning in the code "(i * 2) ? .. : ..", which > should be better as "i ? .. : ..", and improves the BCD_DIG_BYTE > macro by placing parentheses around its argument to avoid possible > expansion issues like: BCD_DIG_BYTE(i + j). > > Signed-off-by: Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com> > Reviewed-by: Eric Blake <eblake@redhat.com> Applied to ppc-for-2.9. > --- > target/ppc/int_helper.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c > index 24e5964..bd8282c 100644 > --- a/target/ppc/int_helper.c > +++ b/target/ppc/int_helper.c > @@ -2583,9 +2583,9 @@ void helper_vsubecuq(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, ppc_avr_t *c) > #define NATIONAL_NEG 0x2D > > #if defined(HOST_WORDS_BIGENDIAN) > -#define BCD_DIG_BYTE(n) (15 - (n/2)) > +#define BCD_DIG_BYTE(n) (15 - ((n) / 2)) > #else > -#define BCD_DIG_BYTE(n) (n/2) > +#define BCD_DIG_BYTE(n) ((n) / 2) > #endif > > static int bcd_get_sgn(ppc_avr_t *bcd) > @@ -2908,7 +2908,7 @@ uint32_t helper_bcdcfz(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps) > } > > for (i = 0; i < 16; i++) { > - zone_digit = (i * 2) ? b->u8[BCD_DIG_BYTE(i * 2)] >> 4 : zone_lead; > + zone_digit = i ? b->u8[BCD_DIG_BYTE(i * 2)] >> 4 : zone_lead; > digit = b->u8[BCD_DIG_BYTE(i * 2)] & 0xF; > if (unlikely(zone_digit != zone_lead || digit > 0x9)) { > invalid = 1;
diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index 24e5964..bd8282c 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -2583,9 +2583,9 @@ void helper_vsubecuq(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, ppc_avr_t *c) #define NATIONAL_NEG 0x2D #if defined(HOST_WORDS_BIGENDIAN) -#define BCD_DIG_BYTE(n) (15 - (n/2)) +#define BCD_DIG_BYTE(n) (15 - ((n) / 2)) #else -#define BCD_DIG_BYTE(n) (n/2) +#define BCD_DIG_BYTE(n) ((n) / 2) #endif static int bcd_get_sgn(ppc_avr_t *bcd) @@ -2908,7 +2908,7 @@ uint32_t helper_bcdcfz(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps) } for (i = 0; i < 16; i++) { - zone_digit = (i * 2) ? b->u8[BCD_DIG_BYTE(i * 2)] >> 4 : zone_lead; + zone_digit = i ? b->u8[BCD_DIG_BYTE(i * 2)] >> 4 : zone_lead; digit = b->u8[BCD_DIG_BYTE(i * 2)] & 0xF; if (unlikely(zone_digit != zone_lead || digit > 0x9)) { invalid = 1;