From 1068ced544257c6c2f804bb231c032e0fda90756 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Tue, 19 Aug 2014 16:45:07 +0000 Subject: [PATCH] alpha.h (CLZ_DEFINED_VALUE_AT_ZERO, [...]): Return 0/1 rather than bool. * config/alpha/alpha.h (CLZ_DEFINED_VALUE_AT_ZERO, CTZ_DEFINED_VALUE_AT_ZERO): Return 0/1 rather than bool. * config/i386/i386.h (CLZ_DEFINED_VALUE_AT_ZERO, CTZ_DEFINED_VALUE_AT_ZERO): Return 0/1 rather than bool. From-SVN: r214171 --- gcc/ChangeLog | 9 ++++++++- gcc/config/alpha/alpha.h | 6 ++++-- gcc/config/i386/i386.h | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f3aea7a0d44f..8bdfc9a4ddcb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-08-19 Marek Polacek + + * config/alpha/alpha.h (CLZ_DEFINED_VALUE_AT_ZERO, + CTZ_DEFINED_VALUE_AT_ZERO): Return 0/1 rather than bool. + * config/i386/i386.h (CLZ_DEFINED_VALUE_AT_ZERO, + CTZ_DEFINED_VALUE_AT_ZERO): Return 0/1 rather than bool. + 2014-08-19 David Malcolm * sel-sched-ir.h (BND_TO): insn_t will eventually be an @@ -27,7 +34,7 @@ PR other/62168 * configure.ac: Set install_gold_as_default to no first. - * configure: Regenerated. + * configure: Regenerated. 2014-08-19 David Malcolm diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h index 0ff793f14a9f..88816f3148c0 100644 --- a/gcc/config/alpha/alpha.h +++ b/gcc/config/alpha/alpha.h @@ -912,8 +912,10 @@ do { \ #define TRULY_NOOP_TRUNCATION(OUTPREC, INPREC) 1 /* The CIX ctlz and cttz instructions return 64 for zero. */ -#define CLZ_DEFINED_VALUE_AT_ZERO(MODE, VALUE) ((VALUE) = 64, TARGET_CIX) -#define CTZ_DEFINED_VALUE_AT_ZERO(MODE, VALUE) ((VALUE) = 64, TARGET_CIX) +#define CLZ_DEFINED_VALUE_AT_ZERO(MODE, VALUE) ((VALUE) = 64, \ + TARGET_CIX ? 1 : 0) +#define CTZ_DEFINED_VALUE_AT_ZERO(MODE, VALUE) ((VALUE) = 64, \ + TARGET_CIX ? 1 : 0) /* Define the value returned by a floating-point comparison instruction. */ diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index ec6ed2535e91..2c641628d74c 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -2498,9 +2498,9 @@ extern void debug_dispatch_window (int); /* The value at zero is only defined for the BMI instructions LZCNT and TZCNT, not the BSR/BSF insns in the original isa. */ #define CTZ_DEFINED_VALUE_AT_ZERO(MODE, VALUE) \ - ((VALUE) = GET_MODE_BITSIZE (MODE), TARGET_BMI) + ((VALUE) = GET_MODE_BITSIZE (MODE), TARGET_BMI ? 1 : 0) #define CLZ_DEFINED_VALUE_AT_ZERO(MODE, VALUE) \ - ((VALUE) = GET_MODE_BITSIZE (MODE), TARGET_LZCNT) + ((VALUE) = GET_MODE_BITSIZE (MODE), TARGET_LZCNT ? 1 : 0) /* Flags returned by ix86_get_callcvt (). */ -- 2.43.5