February 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Improved strcaseeq implementation.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: c5fabffdb88abe18d5df5e2cdf5360361f61858b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c5fabffdb88a… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 15:35:54 2012 +0100 Improved strcaseeq implementation. --- src/ppl-config.cc.in | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/ppl-config.cc.in b/src/ppl-config.cc.in index 167d515..448f354 100644 --- a/src/ppl-config.cc.in +++ b/src/ppl-config.cc.in @@ -164,16 +164,19 @@ void internal_error() { fatal("internal error: please submit a bug report to ppl-devel(a)cs.unipr.it"); } +inline char to_lower(char c) { + return static_cast<char>(tolower(static_cast<int>(static_cast<unsigned char>(c)))); +} + bool strcaseeq(const char* s1, const char* s2) { - while (*s1 != 0 && *s2 != 0 - && tolower(static_cast<unsigned char>(*s1)) - == tolower(static_cast<unsigned char>(*s2))) { + while (*s1 != 0) { + if (*s2 == 0 || to_lower(*s1) != to_lower(*s2)) + return false; ++s1; ++s2; } - return tolower(static_cast<unsigned char>(*s1)) - == tolower(static_cast<unsigned char>(*s2)); + return *s2 == 0; } void

1 0

[GIT] ppl/ppl(master): Fixed cast. Detected by ECLAIR service utypflag.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 3e985e2756163cf85e29af42fc35f45b75657e05 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3e985e275616… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 15:12:44 2012 +0100 Fixed cast. Detected by ECLAIR service utypflag. --- src/Bit_Row.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index 165c839..11ab3ff 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -53,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 / static_cast<mp_size_t>(PPL_BITS_PER_GMP_LIMB); + mp_size_t li = static_cast<mp_size_t>(position / PPL_BITS_PER_GMP_LIMB); const mp_size_t vec_size = vec->_mp_size; PPL_ASSERT(vec_size >= 0); if (li >= vec_size) @@ -102,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); - mp_size_t li = position / static_cast<mp_size_t>(PPL_BITS_PER_GMP_LIMB); + mp_size_t li = static_cast<mp_size_t>(position / PPL_BITS_PER_GMP_LIMB); mp_limb_t limb; mp_srcptr p = vec->_mp_d;

1 0

[GIT] ppl/ppl(master): Fixed signedness. Detected by ECLAIR service utypflag.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: c43fa8739a05e831357a67ad81da925aa89edf37 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c43fa8739a05… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 15:11:19 2012 +0100 Fixed signedness. Detected by ECLAIR service utypflag. --- src/Checked_Number.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Checked_Number.inlines.hh b/src/Checked_Number.inlines.hh index 6e97d02..767b810 100644 --- a/src/Checked_Number.inlines.hh +++ b/src/Checked_Number.inlines.hh @@ -378,7 +378,7 @@ template <typename To, typename From> \ inline typename Enable_If<Is_Native_Or_Checked<To>::value \ && Is_Native_Or_Checked<From>::value, \ Result>::type \ -name(To& to, const From& x, int exp, Rounding_Dir dir) { \ +name(To& to, const From& x, unsigned int exp, Rounding_Dir dir) { \ return \ check_result(Checked::func<typename Native_Checked_To_Wrapper<To> \ ::Policy, \

1 0

[GIT] ppl/ppl(master): Simplified implementation of method Grid:: reduce_reduced().
by Enea Zaffanella 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 66e260f7483f86e3bbe79b32550f2402453a9fe8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=66e260f7483f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 23 14:53:02 2012 +0100 Simplified implementation of method Grid::reduce_reduced(). While at it, got rid of a few implicit conversions changing signedness. Detected by ECLAIR service utypflag. --- src/Grid.templates.hh | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/Grid.templates.hh b/src/Grid.templates.hh index 539a5e9..8145c54 100644 --- a/src/Grid.templates.hh +++ b/src/Grid.templates.hh @@ -280,33 +280,31 @@ Grid::reduce_reduced(M& sys, PPL_DIRTY_TEMP_COEFFICIENT(pivot_dim_half); pivot_dim_half = (pivot_dim + 1) / 2; - Dimension_Kind row_kind = sys_dim_kinds[dim]; - Dimension_Kind line_or_equality, virtual_kind; - int jump; - if (generators) { - line_or_equality = LINE; - virtual_kind = GEN_VIRTUAL; - jump = -1; - } - else { - line_or_equality = EQUALITY; - virtual_kind = CON_VIRTUAL; - jump = 1; - } + const Dimension_Kind row_kind = sys_dim_kinds[dim]; + const bool row_is_line_or_equality + = (row_kind == (generators ? LINE : EQUALITY)); PPL_DIRTY_TEMP_COEFFICIENT(num_rows_to_subtract); PPL_DIRTY_TEMP_COEFFICIENT(row_dim_remainder); - for (dimension_type row_index = pivot_index, kinds_index = dim + jump; - row_index-- > 0; - kinds_index += jump) { - // Move over any virtual rows. - while (sys_dim_kinds[kinds_index] == virtual_kind) - kinds_index += jump; + for (dimension_type kinds_index = dim, + row_index = pivot_index; row_index-- > 0; ) { + if (generators) { + --kinds_index; + // Move over any virtual rows. + while (sys_dim_kinds[kinds_index] == GEN_VIRTUAL) + --kinds_index; + } + else { + ++kinds_index; + // Move over any virtual rows. + while (sys_dim_kinds[kinds_index] == CON_VIRTUAL) + ++kinds_index; + } // row_kind CONGRUENCE is included as PARAMETER - if (row_kind == line_or_equality + if (row_is_line_or_equality || (row_kind == PARAMETER - && sys_dim_kinds[kinds_index] == PARAMETER)) { + && sys_dim_kinds[kinds_index] == PARAMETER)) { R& row = sys[row_index]; const Coefficient& row_dim = row[dim];

1 0

[GIT] ppl/ppl(master): mp_bitcnt_t is not present in gmp 3.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 0426fd6f655b115197d632e43a59bbf58826a417 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0426fd6f655b… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 14:30:50 2012 +0100 mp_bitcnt_t is not present in gmp 3. --- src/Bit_Row.inlines.hh | 8 ++++---- src/checked_float.inlines.hh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh index 46a1236..159cf48 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, static_cast<mp_bitcnt_t>(z_size) * PPL_BITS_PER_GMP_LIMB); + mpz_init2(vec, static_cast<unsigned long>(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, static_cast<mp_bitcnt_t>(y_size) * PPL_BITS_PER_GMP_LIMB); + mpz_init2(vec, static_cast<unsigned long>(y_size) * PPL_BITS_PER_GMP_LIMB); union_helper(z, y); } } @@ -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, static_cast<mp_bitcnt_t>(y_size) * PPL_BITS_PER_GMP_LIMB); + mpz_realloc2(vec, static_cast<unsigned long>(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, static_cast<mp_bitcnt_t>(x_size) * PPL_BITS_PER_GMP_LIMB); + mpz_realloc2(vec, static_cast<unsigned long>(x_size) * PPL_BITS_PER_GMP_LIMB); union_helper(y, x); } } diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 029bc6e..03e1bc7 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -886,11 +886,11 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { mpz_init(mantissa); long shift = static_cast<long>(needed_bits) - exponent; if (shift > 0) { - mpz_mul_2exp(mantissa, numer_z, static_cast<mp_bitcnt_t>(shift)); + mpz_mul_2exp(mantissa, numer_z, static_cast<unsigned long>(shift)); numer_z = mantissa; } else if (shift < 0) { - mpz_mul_2exp(mantissa, denom_z, static_cast<mp_bitcnt_t>(-shift)); + mpz_mul_2exp(mantissa, denom_z, static_cast<unsigned long>(-shift)); denom_z = mantissa; } mpz_t r;

1 0

[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