* system.h: Move hwint.h include further down.
* hwint.h (sext_hwi, zext_hwi): Define unconditionally. Add
gcc_checking_asserts.
* hwint.c (sext_hwi, zext_hwi): Delete ENABLE_CHECKING versions.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@203906
138bc75d-0d04-0410-961f-
82ee72b054a4
+2013-10-21 Richard Sandiford <rdsandiford@googlemail.com>
+
+ * system.h: Move hwint.h include further down.
+ * hwint.h (sext_hwi, zext_hwi): Define unconditionally. Add
+ gcc_checking_asserts.
+ * hwint.c (sext_hwi, zext_hwi): Delete ENABLE_CHECKING versions.
+
2013-10-21 Bernd Edlinger <bernd.edlinger@hotmail.de>
Fix volatile issues in optimize_bit_field_compare.
{
return mul_hwi (abs_hwi (a) / gcd (a, b), abs_hwi (b));
}
-
-#ifdef ENABLE_CHECKING
-/* Sign extend SRC starting from PREC. */
-
-HOST_WIDE_INT
-sext_hwi (HOST_WIDE_INT src, unsigned int prec)
-{
- gcc_checking_assert (prec <= HOST_BITS_PER_WIDE_INT);
-
- if (prec == HOST_BITS_PER_WIDE_INT)
- return src;
- else
- {
- int shift = HOST_BITS_PER_WIDE_INT - prec;
- return (src << shift) >> shift;
- }
-}
-
-/* Zero extend SRC starting from PREC. */
-
-unsigned HOST_WIDE_INT
-zext_hwi (unsigned HOST_WIDE_INT src, unsigned int prec)
-{
- gcc_checking_assert (prec <= HOST_BITS_PER_WIDE_INT);
-
- if (prec == HOST_BITS_PER_WIDE_INT)
- return src;
- else
- return src & (((HOST_WIDE_INT)1 << prec) - 1);
-}
-
-#endif
/* Sign extend SRC starting from PREC. */
-#ifdef ENABLE_CHECKING
-extern HOST_WIDE_INT sext_hwi (HOST_WIDE_INT, unsigned int);
-#else
static inline HOST_WIDE_INT
sext_hwi (HOST_WIDE_INT src, unsigned int prec)
{
return src;
else
{
+ gcc_checking_assert (prec < HOST_BITS_PER_WIDE_INT);
int shift = HOST_BITS_PER_WIDE_INT - prec;
return (src << shift) >> shift;
}
}
-#endif
/* Zero extend SRC starting from PREC. */
-#ifdef ENABLE_CHECKING
-extern unsigned HOST_WIDE_INT zext_hwi (unsigned HOST_WIDE_INT, unsigned int);
-#else
static inline unsigned HOST_WIDE_INT
zext_hwi (unsigned HOST_WIDE_INT src, unsigned int prec)
{
if (prec == HOST_BITS_PER_WIDE_INT)
return src;
else
- return src & (((HOST_WIDE_INT)1 << prec) - 1);
+ {
+ gcc_checking_assert (prec < HOST_BITS_PER_WIDE_INT);
+ return src & (((HOST_WIDE_INT) 1 << prec) - 1);
+ }
}
-#endif
#endif /* ! GCC_HWINT_H */
# include <limits.h>
#endif
-/* Get definitions of HOST_WIDE_INT and HOST_WIDEST_INT. */
-#include "hwint.h"
-
/* A macro to determine whether a VALUE lies inclusively within a
certain range without evaluating the VALUE more than once. This
macro won't warn if the VALUE is unsigned and the LOWER bound is
#define DEBUG_VARIABLE
#endif
+/* Get definitions of HOST_WIDE_INT and HOST_WIDEST_INT. */
+#include "hwint.h"
+
#endif /* ! GCC_SYSTEM_H */