From 67b5215c7642f7436210b4501c445a42f5846fdd Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Mon, 21 Oct 2013 18:32:23 +0000 Subject: system.h: Move hwint.h include further down. gcc/ * 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. From-SVN: r203906 --- gcc/hwint.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'gcc/hwint.h') diff --git a/gcc/hwint.h b/gcc/hwint.h index d2c2ec3..77ae642 100644 --- a/gcc/hwint.h +++ b/gcc/hwint.h @@ -322,9 +322,6 @@ extern HOST_WIDE_INT least_common_multiple (HOST_WIDE_INT, HOST_WIDE_INT); /* 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) { @@ -332,24 +329,23 @@ 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 */ -- cgit v1.1