- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Forgotten changes.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 925cacd7941b45922210b1c296f1af8285fc9fae URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=925cacd7941b… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 13:37:50 2012 +0100 Forgotten changes. --- src/Concrete_Expression.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Concrete_Expression.cc b/src/Concrete_Expression.cc index 528c2a3..85c4529 100644 --- a/src/Concrete_Expression.cc +++ b/src/Concrete_Expression.cc @@ -29,7 +29,7 @@ namespace PPL = Parma_Polyhedra_Library; bool PPL::Concrete_Expression_Type::OK() const { - if (impl.bounded_integer != 0) { + if (impl.bounded_integer) { if (impl.bounded_integer_type_width != BITS_8 && impl.bounded_integer_type_width != BITS_16 && impl.bounded_integer_type_width != BITS_32 @@ -74,7 +74,7 @@ PPL::Concrete_Expression_Type::OK() const { } } else { - // Here we have impl.bounded_integer == 0. + // Here we have impl.bounded_integer == false. if (impl.floating_point_format != IEEE754_HALF && impl.floating_point_format != IEEE754_SINGLE && impl.floating_point_format != IEEE754_DOUBLE

1 0

[GIT] ppl/ppl(master): Simplified min/max evaluation.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 4181f769db322af862f7eab29dd7c742a1f48f51 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4181f769db32… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 13:34:11 2012 +0100 Simplified min/max evaluation. --- src/C_Integer.hh | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/C_Integer.hh b/src/C_Integer.hh index 83ddfe6..4777e0a 100644 --- a/src/C_Integer.hh +++ b/src/C_Integer.hh @@ -144,8 +144,8 @@ struct C_Integer<unsigned char> : public True { typedef void smaller_signed_type; typedef void smaller_unsigned_type; typedef signed char other_type; - static const unsigned char min = 0; - static const unsigned char max = UCHAR_MAX; + static const unsigned char min = 0U; + static const unsigned char max = static_cast<unsigned char>(~0U); }; template <> @@ -155,8 +155,8 @@ struct C_Integer<unsigned short> : public True { typedef signed char smaller_signed_type; typedef unsigned char smaller_unsigned_type; typedef signed short other_type; - static const unsigned short min = 0; - static const unsigned short max = USHRT_MAX; + static const unsigned short min = 0U; + static const unsigned short max = static_cast<unsigned short>(~0U); }; template <> @@ -166,8 +166,8 @@ struct C_Integer<unsigned int> : public True { typedef signed short smaller_signed_type; typedef unsigned short smaller_unsigned_type; typedef signed int other_type; - static const unsigned int min = 0; - static const unsigned int max = UINT_MAX; + static const unsigned int min = 0U; + static const unsigned int max = ~0U; }; template <> @@ -177,8 +177,8 @@ struct C_Integer<unsigned long> : public True { typedef signed int smaller_signed_type; typedef unsigned int smaller_unsigned_type; typedef signed long other_type; - static const unsigned long min = 0; - static const unsigned long max = ULONG_MAX; + static const unsigned long min = 0UL; + static const unsigned long max = ~0UL; }; template <> @@ -188,8 +188,8 @@ struct C_Integer<unsigned long long> : public True { typedef signed long smaller_signed_type; typedef unsigned long smaller_unsigned_type; typedef signed long long other_type; - static const unsigned long long min = 0; - static const unsigned long long max = ULLONG_MAX; + static const unsigned long long min = 0ULL; + static const unsigned long long max = ~0ULL; }; } // namespace Parma_Polyhedra_Library

1 0

[GIT] ppl/ppl(master): Prefer bool field.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 8cafc8b100358ecaa3df10074c91c132e9698fd7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8cafc8b10035… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 13:10:35 2012 +0100 Prefer bool field. --- src/Concrete_Expression.defs.hh | 2 +- src/Concrete_Expression.inlines.hh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Concrete_Expression.defs.hh b/src/Concrete_Expression.defs.hh index 05c1bcb..655e119 100644 --- a/src/Concrete_Expression.defs.hh +++ b/src/Concrete_Expression.defs.hh @@ -102,7 +102,7 @@ public: private: //! A 32-bit word encoding the type. struct Implementation { - unsigned int bounded_integer:1; + bool bounded_integer:1; unsigned int bounded_integer_type_width:23; unsigned int bounded_integer_type_representation:2; unsigned int bounded_integer_type_overflow:2; diff --git a/src/Concrete_Expression.inlines.hh b/src/Concrete_Expression.inlines.hh index 2c5ce6a..29566d1 100644 --- a/src/Concrete_Expression.inlines.hh +++ b/src/Concrete_Expression.inlines.hh @@ -37,7 +37,7 @@ Concrete_Expression_Type const Bounded_Integer_Type_Representation representation, const Bounded_Integer_Type_Overflow overflow) { Implementation impl; - impl.bounded_integer = 1U; + impl.bounded_integer = true; impl.bounded_integer_type_width = width; impl.bounded_integer_type_representation = representation; impl.bounded_integer_type_overflow = overflow; @@ -50,7 +50,7 @@ inline Concrete_Expression_Type Concrete_Expression_Type ::floating_point(const Floating_Point_Format format) { Implementation impl; - impl.bounded_integer = 0; + impl.bounded_integer = false; impl.floating_point_format = format; // Arbitrary choices to ensure determinism. impl.bounded_integer_type_width = BITS_128; @@ -61,12 +61,12 @@ Concrete_Expression_Type inline bool Concrete_Expression_Type::is_bounded_integer() const { - return impl.bounded_integer != 0; + return impl.bounded_integer; } inline bool Concrete_Expression_Type::is_floating_point() const { - return impl.bounded_integer == 0; + return !impl.bounded_integer; } inline Bounded_Integer_Type_Width

1 0

[GIT] ppl/ppl(master): Use always long for time related quantities.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: a03382866a8d47ab99ecc7b1e542b5bbbcbcb799 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a03382866a8d… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 12:15:07 2012 +0100 Use always long for time related quantities. --- src/Time.defs.hh | 16 ++++++++-------- src/Time.inlines.hh | 12 ++++++------ src/Watchdog.cc | 2 +- src/Watchdog.defs.hh | 6 +++--- src/Watchdog.inlines.hh | 8 ++++---- src/checked_ext.inlines.hh | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Time.defs.hh b/src/Time.defs.hh index 6153722..8edb750 100644 --- a/src/Time.defs.hh +++ b/src/Time.defs.hh @@ -78,22 +78,22 @@ public: Time(); //! Constructor taking a number of centiseconds. - explicit Time(unsigned long centisecs); + explicit Time(long centisecs); //! Constructor with seconds and microseconds. - Time(unsigned long s, unsigned long m); + Time(long s, long m); /*! \brief Returns the number of whole seconds contained in the represented time interval. */ - unsigned long seconds() const; + long seconds() const; /*! \brief Returns the number of microseconds that, when added to the number of seconds returned by seconds(), give the represent time interval. */ - unsigned long microseconds() const; + long microseconds() const; //! Adds \p y to \p *this. Time& operator+=(const Time& y); @@ -109,16 +109,16 @@ public: private: //! Number of microseconds in a second. - static const unsigned long USECS_PER_SEC = 1000000UL; + static const long USECS_PER_SEC = 1000000L; //! Number of centiseconds in a second. - static const unsigned long CSECS_PER_SEC = 100UL; + static const long CSECS_PER_SEC = 100L; //! Number of seconds. - unsigned long secs; + long secs; //! Number of microseconds. - unsigned long microsecs; + long microsecs; }; #include "Time.inlines.hh" diff --git a/src/Time.inlines.hh b/src/Time.inlines.hh index e7e716d..af4bc5b 100644 --- a/src/Time.inlines.hh +++ b/src/Time.inlines.hh @@ -39,14 +39,14 @@ Time::Time() } inline -Time::Time(unsigned long centisecs) +Time::Time(long centisecs) : secs(centisecs / CSECS_PER_SEC), microsecs((centisecs % CSECS_PER_SEC) * (USECS_PER_SEC/CSECS_PER_SEC)) { assert(OK()); } inline -Time::Time(unsigned long s, unsigned long m) +Time::Time(long s, long m) : secs(s), microsecs(m) { if (microsecs >= USECS_PER_SEC) { @@ -56,20 +56,20 @@ Time::Time(unsigned long s, unsigned long m) assert(OK()); } -inline unsigned long +inline long Time::seconds() const { return secs; } -inline unsigned long +inline long Time::microseconds() const { return microsecs; } inline Time& Time::operator+=(const Time& y) { - unsigned long r_secs = secs + y.secs; - unsigned long r_microsecs = microsecs + y.microsecs; + long r_secs = secs + y.secs; + long r_microsecs = microsecs + y.microsecs; if (r_microsecs >= USECS_PER_SEC) { ++r_secs; r_microsecs %= USECS_PER_SEC; diff --git a/src/Watchdog.cc b/src/Watchdog.cc index 504beee..b038e88 100644 --- a/src/Watchdog.cc +++ b/src/Watchdog.cc @@ -166,7 +166,7 @@ PPL::PPL_handle_timeout(int signum) { } PPL::Watchdog::WD_Pending_List::Iterator -PPL::Watchdog::new_watchdog_event(unsigned int csecs, +PPL::Watchdog::new_watchdog_event(long csecs, const WD_Handler& handler, bool& expired_flag) { using namespace Implementation::Watchdog; diff --git a/src/Watchdog.defs.hh b/src/Watchdog.defs.hh index 8a95c9e..338e27b 100644 --- a/src/Watchdog.defs.hh +++ b/src/Watchdog.defs.hh @@ -51,13 +51,13 @@ struct Watchdog_Traits { class Watchdog { public: template <typename Flag_Base, typename Flag> - Watchdog(unsigned int csecs, const Flag_Base* volatile& holder, Flag& flag); + Watchdog(long csecs, const Flag_Base* volatile& holder, Flag& flag); /*! \brief Constructor: if not reset, the watchdog will trigger after \p csecs centiseconds, invoking handler \p function. */ - Watchdog(unsigned int csecs, void (*function)()); + Watchdog(long csecs, void (*function)()); //! Destructor. ~Watchdog(); @@ -122,7 +122,7 @@ private: //! Handles the addition of a new watchdog event. static WD_Pending_List::Iterator - new_watchdog_event(unsigned int csecs, + new_watchdog_event(long csecs, const WD_Handler& handler, bool& expired_flag); diff --git a/src/Watchdog.inlines.hh b/src/Watchdog.inlines.hh index 303f268..c1262b5 100644 --- a/src/Watchdog.inlines.hh +++ b/src/Watchdog.inlines.hh @@ -33,7 +33,7 @@ namespace Parma_Polyhedra_Library { #if PPL_HAVE_DECL_SETITIMER && PPL_HAVE_DECL_SIGACTION template <typename Flag_Base, typename Flag> -Watchdog::Watchdog(unsigned int csecs, +Watchdog::Watchdog(long csecs, const Flag_Base* volatile& holder, Flag& flag) : expired(false), @@ -49,7 +49,7 @@ Watchdog::Watchdog(unsigned int csecs, } inline -Watchdog::Watchdog(unsigned int csecs, void (*function)()) +Watchdog::Watchdog(long csecs, void (*function)()) : expired(false), handler(*new Implementation::Watchdog::Handler_Function(function)) { if (csecs == 0) @@ -78,7 +78,7 @@ Watchdog::reschedule() { #else // !PPL_HAVE_DECL_SETITIMER !! !PPL_HAVE_DECL_SIGACTION template <typename Flag_Base, typename Flag> -Watchdog::Watchdog(unsigned int /* csecs */, +Watchdog::Watchdog(long /* csecs */, const Flag_Base* volatile& /* holder */, Flag& /* flag */) { throw std::logic_error("PPL::Watchdog::Watchdog objects not supported:" @@ -86,7 +86,7 @@ Watchdog::Watchdog(unsigned int /* csecs */, } inline -Watchdog::Watchdog(unsigned int /* csecs */, void (* /* function */)()) { +Watchdog::Watchdog(long /* csecs */, void (* /* function */)()) { throw std::logic_error("PPL::Watchdog::Watchdog objects not supported:" " system does not provide setitimer()"); } diff --git a/src/checked_ext.inlines.hh b/src/checked_ext.inlines.hh index c3c97d9..f02d9be 100644 --- a/src/checked_ext.inlines.hh +++ b/src/checked_ext.inlines.hh @@ -675,7 +675,7 @@ mul_2exp_ext(To& to, const From& x, unsigned int exp, Rounding_Dir dir) { template <typename To_Policy, typename From_Policy, typename To, typename From> inline Result -div_2exp_ext(To& to, const From& x, int exp, Rounding_Dir dir) { +div_2exp_ext(To& to, const From& x, unsigned int exp, Rounding_Dir dir) { if (!ext_to_handle<From_Policy>(x)) goto native; if (is_nan<From_Policy>(x))

1 0

[GIT] ppl/ppl(master): Avoid implicit conversions changing integer type signedness.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 6cd5710b5d2c2785398aee90bc39dcf007d0481e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6cd5710b5d2c… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 11:06:51 2012 +0100 Avoid implicit conversions changing integer type signedness. Detected by ECLAIR service utypflag. --- src/Bit_Row.cc | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index 4eb09b7..165c839 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -36,7 +36,8 @@ PPL::Bit_Row::first() const { for (mp_size_t li = 0; li < vec_size; ++li, ++p) { const mp_limb_t limb = *p; if (limb != 0) - return li*PPL_BITS_PER_GMP_LIMB + Implementation::first_one(limb); + return static_cast<unsigned long>(li) * PPL_BITS_PER_GMP_LIMB + + Implementation::first_one(limb); } return C_Integer<unsigned long>::max; } @@ -52,7 +53,7 @@ PPL::Bit_Row::next(unsigned long position) const { // unsigned long r = mpz_scan1(vec, position); // return (r == C_Integer<unsigned long>::max) ? -1 : r; - mp_size_t li = position / PPL_BITS_PER_GMP_LIMB; + mp_size_t li = position / static_cast<mp_size_t>(PPL_BITS_PER_GMP_LIMB); const mp_size_t vec_size = vec->_mp_size; PPL_ASSERT(vec_size >= 0); if (li >= vec_size) @@ -67,7 +68,8 @@ PPL::Bit_Row::next(unsigned long position) const { while (true) { if (limb != 0) - return li*PPL_BITS_PER_GMP_LIMB + Implementation::first_one(limb); + return static_cast<unsigned long>(li) * PPL_BITS_PER_GMP_LIMB + + Implementation::first_one(limb); ++li; if (li == vec_size) break; @@ -87,7 +89,8 @@ PPL::Bit_Row::last() const { const mp_srcptr p = vec->_mp_d + li; const mp_limb_t limb = *p; PPL_ASSERT(limb != 0); - return li*PPL_BITS_PER_GMP_LIMB + Implementation::last_one(limb); + return static_cast<unsigned long>(li) * PPL_BITS_PER_GMP_LIMB + + Implementation::last_one(limb); } unsigned long @@ -99,7 +102,7 @@ PPL::Bit_Row::prev(unsigned long position) const { const mp_size_t vec_size = vec->_mp_size; PPL_ASSERT(vec_size > 0); - unsigned long li = position / PPL_BITS_PER_GMP_LIMB; + mp_size_t li = position / static_cast<mp_size_t>(PPL_BITS_PER_GMP_LIMB); mp_limb_t limb; mp_srcptr p = vec->_mp_d; @@ -120,7 +123,8 @@ PPL::Bit_Row::prev(unsigned long position) const { while (true) { if (limb != 0) - return li*PPL_BITS_PER_GMP_LIMB + Implementation::last_one(limb); + return static_cast<unsigned long>(li) * PPL_BITS_PER_GMP_LIMB + + Implementation::last_one(limb); if (li == 0) break; --li;

1 0

[GIT] ppl/ppl(master): Avoid implicit conversions changing integer type signedness.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 279f44d4d2ad2e818be866ff37b79336ab0333e7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=279f44d4d2ad… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 10:47:58 2012 +0100 Avoid implicit conversions changing integer type signedness. Detected by ECLAIR service utypflag. --- src/Bit_Row.inlines.hh | 10 +++++----- src/Float.defs.hh | 2 +- src/Row_Flags.defs.hh | 2 +- src/checked.cc | 20 +++++++++++--------- src/checked_float.inlines.hh | 10 +++++----- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh index da1824e..46a1236 100644 --- a/src/Bit_Row.inlines.hh +++ b/src/Bit_Row.inlines.hh @@ -58,13 +58,13 @@ Bit_Row::Bit_Row(const Bit_Row& y, const Bit_Row& z) { if (y_size < z_size) { PPL_ASSERT(static_cast<unsigned long>(z_size) <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); - mpz_init2(vec, z_size * PPL_BITS_PER_GMP_LIMB); + mpz_init2(vec, static_cast<mp_bitcnt_t>(z_size) * PPL_BITS_PER_GMP_LIMB); union_helper(y, z); } else { PPL_ASSERT(static_cast<unsigned long>(y_size) <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); - mpz_init2(vec, y_size * PPL_BITS_PER_GMP_LIMB); + mpz_init2(vec, static_cast<mp_bitcnt_t>(y_size) * PPL_BITS_PER_GMP_LIMB); union_helper(z, y); } } @@ -119,7 +119,7 @@ Bit_Row::clear() { inline memory_size_type Bit_Row::external_memory_in_bytes() const { - return vec[0]._mp_alloc * PPL_SIZEOF_MP_LIMB_T; + return static_cast<memory_size_type>(vec[0]._mp_alloc) * PPL_SIZEOF_MP_LIMB_T; } inline memory_size_type @@ -136,13 +136,13 @@ Bit_Row::union_assign(const Bit_Row& x, const Bit_Row& y) { if (x_size < y_size) { PPL_ASSERT(static_cast<unsigned long>(y_size) <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); - mpz_realloc2(vec, y_size * PPL_BITS_PER_GMP_LIMB); + mpz_realloc2(vec, static_cast<mp_bitcnt_t>(y_size) * PPL_BITS_PER_GMP_LIMB); union_helper(x, y); } else { PPL_ASSERT(static_cast<unsigned long>(x_size) <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); - mpz_realloc2(vec, x_size * PPL_BITS_PER_GMP_LIMB); + mpz_realloc2(vec, static_cast<mp_bitcnt_t>(x_size) * PPL_BITS_PER_GMP_LIMB); union_helper(y, x); } } diff --git a/src/Float.defs.hh b/src/Float.defs.hh index fa60ff0..e2f0a44 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -263,7 +263,7 @@ struct float_ieee754_quad { static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 15; static const unsigned int MANTISSA_BITS = 112; - static const int EXPONENT_MAX = (1U << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; static const int EXPONENT_BIAS = EXPONENT_MAX; static const int EXPONENT_MIN = -EXPONENT_MAX + 1; static const int EXPONENT_MIN_DENORM = EXPONENT_MIN diff --git a/src/Row_Flags.defs.hh b/src/Row_Flags.defs.hh index bf8e013..cfff314 100644 --- a/src/Row_Flags.defs.hh +++ b/src/Row_Flags.defs.hh @@ -67,7 +67,7 @@ protected: static const unsigned first_free_bit = 0; //! Total number of bits that can be stored. - static const unsigned num_bits = std::numeric_limits<base_type>::digits; + static const unsigned num_bits = sizeof_to_bits(sizeof(base_type)); //! Constructs an object with flags set as in \p n. explicit Row_Flags(base_type n); diff --git a/src/checked.cc b/src/checked.cc index b024861..12a725e 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -51,8 +51,8 @@ struct number_struct { association; returns \f$-1\f$ otherwise. */ inline int -get_digit(char c, int base = 10) { - int n; +get_digit(char c, unsigned int base = 10) { + unsigned int n; switch (c) { case '0': n = 0; break; case '1': n = 1; break; @@ -95,7 +95,7 @@ get_digit(char c, int base = 10) { } if (n >= base) return -1; - return n; + return static_cast<int>(n); } /*! \brief @@ -136,7 +136,7 @@ parse_number_part(std::istream& is, number_struct& numer) { bool empty_exponent = true; bool empty_mantissa = true; long exponent_offset = 0; - long exponent_offset_scale = 1; + unsigned exponent_offset_scale = 1; numer.base = 10; numer.base_for_exponent = 10; numer.neg_mantissa = false; @@ -223,7 +223,7 @@ parse_number_part(std::istream& is, number_struct& numer) { for (std::string::const_iterator i = numer.mantissa.begin(); i != numer.mantissa.end(); i++) { - numer.base = numer.base * 10 + get_digit(*i, 10); + numer.base = numer.base * 10 + static_cast<unsigned>(get_digit(*i, 10)); if (numer.base > 36) goto unexpected; } @@ -301,7 +301,7 @@ parse_number_part(std::istream& is, number_struct& numer) { if (numer.exponent > max_exp_div || (numer.exponent == max_exp_div && d > max_exp_rem)) return V_CVT_STR_UNK; - numer.exponent = 10*numer.exponent + d; + numer.exponent = 10 * numer.exponent + static_cast<unsigned int>(d); break; } if (empty_exponent) @@ -331,7 +331,7 @@ parse_number_part(std::istream& is, number_struct& numer) { else neg = false; sum_sign(numer.neg_exponent, numer.exponent, - neg, exponent_offset * exponent_offset_scale); + neg, static_cast<unsigned long>(exponent_offset) * exponent_offset_scale); return V_EQ; } @@ -405,11 +405,13 @@ input_mpq(mpq_class& to, std::istream& is) { } mpz_ptr numer = to.get_num().get_mpz_t(); mpz_ptr denom = to.get_den().get_mpz_t(); - mpz_set_str(numer, numer_struct.mantissa.c_str(), numer_struct.base); + mpz_set_str(numer, numer_struct.mantissa.c_str(), + static_cast<int>(numer_struct.base)); if (denom_struct.base != 0) { if (numer_struct.neg_mantissa != denom_struct.neg_mantissa) mpz_neg(numer, numer); - mpz_set_str(denom, denom_struct.mantissa.c_str(), denom_struct.base); + mpz_set_str(denom, denom_struct.mantissa.c_str(), + static_cast<int>(denom_struct.base)); if (numer_struct.exponent != 0 || denom_struct.exponent != 0) { // Multiply the exponents into the numerator and denominator. mpz_t z; diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 44679e6..029bc6e 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -862,8 +862,8 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { mpz_srcptr numer_z = numer.get_mpz_t(); mpz_srcptr denom_z = denom.get_mpz_t(); int sign = sgn(numer); - signed long exponent - = mpz_sizeinbase(numer_z, 2) - mpz_sizeinbase(denom_z, 2); + long exponent = static_cast<long>(mpz_sizeinbase(numer_z, 2)) + - static_cast<long>(mpz_sizeinbase(denom_z, 2)); if (exponent < Float<T>::Binary::EXPONENT_MIN_DENORM) { to = 0; inexact: @@ -884,13 +884,13 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { needed_bits -= Float<T>::Binary::EXPONENT_MIN - exponent; mpz_t mantissa; mpz_init(mantissa); - signed long shift = needed_bits - exponent; + long shift = static_cast<long>(needed_bits) - exponent; if (shift > 0) { - mpz_mul_2exp(mantissa, numer_z, shift); + mpz_mul_2exp(mantissa, numer_z, static_cast<mp_bitcnt_t>(shift)); numer_z = mantissa; } else if (shift < 0) { - mpz_mul_2exp(mantissa, denom_z, -shift); + mpz_mul_2exp(mantissa, denom_z, static_cast<mp_bitcnt_t>(-shift)); denom_z = mantissa; } mpz_t r;

1 0

[GIT] ppl/ppl(master): Avoid implicit conversions changing integer type signedness.
by Abramo Bagnara 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: b9259e66b7b7fa5a536497b66baf3fcee31b2cdb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b9259e66b7b7… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Wed Feb 22 23:54:30 2012 +0100 Avoid implicit conversions changing integer type signedness. Detected by ECLAIR service utypflag. --- src/Bit_Row.cc | 8 ++-- src/Bit_Row.inlines.hh | 2 +- src/CO_Tree.cc | 14 ++++----- src/CO_Tree.defs.hh | 2 +- src/CO_Tree.templates.hh | 7 ++-- src/Float.defs.hh | 68 +++++++++++++++++++++--------------------- src/Float.inlines.hh | 12 ++++---- src/Float.templates.hh | 3 +- src/checked_float.inlines.hh | 14 ++++---- src/checked_int.inlines.hh | 38 ++++++++++++------------ src/compiler.hh | 5 +-- src/globals.inlines.hh | 3 +- 12 files changed, 86 insertions(+), 90 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=b9259e66…

1 0

[GIT] ppl/ppl(master): Avoid implicit conversions changing integer type signedness.
by Enea Zaffanella 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: 9afcaffceb21f412fe286e06bb438a8cc78b7dd6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9afcaffceb21… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 21:48:20 2012 +0100 Avoid implicit conversions changing integer type signedness. Detected by ECLAIR service utypflag. --- src/CO_Tree.cc | 13 ++++++++----- src/CO_Tree.inlines.hh | 5 +++-- src/CO_Tree.templates.hh | 5 +++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index 94cd7f5..45913e0 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -893,7 +893,8 @@ PPL::CO_Tree --subtree_size; } - return first_unused_index - indexes; + PPL_ASSERT(first_unused_index >= indexes); + return static_cast<dimension_type>(first_unused_index - indexes); } void @@ -911,8 +912,9 @@ PPL::CO_Tree::redistribute_elements_in_subtree( // For each node level, the stack may contain up to two element (one for the // subtree rooted at the right son of a node of that level, and one for the // node itself). An additional element can be at the top of the tree. - static std::pair<dimension_type,dimension_type> - stack[2*CHAR_BIT*sizeof(dimension_type)+1]; + static const unsigned stack_size + = 2U * static_cast<unsigned>(CHAR_BIT) * sizeof(dimension_type) + 1U; + static std::pair<dimension_type,dimension_type> stack[stack_size]; std::pair<dimension_type,dimension_type>* stack_first_empty = stack; @@ -1003,8 +1005,9 @@ PPL::CO_Tree::move_data_from(CO_Tree& tree) { // with operation 0, one element with operation 2 and one element // with operation 3. An additional element with operation 1 can be at the // top of the tree. - static std::pair<dimension_type, signed char> - stack[5*CHAR_BIT*sizeof(dimension_type)]; + static const unsigned stack_size + = 5U * static_cast<unsigned>(CHAR_BIT) * sizeof(dimension_type); + static std::pair<dimension_type, signed char> stack[stack_size]; dimension_type stack_first_empty = 0; diff --git a/src/CO_Tree.inlines.hh b/src/CO_Tree.inlines.hh index 50a03e7..48b76fc 100644 --- a/src/CO_Tree.inlines.hh +++ b/src/CO_Tree.inlines.hh @@ -761,7 +761,8 @@ CO_Tree::tree_iterator::follow_left_children_with_value() { p -= (offset - 1); while (*p == unused_index) ++p; - i = p - tree.indexes; + PPL_ASSERT(p >= tree.indexes); + i = static_cast<dimension_type>(p - tree.indexes); offset = i & -i; PPL_ASSERT(OK()); } @@ -774,7 +775,7 @@ CO_Tree::tree_iterator::follow_right_children_with_value() { p += (offset - 1); while (*p == unused_index) --p; - i = p - tree.indexes; + i = static_cast<dimension_type>(p - tree.indexes); offset = i & -i; PPL_ASSERT(OK()); } diff --git a/src/CO_Tree.templates.hh b/src/CO_Tree.templates.hh index 488f541..7c8e5ac 100644 --- a/src/CO_Tree.templates.hh +++ b/src/CO_Tree.templates.hh @@ -53,8 +53,9 @@ CO_Tree::CO_Tree(Iterator i, dimension_type n) { // with operation 0, one element with operation 2 and one element // with operation 3. An additional element with operation 1 can be at the // top of the tree. - static std::pair<dimension_type, signed char> - stack[4*CHAR_BIT*sizeof(dimension_type)+1]; + static const unsigned stack_size + = 4U * static_cast<unsigned>(CHAR_BIT) * sizeof(dimension_type) + 1U; + static std::pair<dimension_type, signed char> stack[stack_size]; dimension_type stack_first_empty = 0;

1 0

[GIT] ppl/ppl(master): Avoid implicit conversion changing type signedness.
by Enea Zaffanella 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: 6854dc3b05c23b4a4c465980a2fb9be1c077df18 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6854dc3b05c2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 21:05:33 2012 +0100 Avoid implicit conversion changing type signedness. Detected by ECLAIR service utypflag. --- src/Linear_Row.inlines.hh | 2 +- src/Linear_System.cc | 10 +++++++--- src/Linear_System.inlines.hh | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Linear_Row.inlines.hh b/src/Linear_Row.inlines.hh index 571a7e3..b690b00 100644 --- a/src/Linear_Row.inlines.hh +++ b/src/Linear_Row.inlines.hh @@ -158,7 +158,7 @@ Linear_Row::space_dimension() const { const dimension_type sz = size(); return (sz == 0) ? 0 - : (sz - (is_necessarily_closed() ? 1 : 2)); + : (sz - (is_necessarily_closed() ? 1U : 2U)); } inline diff --git a/src/Linear_System.cc b/src/Linear_System.cc index 9d7255c..506b507 100644 --- a/src/Linear_System.cc +++ b/src/Linear_System.cc @@ -520,13 +520,17 @@ PPL::Linear_System::sort_and_remove_with_sat(Bit_Matrix& sat) { // First, sort `sys' (keeping `sat' consistent) without removing duplicates. With_Bit_Matrix_iterator first(sys.rows.begin(), sat.rows.begin()); - With_Bit_Matrix_iterator last = first + sat.num_rows(); + typedef With_Bit_Matrix_iterator::difference_type diff_type; + With_Bit_Matrix_iterator last + = first + static_cast<diff_type>(sat.num_rows()); Implementation::swapping_sort(first, last, Row_Less_Than()); // Second, move duplicates in `sys' to the end (keeping `sat' consistent). With_Bit_Matrix_iterator new_last = Implementation::swapping_unique(first, last); - const dimension_type num_duplicates = last - new_last; + const diff_type dist = last - new_last; + PPL_ASSERT(dist >= 0); + const dimension_type num_duplicates = static_cast<dimension_type>(dist); const dimension_type new_first_pending_row = sys.first_pending_row() - num_duplicates; @@ -879,7 +883,7 @@ PPL::Linear_System::OK(const bool check_strong_normalized) const { // A non-empty system will contain constraints or generators; in // both cases it must have at least one column for the inhomogeneous // term and, if it is NNC, another one for the epsilon coefficient. - const dimension_type min_cols = is_necessarily_closed() ? 1 : 2; + const dimension_type min_cols = is_necessarily_closed() ? 1U : 2U; if (num_columns() < min_cols) { #ifndef NDEBUG cerr << "Linear_System has fewer columns than the minimum " diff --git a/src/Linear_System.inlines.hh b/src/Linear_System.inlines.hh index b8d999c..9ed4694 100644 --- a/src/Linear_System.inlines.hh +++ b/src/Linear_System.inlines.hh @@ -204,7 +204,7 @@ Linear_System::space_dimension() const { const dimension_type n_columns = num_columns(); return (n_columns == 0) ? 0 - : (n_columns - (is_necessarily_closed() ? 1 : 2)); + : (n_columns - (is_necessarily_closed() ? 1U : 2U)); } inline void

1 0

[GIT] ppl/ppl(master): Added helper function check_space_dimension_overflow ().
by Enea Zaffanella 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: 800d387ce5e288bfe7bda719e018986715d10490 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=800d387ce5e2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 19:36:39 2012 +0100 Added helper function check_space_dimension_overflow(). Added similar helper in class Polyhedron and got rid of no longer needed method throw_space_dimension_overflow(). Exploit the new helper to simplify space dim checking in constructors. --- src/Box.defs.hh | 3 - src/Box.templates.hh | 134 ++++++++++++++++++++++------------------- src/C_Polyhedron.cc | 40 ++++++------- src/C_Polyhedron.inlines.hh | 98 +++++++++++++----------------- src/Grid.defs.hh | 5 -- src/Grid.inlines.hh | 96 +++++++++++++++-------------- src/Grid.templates.hh | 17 +++--- src/Grid_Generator.cc | 2 +- src/Grid_chdims.cc | 37 +++++++----- src/Grid_nonpublic.cc | 9 --- src/Grid_public.cc | 43 +++++++------ src/NNC_Polyhedron.cc | 40 ++++++------- src/NNC_Polyhedron.inlines.hh | 98 +++++++++++++----------------- src/Polyhedron.defs.hh | 19 ++++-- src/Polyhedron.templates.hh | 12 ++++ src/Polyhedron_chdims.cc | 41 +++++++------ src/Polyhedron_nonpublic.cc | 27 +++++---- src/globals.cc | 16 +++++ src/globals.defs.hh | 7 ++ 19 files changed, 380 insertions(+), 364 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=800d387c…

1 0