diff options
| author | Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com> | 2017-01-11 19:11:25 -0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-01-31 10:10:14 +1100 |
| commit | 365206aeb3d0bb72043d157088a0ebcfaad851f7 (patch) | |
| tree | 468a4882de8cd70c60224ab3ea0c3092a07eb60e /target | |
| parent | 0dfe952dc5c2921488a1172407857d5bb81d17a4 (diff) | |
| download | qemu-365206aeb3d0bb72043d157088a0ebcfaad851f7.zip qemu-365206aeb3d0bb72043d157088a0ebcfaad851f7.tar.gz qemu-365206aeb3d0bb72043d157088a0ebcfaad851f7.tar.bz2 | |
ppc: Fix a warning in bcdcfz code and improve BCD_DIG_BYTE macro
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>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'target')
| -rw-r--r-- | target/ppc/int_helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index 81f134b..8cf4ee3 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -2551,9 +2551,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) @@ -2876,7 +2876,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; |