- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Fixed bugs whereby the wrong types were used so that overflows were possible .
by Roberto Bagnara 30 Oct '11

30 Oct '11

Module: ppl/ppl Branch: master Commit: bee06c610540c66c494829d89a9d3fb69db77723 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bee06c610540… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Oct 30 10:03:01 2011 +0100 Fixed bugs whereby the wrong types were used so that overflows were possible. Detected by ECLAIR service utypflag. --- src/Checked_Number.templates.hh | 2 +- src/Congruence.cc | 4 ++-- src/checked.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Checked_Number.templates.hh b/src/Checked_Number.templates.hh index 844e656..1f13f52 100644 --- a/src/Checked_Number.templates.hh +++ b/src/Checked_Number.templates.hh @@ -138,7 +138,7 @@ ascii_load(std::istream& s, T& t) { // ... then read and discard pretty printed value. if (!(s >> str)) return false; - const unsigned sz = str.size(); + const std::string::size_type sz = str.size(); return sz > 2 && str[0] == '(' && str[sz-1] == ')'; } } diff --git a/src/Congruence.cc b/src/Congruence.cc index 2a5d295..3cec37a 100644 --- a/src/Congruence.cc +++ b/src/Congruence.cc @@ -184,7 +184,7 @@ PPL::Congruence::is_tautological() const { if ((is_equality() && inhomogeneous_term() == 0) || (is_proper_congruence() && (inhomogeneous_term() % modulus() == 0))) { - for (unsigned i = space_dimension(); i > 0; --i) + for (dimension_type i = space_dimension(); i > 0; --i) if ((*this)[i] != 0) return false; return true; @@ -198,7 +198,7 @@ PPL::Congruence::is_inconsistent() const { || (is_proper_congruence() && ((inhomogeneous_term() % modulus()) == 0))) return false; - for (unsigned i = space_dimension(); i > 0; --i) + for (dimension_type i = space_dimension(); i > 0; --i) if ((*this)[i] != 0) return false; return true; diff --git a/src/checked.cc b/src/checked.cc index cc5a106..f4562b0 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -272,7 +272,7 @@ parse_number_part(std::istream& is, number_struct& num) { { ok: is.unget(); - unsigned int n = num.mantissa.size(); + std::string::size_type n = num.mantissa.size(); while (n > 0 && num.mantissa[n - 1] == '0') { --n; ++exponent_offset;

1 0

[GIT] ppl/ppl(master): Unwanted null statements removed.
by Roberto Bagnara 30 Oct '11

30 Oct '11

Module: ppl/ppl Branch: master Commit: 3d8965685d763098df4889e5912b01a49ef9ccb0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3d8965685d76… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Oct 30 09:16:59 2011 +0100 Unwanted null statements removed. Detected by ECLAIR service nullstmt. --- src/Box.templates.hh | 2 +- src/Grid.inlines.hh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 7fba12a..f1ea6c4 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -1296,7 +1296,7 @@ Box<ITV>::check_empty() const { x.set_empty(); return true; } - x.set_nonempty();; + x.set_nonempty(); return false; } diff --git a/src/Grid.inlines.hh b/src/Grid.inlines.hh index e887e00..21ea8e0 100644 --- a/src/Grid.inlines.hh +++ b/src/Grid.inlines.hh @@ -233,12 +233,12 @@ Grid::hash_code() const { inline Constraint_System Grid::constraints() const { - return Constraint_System(congruences());; + return Constraint_System(congruences()); } inline Constraint_System Grid::minimized_constraints() const { - return Constraint_System(minimized_congruences());; + return Constraint_System(minimized_congruences()); } inline void

1 0

[GIT] ppl/ppl(master): Long line avoided.
by Roberto Bagnara 29 Oct '11

29 Oct '11

Module: ppl/ppl Branch: master Commit: 0f5e9fcf26b5672475af536d3a920ba9d8173944 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0f5e9fcf26b5… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Oct 29 16:27:43 2011 +0200 Long line avoided. --- src/CO_Tree.defs.hh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/CO_Tree.defs.hh b/src/CO_Tree.defs.hh index fe72838..b45329d 100644 --- a/src/CO_Tree.defs.hh +++ b/src/CO_Tree.defs.hh @@ -106,7 +106,8 @@ private: //! This is used for node heights and depths in the tree. typedef unsigned height_t; - PPL_COMPILE_TIME_CHECK(C_Integer<height_t>::max >= CHAR_BITS*sizeof(dimension_type), + PPL_COMPILE_TIME_CHECK(C_Integer<height_t>::max + >= CHAR_BITS*sizeof(dimension_type), "height_t is too small to store depths."); class tree_iterator;

1 0

[GIT] ppl/ppl(master): Avoid explicit integral conversions that change the signedness of the underlying type of complex expressions .
by Roberto Bagnara 29 Oct '11

29 Oct '11

Module: ppl/ppl Branch: master Commit: ba709e9a0db165a9aafd3765f0c7fcf72e2d5b99 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ba709e9a0db1… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Oct 29 15:04:04 2011 +0200 Avoid explicit integral conversions that change the signedness of the underlying type of complex expressions. Detected by ECLAIR service utypflag. --- src/Float.inlines.hh | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/Float.inlines.hh b/src/Float.inlines.hh index 34281b3..9ae573f 100644 --- a/src/Float.inlines.hh +++ b/src/Float.inlines.hh @@ -85,7 +85,9 @@ float_ieee754_half::build(bool negative, mpz_t mantissa, int exponent) { word = mpz_get_ui(mantissa) & ((1UL << MANTISSA_BITS) - 1); if (negative) word |= SGN_MASK; - word |= static_cast<uint16_t>(exponent + EXPONENT_BIAS) << MANTISSA_BITS; + int exponent_repr = exponent + EXPONENT_BIAS; + PPL_ASSERT(exponent_repr >= 0 && exponent_repr < (1 << EXPONENT_BITS)); + word |= static_cast<uint16_t>(exponent_repr) << MANTISSA_BITS; } inline int @@ -143,7 +145,9 @@ float_ieee754_single::build(bool negative, mpz_t mantissa, int exponent) { word = mpz_get_ui(mantissa) & ((1UL << MANTISSA_BITS) - 1); if (negative) word |= SGN_MASK; - word |= static_cast<uint32_t>(exponent + EXPONENT_BIAS) << MANTISSA_BITS; + int exponent_repr = exponent + EXPONENT_BIAS; + PPL_ASSERT(exponent_repr >= 0 && exponent_repr < (1 << EXPONENT_BITS)); + word |= static_cast<uint32_t>(exponent_repr) << MANTISSA_BITS; } inline int @@ -226,8 +230,9 @@ float_ieee754_double::build(bool negative, mpz_t mantissa, int exponent) { msp = m & ((1UL << (MANTISSA_BITS - 32)) - 1); if (negative) msp |= MSP_SGN_MASK; - msp |= static_cast<uint32_t>(exponent + EXPONENT_BIAS) - << (MANTISSA_BITS - 32); + int exponent_repr = exponent + EXPONENT_BIAS; + PPL_ASSERT(exponent_repr >= 0 && exponent_repr < (1 << EXPONENT_BITS)); + msp |= static_cast<uint32_t>(exponent_repr) << (MANTISSA_BITS - 32); } inline int @@ -285,7 +290,9 @@ float_ibm_single::build(bool negative, mpz_t mantissa, int exponent) { word = mpz_get_ui(mantissa) & ((1UL << MANTISSA_BITS) - 1); if (negative) word |= SGN_MASK; - word |= static_cast<uint32_t>(exponent + EXPONENT_BIAS) << MANTISSA_BITS; + int exponent_repr = exponent + EXPONENT_BIAS; + PPL_ASSERT(exponent_repr >= 0 && exponent_repr < (1 << EXPONENT_BITS)); + word |= static_cast<uint32_t>(exponent_repr) << MANTISSA_BITS; } inline int @@ -365,7 +372,9 @@ float_intel_double_extended::build(bool negative, lsp = mpz_get_ui(mantissa); #endif msp = (negative ? MSP_SGN_MASK : 0); - msp |= static_cast<uint32_t>(exponent + EXPONENT_BIAS); + int exponent_repr = exponent + EXPONENT_BIAS; + PPL_ASSERT(exponent_repr >= 0 && exponent_repr < (1 << EXPONENT_BITS)); + msp |= static_cast<uint32_t>(exponent_repr); } inline int @@ -443,8 +452,9 @@ float_ieee754_quad::build(bool negative, mpz_t mantissa, int exponent) { msp &= ((1ULL << (MANTISSA_BITS - 64)) - 1); if (negative) msp |= MSP_SGN_MASK; - msp |= static_cast<uint64_t>(exponent + EXPONENT_BIAS) - << (MANTISSA_BITS - 64); + int exponent_repr = exponent + EXPONENT_BIAS; + PPL_ASSERT(exponent_repr >= 0 && exponent_repr < (1 << EXPONENT_BITS)); + msp |= static_cast<uint64_t>(exponent_repr) << (MANTISSA_BITS - 64); } inline bool

1 0

[GIT] ppl/ppl(master): Removed trailing whitespace.
by Roberto Bagnara 29 Oct '11

29 Oct '11

Module: ppl/ppl Branch: master Commit: b3b76781cae62bf5ffc7e779d1275bc41f03a90b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b3b76781cae6… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Oct 29 14:40:31 2011 +0200 Removed trailing whitespace. --- src/Dense_Row.cc | 46 +++++++++++++++++++++++----------------------- src/Dense_Row.defs.hh | 18 +++++++++--------- src/Dense_Row.inlines.hh | 14 +++++++------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/Dense_Row.cc b/src/Dense_Row.cc index 9bfb45d..4f3ea60 100644 --- a/src/Dense_Row.cc +++ b/src/Dense_Row.cc @@ -45,13 +45,13 @@ PPL::Dense_Row::resize(dimension_type new_size) { dimension_type new_capacity = new_size; Coefficient* new_vec = static_cast<Coefficient*>( operator new(sizeof(Coefficient) * new_capacity)); - + if (impl.vec != 0) { memcpy(new_vec, impl.vec, sizeof(Coefficient) * impl.size); - + operator delete(impl.vec); } - + impl.vec = new_vec; impl.capacity = new_capacity; } @@ -69,56 +69,56 @@ PPL::Dense_Row::resize(dimension_type new_size) { void PPL::Dense_Row::resize(dimension_type new_size, dimension_type new_capacity) { PPL_ASSERT(new_size <= new_capacity); - + if (new_capacity == 0) { destroy(); impl.vec = 0; impl.size = 0; impl.capacity = 0; - + PPL_ASSERT(size() == new_size); PPL_ASSERT(capacity() == new_capacity); PPL_ASSERT(OK()); - + return; } - + if (new_capacity < capacity()) { - + shrink(new_size); - + PPL_ASSERT(impl.size == new_size); - + Coefficient* new_vec = static_cast<Coefficient*>( operator new(sizeof(Coefficient) * new_capacity)); - + PPL_ASSERT(impl.vec != 0); - + memcpy(new_vec, impl.vec, sizeof(Coefficient) * impl.size); - + operator delete(impl.vec); - + impl.vec = new_vec; impl.capacity = new_capacity; } else { if (new_capacity > capacity()) { - + Coefficient* new_vec = static_cast<Coefficient*>( operator new(sizeof(Coefficient) * new_capacity)); - + if (impl.vec != 0) { memcpy(new_vec, impl.vec, sizeof(Coefficient) * impl.size); - + operator delete(impl.vec); } - + impl.vec = new_vec; impl.capacity = new_capacity; - + resize(new_size); } } - + PPL_ASSERT(size() == new_size); PPL_ASSERT(capacity() == new_capacity); PPL_ASSERT(OK()); @@ -147,7 +147,7 @@ PPL::Dense_Row::shrink(dimension_type new_size) { --impl.size; impl.vec[impl.size].~Coefficient(); } - + PPL_ASSERT(size() == new_size); PPL_ASSERT(OK()); } @@ -387,7 +387,7 @@ PPL::Dense_Row::OK() const { #endif is_broken = true; } - + if (capacity() == 0) { if (impl.vec != 0) is_broken = true; @@ -434,7 +434,7 @@ bool PPL::operator==(const Dense_Row& x, const Dense_Row& y) { const dimension_type x_size = x.size(); const dimension_type y_size = y.size(); - + if (x_size != y_size) return false; diff --git a/src/Dense_Row.defs.hh b/src/Dense_Row.defs.hh index 3059fc6..6fd4186 100644 --- a/src/Dense_Row.defs.hh +++ b/src/Dense_Row.defs.hh @@ -49,7 +49,7 @@ public: Dense_Row(); explicit Dense_Row(const Sparse_Row& row); - + explicit Dense_Row(Flags f); //! Tight constructor: resizing may require reallocation. @@ -103,7 +103,7 @@ public: //! Swaps \p *this with \p y. void swap(Dense_Row& y); - + //! Resizes the row to \p sz. void resize(dimension_type sz); @@ -375,18 +375,18 @@ public: private: void init(const Sparse_Row& row); - + void destroy(); - + struct Impl { - + Impl(); - + ~Impl(); - + //! The number of coefficients in the row. dimension_type size; - + //! The capacity of the row. dimension_type capacity; @@ -397,7 +397,7 @@ private: //! An empty vector may be stored as NULL instead of using a valid pointer. Coefficient* vec; }; - + Impl impl; //! Returns the capacity of the row. diff --git a/src/Dense_Row.inlines.hh b/src/Dense_Row.inlines.hh index d65716a..9a47264 100644 --- a/src/Dense_Row.inlines.hh +++ b/src/Dense_Row.inlines.hh @@ -84,7 +84,7 @@ Dense_Row::Dense_Row() inline Dense_Row::Dense_Row(Flags f) : impl() { - + impl.flags = f; PPL_ASSERT(OK()); @@ -154,7 +154,7 @@ Dense_Row::Dense_Row(const Dense_Row& y, ++impl.size; } } - + PPL_ASSERT(size() == y.size()); PPL_ASSERT(impl.capacity = capacity); PPL_ASSERT(OK()); @@ -169,13 +169,13 @@ Dense_Row::Dense_Row(const Dense_Row& y, PPL_ASSERT(sz <= capacity); PPL_ASSERT(capacity <= max_size()); PPL_ASSERT(capacity != 0); - + impl.flags = y.flags(); - + impl.vec = static_cast<Coefficient*>( operator new(sizeof(Coefficient) * capacity)); impl.capacity = capacity; - + dimension_type n = std::min(sz, y.size()); while (impl.size != n) { new (&impl.vec[impl.size]) Coefficient(y[impl.size]); @@ -185,7 +185,7 @@ Dense_Row::Dense_Row(const Dense_Row& y, new (&impl.vec[impl.size]) Coefficient(); ++impl.size; } - + PPL_ASSERT(size() == sz); PPL_ASSERT(impl.capacity = capacity); PPL_ASSERT(OK()); @@ -214,7 +214,7 @@ Dense_Row::swap(Dense_Row& y) { inline Dense_Row& Dense_Row::operator=(const Dense_Row& y) { - + Dense_Row x(y); std::swap(*this, x);

1 0

[GIT] ppl/ppl(master): Avoid unsigned integer wrap-around in constant expressions.
by Marco Poletti 29 Oct '11

29 Oct '11

Module: ppl/ppl Branch: master Commit: 249b7edacac0f34bfb2daa1be601fc1aeff20874 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=249b7edacac0… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Oct 29 14:04:21 2011 +0200 Avoid unsigned integer wrap-around in constant expressions. Detected by ECLAIR service cnstwrap. --- src/CO_Tree.defs.hh | 4 ++-- src/CO_Tree.inlines.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CO_Tree.defs.hh b/src/CO_Tree.defs.hh index f565ffd..fe72838 100644 --- a/src/CO_Tree.defs.hh +++ b/src/CO_Tree.defs.hh @@ -106,7 +106,7 @@ private: //! This is used for node heights and depths in the tree. typedef unsigned height_t; - PPL_COMPILE_TIME_CHECK(-(height_t)1 >= CHAR_BITS*sizeof(dimension_type), + PPL_COMPILE_TIME_CHECK(C_Integer<height_t>::max >= CHAR_BITS*sizeof(dimension_type), "height_t is too small to store depths."); class tree_iterator; @@ -1251,7 +1251,7 @@ private: /*! This must not be used as a key. */ - static const dimension_type unused_index = -(dimension_type)1; + static const dimension_type unused_index = C_Integer<dimension_type>::max; //! The %iterator returned by end(). /*! diff --git a/src/CO_Tree.inlines.hh b/src/CO_Tree.inlines.hh index 8d12bab..9ff72a7 100644 --- a/src/CO_Tree.inlines.hh +++ b/src/CO_Tree.inlines.hh @@ -99,7 +99,7 @@ CO_Tree::size() const { inline dimension_type CO_Tree::max_size() { - return (-dimension_type(1))/100; + return C_Integer<dimension_type>::max/100; } inline void

1 0

[GIT] ppl/ppl(master): Avoid implementation-defined behavior by having bitfields of explicit unsigned integral type .
by Roberto Bagnara 28 Oct '11

28 Oct '11

Module: ppl/ppl Branch: master Commit: 3ab4d6ede25cc2a5266a4d73da06e7908bf2074d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3ab4d6ede25c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Oct 28 17:43:43 2011 +0200 Avoid implementation-defined behavior by having bitfields of explicit unsigned integral type. Detected by ECLAIR service bitftype. --- src/Concrete_Expression.defs.hh | 11 +++++------ src/Concrete_Expression.inlines.hh | 12 ++++++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/Concrete_Expression.defs.hh b/src/Concrete_Expression.defs.hh index f7ce588..7860a57 100644 --- a/src/Concrete_Expression.defs.hh +++ b/src/Concrete_Expression.defs.hh @@ -66,8 +66,7 @@ public: The behavior is undefined if \p *this does not encode a bounded integer type. */ - Bounded_Integer_Type_Width - bounded_integer_type_width() const; + Bounded_Integer_Type_Width bounded_integer_type_width() const; /*! \brief Returns the representation of the bounded integer type encoded by @@ -104,10 +103,10 @@ private: //! A 32-bit word encoding the type. struct Implementation { unsigned int bounded_integer:1; - Bounded_Integer_Type_Width bounded_integer_type_width:23; - Bounded_Integer_Type_Representation bounded_integer_type_representation:2; - Bounded_Integer_Type_Overflow bounded_integer_type_overflow:2; - Floating_Point_Format floating_point_format:4; + unsigned int bounded_integer_type_width:23; + unsigned int bounded_integer_type_representation:2; + unsigned int bounded_integer_type_overflow:2; + unsigned int floating_point_format:4; }; //! Constructor from \p implementation. diff --git a/src/Concrete_Expression.inlines.hh b/src/Concrete_Expression.inlines.hh index 952ada9..b12963a 100644 --- a/src/Concrete_Expression.inlines.hh +++ b/src/Concrete_Expression.inlines.hh @@ -71,22 +71,26 @@ Concrete_Expression_Type::is_floating_point() const { inline Bounded_Integer_Type_Width Concrete_Expression_Type::bounded_integer_type_width() const { - return impl.bounded_integer_type_width; + unsigned int u = impl.bounded_integer_type_width; + return static_cast<Bounded_Integer_Type_Width>(u); } inline Bounded_Integer_Type_Representation Concrete_Expression_Type::bounded_integer_type_representation() const { - return impl.bounded_integer_type_representation; + unsigned int u = impl.bounded_integer_type_representation; + return static_cast<Bounded_Integer_Type_Representation>(u); } inline Bounded_Integer_Type_Overflow Concrete_Expression_Type::bounded_integer_type_overflow() const { - return impl.bounded_integer_type_overflow; + unsigned int u = impl.bounded_integer_type_overflow; + return static_cast<Bounded_Integer_Type_Overflow>(u); } inline Floating_Point_Format Concrete_Expression_Type::floating_point_format() const { - return impl.floating_point_format; + unsigned int u = impl.floating_point_format; + return static_cast<Floating_Point_Format>(u); } template <typename Target>

1 0

[GIT] ppl/ppl(master): Do not reuse names reserved by the C++ implementation.
by Roberto Bagnara 28 Oct '11

28 Oct '11

Module: ppl/ppl Branch: master Commit: 5fd73820eeed37dc88ba30093a6fdc8b8b566acd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5fd73820eeed… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Oct 28 16:54:23 2011 +0200 Do not reuse names reserved by the C++ implementation. Detected by ECLAIR service resvidnt. --- src/checked_float.inlines.hh | 44 ++++++++++++++++++++--------------------- src/checked_int.inlines.hh | 6 ++-- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index a11df84..b8685b2 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -800,31 +800,30 @@ set_pos_overflow_float(T& to, Rounding_Dir dir) { template <typename To_Policy, typename From_Policy, typename T> inline Result -assign_float_mpz(T& to, const mpz_class& _from, Rounding_Dir dir) -{ - mpz_srcptr from = _from.get_mpz_t(); - int sign = mpz_sgn(from); +assign_float_mpz(T& to, const mpz_class& from, Rounding_Dir dir) { + mpz_srcptr from_z = from.get_mpz_t(); + int sign = mpz_sgn(from_z); if (sign == 0) { to = 0; return V_EQ; } - size_t exponent = mpz_sizeinbase(from, 2) - 1; + size_t exponent = mpz_sizeinbase(from_z, 2) - 1; if (exponent > size_t(Float<T>::Binary::EXPONENT_MAX)) { if (sign < 0) return set_neg_overflow_float<To_Policy>(to, dir); else return set_pos_overflow_float<To_Policy>(to, dir); } - unsigned long zeroes = mpn_scan1(from->_mp_d, 0); + unsigned long zeroes = mpn_scan1(from_z->_mp_d, 0); size_t meaningful_bits = exponent - zeroes; mpz_t mantissa; mpz_init(mantissa); if (exponent > Float<T>::Binary::MANTISSA_BITS) mpz_tdiv_q_2exp(mantissa, - from, + from_z, exponent - Float<T>::Binary::MANTISSA_BITS); else - mpz_mul_2exp(mantissa, from, Float<T>::Binary::MANTISSA_BITS - exponent); + mpz_mul_2exp(mantissa, from_z, Float<T>::Binary::MANTISSA_BITS - exponent); Float<T> f; f.u.binary.build(sign < 0, mantissa, exponent); mpz_clear(mantissa); @@ -840,16 +839,15 @@ assign_float_mpz(T& to, const mpz_class& _from, Rounding_Dir dir) template <typename To_Policy, typename From_Policy, typename T> inline Result -assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) -{ - const mpz_class& _num = from.get_num(); - const mpz_class& _den = from.get_den(); - if (_den == 1) - return assign_float_mpz<To_Policy, From_Policy>(to, _num, dir); - mpz_srcptr num = _num.get_mpz_t(); - mpz_srcptr den = _den.get_mpz_t(); - int sign = mpz_sgn(num); - signed long exponent = mpz_sizeinbase(num, 2) - mpz_sizeinbase(den, 2); +assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { + const mpz_class& num = from.get_num(); + const mpz_class& den = from.get_den(); + if (den == 1) + return assign_float_mpz<To_Policy, From_Policy>(to, num, dir); + mpz_srcptr num_z = num.get_mpz_t(); + mpz_srcptr den_z = den.get_mpz_t(); + int sign = mpz_sgn(num_z); + signed long exponent = mpz_sizeinbase(num_z, 2) - mpz_sizeinbase(den_z, 2); if (exponent < Float<T>::Binary::EXPONENT_MIN_DENORM) { to = 0; inexact: @@ -872,16 +870,16 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) mpz_init(mantissa); signed long shift = needed_bits - exponent; if (shift > 0) { - mpz_mul_2exp(mantissa, num, shift); - num = mantissa; + mpz_mul_2exp(mantissa, num_z, shift); + num_z = mantissa; } else if (shift < 0) { - mpz_mul_2exp(mantissa, den, -shift); - den = mantissa; + mpz_mul_2exp(mantissa, den_z, -shift); + den_z = mantissa; } mpz_t r; mpz_init(r); - mpz_tdiv_qr(mantissa, r, num, den); + mpz_tdiv_qr(mantissa, r, num_z, den_z); size_t bits = mpz_sizeinbase(mantissa, 2); bool inexact = (mpz_sgn(r) != 0); mpz_clear(r); diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index c194de7..10ab8da 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -702,9 +702,9 @@ assign_int_mpq(To& to, const mpq_class& from, Rounding_Dir dir) { mpz_srcptr n = from.get_num().get_mpz_t(); mpz_srcptr d = from.get_den().get_mpz_t(); PPL_DIRTY_TEMP(mpz_class, q); - mpz_ptr _q = q.get_mpz_t(); + mpz_ptr q_z = q.get_mpz_t(); if (round_not_requested(dir)) { - mpz_tdiv_q(_q, n, d); + mpz_tdiv_q(q_z, n, d); Result r = assign<To_Policy, void>(to, q, dir); if (r != V_EQ) return r; @@ -713,7 +713,7 @@ assign_int_mpq(To& to, const mpq_class& from, Rounding_Dir dir) { mpz_t rem; int sign; mpz_init(rem); - mpz_tdiv_qr(_q, rem, n, d); + mpz_tdiv_qr(q_z, rem, n, d); sign = mpz_sgn(rem); mpz_clear(rem); Result r = assign<To_Policy, void>(to, q, dir);

1 0

[GIT] ppl/ppl(master): Avoid anonymous namespaces in header files.
by Roberto Bagnara 28 Oct '11

28 Oct '11

Module: ppl/ppl Branch: master Commit: 667dc51aa88cb9fe27ce4dea732f32684dea992d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=667dc51aa88c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Oct 28 07:54:42 2011 +0200 Avoid anonymous namespaces in header files. Detected by ECLAIR service hedrfile. --- src/Bit_Matrix.cc | 4 ++-- src/Linear_System.cc | 10 ++++++---- src/swapping_sort.templates.hh | 9 +++++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/Bit_Matrix.cc b/src/Bit_Matrix.cc index e471ec0..e93c8ae 100644 --- a/src/Bit_Matrix.cc +++ b/src/Bit_Matrix.cc @@ -46,9 +46,9 @@ PPL::Bit_Matrix::sort_rows() { // Sorting without removing duplicates. Iter first = rows.begin(); Iter last = rows.end(); - swapping_sort(first, last, Bit_Row_Less_Than()); + Implementation::swapping_sort(first, last, Bit_Row_Less_Than()); // Moving all the duplicate elements at the end of the vector. - Iter new_last = swapping_unique(first, last); + Iter new_last = Implementation::swapping_unique(first, last); // Removing duplicates. rows.erase(new_last, last); PPL_ASSERT(OK()); diff --git a/src/Linear_System.cc b/src/Linear_System.cc index 944b87e..11cf0e0 100644 --- a/src/Linear_System.cc +++ b/src/Linear_System.cc @@ -334,9 +334,10 @@ PPL::Linear_System::sort_rows(const dimension_type first_row, // First sort without removing duplicates. std::vector<Dense_Row>::iterator first = rows.begin() + first_row; std::vector<Dense_Row>::iterator last = rows.begin() + last_row; - swapping_sort(first, last, Row_Less_Than()); + Implementation::swapping_sort(first, last, Row_Less_Than()); // Second, move duplicates to the end. - std::vector<Dense_Row>::iterator new_last = swapping_unique(first, last); + std::vector<Dense_Row>::iterator new_last + = Implementation::swapping_unique(first, last); // Finally, remove duplicates. rows.erase(new_last, last); // NOTE: we cannot check all invariants of the system here, @@ -512,9 +513,10 @@ 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(); - swapping_sort(first, last, Row_Less_Than()); + 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 = swapping_unique(first, last); + With_Bit_Matrix_iterator new_last + = Implementation::swapping_unique(first, last); const dimension_type num_duplicates = last - new_last; const dimension_type new_first_pending_row diff --git a/src/swapping_sort.templates.hh b/src/swapping_sort.templates.hh index 4abea40..f258050 100644 --- a/src/swapping_sort.templates.hh +++ b/src/swapping_sort.templates.hh @@ -27,7 +27,10 @@ site: http://bugseng.com/products/ppl/ . */ #include <iterator> #include <algorithm> -namespace { +namespace Parma_Polyhedra_Library { + +namespace Implementation { + /* This sorting algorithm avoids (almost all) copies of objects by performing more iter_swap's: it is meant to be used when @@ -137,6 +140,8 @@ swapping_unique(Iter first, Iter last) { return ++current; } -} // namespace +} // namespace Implementation + +} // namespace Parma_Polyhedra_Library #endif // !defined(PPL_swapping_sort_icc)

1 0

[GIT] ppl/ppl(master): Source file renamed.
by Roberto Bagnara 28 Oct '11

28 Oct '11

Module: ppl/ppl Branch: master Commit: 51134e95761a24da9e59f4c8bc6a4080bad536f3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=51134e95761a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Oct 28 07:49:48 2011 +0200 Source file renamed. --- src/Bit_Matrix.cc | 3 +-- src/Linear_System.cc | 3 +-- src/Makefile.am | 2 +- ...wapping_sort.icc => swapping_sort.templates.hh} | 0 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Bit_Matrix.cc b/src/Bit_Matrix.cc index d142ce3..e471ec0 100644 --- a/src/Bit_Matrix.cc +++ b/src/Bit_Matrix.cc @@ -25,12 +25,11 @@ site: http://bugseng.com/products/ppl/ . */ #include "Bit_Matrix.defs.hh" #include "globals.defs.hh" +#include "swapping_sort.templates.hh" #include <iostream> #include <string> #include <climits> -#include "swapping_sort.icc" - namespace PPL = Parma_Polyhedra_Library; PPL::Bit_Matrix& diff --git a/src/Linear_System.cc b/src/Linear_System.cc index 39c001d..944b87e 100644 --- a/src/Linear_System.cc +++ b/src/Linear_System.cc @@ -28,13 +28,12 @@ site: http://bugseng.com/products/ppl/ . */ #include "Dense_Row.defs.hh" #include "Bit_Matrix.defs.hh" #include "Scalar_Products.defs.hh" +#include "swapping_sort.templates.hh" #include <algorithm> #include <iostream> #include <string> #include <deque> -#include "swapping_sort.icc" - namespace PPL = Parma_Polyhedra_Library; PPL::dimension_type diff --git a/src/Makefile.am b/src/Makefile.am index 9196e8e..d674d6a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -498,7 +498,7 @@ Weight_Profiler.cc \ version.cc \ $(INCLUDE_FILES) \ $(NESTED_INCLUDE_FILES) \ -swapping_sort.icc \ +swapping_sort.templates.hh \ termination.cc \ wrap_string.cc #Pointset_Ask_Tell.cc diff --git a/src/swapping_sort.icc b/src/swapping_sort.templates.hh similarity index 100% rename from src/swapping_sort.icc rename to src/swapping_sort.templates.hh

1 0