February 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Exploit operator| overloading for Rounding_Dir.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: bb321df039bce4988dc316523b88546e8c2dd057 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bb321df039bc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 17:28:02 2012 +0100 Exploit operator| overloading for Rounding_Dir. --- src/Boundary.defs.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Boundary.defs.hh b/src/Boundary.defs.hh index 72d8858..58fb3cf 100644 --- a/src/Boundary.defs.hh +++ b/src/Boundary.defs.hh @@ -57,7 +57,7 @@ enum Boundary_Type { inline Rounding_Dir round_dir_check(Boundary_Type t, bool check = false) { if (check) - return static_cast<Rounding_Dir>(t | ROUND_STRICT_RELATION); + return static_cast<Rounding_Dir>(t) | ROUND_STRICT_RELATION; else return static_cast<Rounding_Dir>(t); }

1 0

[GIT] ppl/ppl(master): Let bitwise operators be applied to unsigned integer types.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 58a8be4d4b1d493d01074409b87fe34ddfa09c05 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=58a8be4d4b1d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 17:27:12 2012 +0100 Let bitwise operators be applied to unsigned integer types. Detected by ECLAIR service utypflag. --- src/Bit_Row.cc | 2 +- src/Float.defs.hh | 12 ++++++------ src/Interval.defs.hh | 3 ++- src/intervals.defs.hh | 8 ++++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index 47f153c..9fec973 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -140,7 +140,7 @@ PPL::Bit_Row::operator[](const unsigned long k) const { return false; mp_limb_t limb = *(vec->_mp_d + i); - return ((limb >> (k % GMP_NUMB_BITS)) & 1) != 0; + return ((limb >> (k % GMP_NUMB_BITS)) & 1U) != 0; } void diff --git a/src/Float.defs.hh b/src/Float.defs.hh index 597b2dc..1b29841 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -59,7 +59,7 @@ struct float_ieee754_half { static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 5; static const unsigned int MANTISSA_BITS = 10; - static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1U << (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 @@ -92,7 +92,7 @@ struct float_ieee754_single { static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 8; static const unsigned int MANTISSA_BITS = 23; - static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1U << (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 @@ -138,7 +138,7 @@ struct float_ieee754_double { static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 11; static const unsigned int MANTISSA_BITS = 52; - static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1U << (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 @@ -171,7 +171,7 @@ struct float_ibm_single { static const unsigned int EXPONENT_BITS = 7; static const unsigned int MANTISSA_BITS = 24; static const int EXPONENT_BIAS = 64; - static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1U << (EXPONENT_BITS - 1)) - 1; static const int EXPONENT_MIN = -EXPONENT_MAX + 1; static const int EXPONENT_MIN_DENORM = EXPONENT_MIN - static_cast<int>(MANTISSA_BITS); @@ -222,7 +222,7 @@ struct float_intel_double_extended { static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 15; static const unsigned int MANTISSA_BITS = 63; - static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1U << (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 @@ -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 = (1 << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1U << (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/Interval.defs.hh b/src/Interval.defs.hh index bd0045b..843d17e 100644 --- a/src/Interval.defs.hh +++ b/src/Interval.defs.hh @@ -41,7 +41,8 @@ enum Ternary { T_YES, T_NO, T_MAYBE }; inline I_Result combine(Result l, Result u) { - return static_cast<I_Result>(l | (u << 6)); + unsigned res = static_cast<unsigned>(l) | (static_cast<unsigned>(u) << 6); + return static_cast<I_Result>(res); } struct Interval_Base { diff --git a/src/intervals.defs.hh b/src/intervals.defs.hh index 072b406..29c1081 100644 --- a/src/intervals.defs.hh +++ b/src/intervals.defs.hh @@ -33,13 +33,13 @@ namespace Parma_Polyhedra_Library { enum I_Result { //! The resulting set may be empty - I_EMPTY = 1, + I_EMPTY = 1U, //! The resulting set may have only one value - I_SINGLETON = 2, + I_SINGLETON = 2U, //! The resulting set may have more than one value and to be not the domain universe - I_SOME = 4, + I_SOME = 4U, //! The resulting set may be the domain universe - I_UNIVERSE = 8, + I_UNIVERSE = 8U, //! The resulting set is not empty I_NOT_EMPTY = I_SINGLETON | I_SOME | I_UNIVERSE, //! The resulting set may be empty or not empty

1 0

[GIT] ppl/ppl(master): Let bitwise operators be applied to unsigned integer types.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 73a3335f0a0974c903e88c4cd4b7107fb779bbcb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=73a3335f0a09… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 17:23:49 2012 +0100 Let bitwise operators be applied to unsigned integer types. Detected by ECLAIR service utypflag. --- src/Result.defs.hh | 62 ++++++++++++++++++++++++++----------------------- src/Result.inlines.hh | 39 +++++++++++++++++++++--------- src/globals.types.hh | 6 ++-- 3 files changed, 63 insertions(+), 44 deletions(-) diff --git a/src/Result.defs.hh b/src/Result.defs.hh index e59147d..35eac7a 100644 --- a/src/Result.defs.hh +++ b/src/Result.defs.hh @@ -28,16 +28,16 @@ namespace Parma_Polyhedra_Library { enum Result_Class { //! \hideinitializer Representable number result class. - VC_NORMAL = 0 << 4, + VC_NORMAL = 0U << 4, //! \hideinitializer Negative infinity result class. - VC_MINUS_INFINITY = 1 << 4, + VC_MINUS_INFINITY = 1U << 4, //! \hideinitializer Positive infinity result class. - VC_PLUS_INFINITY = 2 << 4, + VC_PLUS_INFINITY = 2U << 4, //! \hideinitializer Not a number result class. - VC_NAN = 3 << 4, + VC_NAN = 3U << 4, VC_MASK = VC_NAN }; @@ -45,16 +45,16 @@ enum Result_Class { // This must be kept in sync with Relation_Symbol enum Result_Relation { //! \hideinitializer No values satisfies the relation. - VR_EMPTY = 0, + VR_EMPTY = 0U, //! \hideinitializer Equal. This need to be accompanied by a value. - VR_EQ = 1, + VR_EQ = 1U, //! \hideinitializer Less than. This need to be accompanied by a value. - VR_LT = 2, + VR_LT = 2U, //! \hideinitializer Greater than. This need to be accompanied by a value. - VR_GT = 4, + VR_GT = 4U, //! \hideinitializer Not equal. This need to be accompanied by a value. VR_NE = VR_LT | VR_GT, @@ -78,13 +78,13 @@ enum Result { V_EMPTY = VR_EMPTY, //! \hideinitializer The computed result is exact. - V_EQ = VR_EQ, + V_EQ = static_cast<unsigned>(VR_EQ), //! \hideinitializer The computed result is inexact and rounded up. - V_LT = VR_LT, + V_LT = static_cast<unsigned>(VR_LT), //! \hideinitializer The computed result is inexact and rounded down. - V_GT = VR_GT, + V_GT = static_cast<unsigned>(VR_GT), //! \hideinitializer The computed result is inexact. V_NE = VR_NE, @@ -99,7 +99,7 @@ enum Result { V_LGE = VR_LGE, //! \hideinitializer The exact result is a number out of finite bounds. - V_OVERFLOW = 1 << 6, + V_OVERFLOW = 1U << 6, //! \hideinitializer A negative integer overflow occurred (rounding up). V_LT_INF = V_LT | V_OVERFLOW, @@ -108,58 +108,62 @@ enum Result { V_GT_SUP = V_GT | V_OVERFLOW, //! \hideinitializer A positive integer overflow occurred (rounding up). - V_LT_PLUS_INFINITY = V_LT | VC_PLUS_INFINITY, + V_LT_PLUS_INFINITY = V_LT | static_cast<unsigned>(VC_PLUS_INFINITY), //! \hideinitializer A negative integer overflow occurred (rounding down). - V_GT_MINUS_INFINITY = V_GT | VC_MINUS_INFINITY, + V_GT_MINUS_INFINITY = V_GT | static_cast<unsigned>(VC_MINUS_INFINITY), //! \hideinitializer Negative infinity result. - V_EQ_MINUS_INFINITY = V_EQ | VC_MINUS_INFINITY, + V_EQ_MINUS_INFINITY = V_EQ | static_cast<unsigned>(VC_MINUS_INFINITY), //! \hideinitializer Positive infinity result. - V_EQ_PLUS_INFINITY = V_EQ | VC_PLUS_INFINITY, + V_EQ_PLUS_INFINITY = V_EQ | static_cast<unsigned>(VC_PLUS_INFINITY), //! \hideinitializer Not a number result. - V_NAN = VC_NAN, + V_NAN = static_cast<unsigned>(VC_NAN), //! \hideinitializer Converting from unknown string. - V_CVT_STR_UNK = V_NAN | (1 << 8), + V_CVT_STR_UNK = V_NAN | (1U << 8), //! \hideinitializer Dividing by zero. - V_DIV_ZERO = V_NAN | (2 << 8), + V_DIV_ZERO = V_NAN | (2U << 8), //! \hideinitializer Adding two infinities having opposite signs. - V_INF_ADD_INF = V_NAN | (3 << 8), + V_INF_ADD_INF = V_NAN | (3U << 8), //! \hideinitializer Dividing two infinities. - V_INF_DIV_INF = V_NAN | (4 << 8), + V_INF_DIV_INF = V_NAN | (4U << 8), //! \hideinitializer Taking the modulus of an infinity. - V_INF_MOD = V_NAN | (5 << 8), + V_INF_MOD = V_NAN | (5U << 8), //! \hideinitializer Multiplying an infinity by zero. - V_INF_MUL_ZERO = V_NAN | (6 << 8), + V_INF_MUL_ZERO = V_NAN | (6U << 8), //! \hideinitializer Subtracting two infinities having the same sign. - V_INF_SUB_INF = V_NAN | (7 << 8), + V_INF_SUB_INF = V_NAN | (7U << 8), //! \hideinitializer Computing a remainder modulo zero. - V_MOD_ZERO = V_NAN | (8 << 8), + V_MOD_ZERO = V_NAN | (8U << 8), //! \hideinitializer Taking the square root of a negative number. - V_SQRT_NEG = V_NAN | (9 << 8), + V_SQRT_NEG = V_NAN | (9U << 8), //! \hideinitializer Unknown result due to intermediate negative overflow. - V_UNKNOWN_NEG_OVERFLOW = V_NAN | (10 << 8), + V_UNKNOWN_NEG_OVERFLOW = V_NAN | (10U << 8), //! \hideinitializer Unknown result due to intermediate positive overflow. - V_UNKNOWN_POS_OVERFLOW = V_NAN | (11 << 8), + V_UNKNOWN_POS_OVERFLOW = V_NAN | (11U << 8), //! \hideinitializer The computed result is not representable. - V_UNREPRESENTABLE = 1 << 7 + V_UNREPRESENTABLE = 1U << 7 }; +Result operator&(Result x, Result y); +Result operator|(Result x, Result y); +Result operator-(Result x, Result y); + //! Extracts the value class part of \p r (representable number, unrepresentable minus/plus infinity or nan). Result_Class result_class(Result r); diff --git a/src/Result.inlines.hh b/src/Result.inlines.hh index 36e754d..5141347 100644 --- a/src/Result.inlines.hh +++ b/src/Result.inlines.hh @@ -29,21 +29,44 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { /*! \relates Parma_Polyhedra_Library::Result */ +inline Result +operator&(Result x, Result y) { + unsigned res = static_cast<unsigned>(x) & static_cast<unsigned>(y); + return static_cast<Result>(res); +} + +/*! \relates Parma_Polyhedra_Library::Result */ +inline Result +operator|(Result x, Result y) { + unsigned res = static_cast<unsigned>(x) | static_cast<unsigned>(y); + return static_cast<Result>(res); +} + +/*! \relates Parma_Polyhedra_Library::Result */ +inline Result +operator-(Result x, Result y) { + Result y_neg = static_cast<Result>(~static_cast<unsigned>(y)); + return x & y_neg; +} + +/*! \relates Parma_Polyhedra_Library::Result */ inline Result_Class result_class(Result r) { - return static_cast<Result_Class>(r & VC_MASK); + Result rc = r & static_cast<Result>(VC_MASK); + return static_cast<Result_Class>(rc); } /*! \relates Parma_Polyhedra_Library::Result */ inline Result_Relation result_relation(Result r) { - return static_cast<Result_Relation>(r & VR_MASK); + Result rc = r & static_cast<Result>(VR_MASK); + return static_cast<Result_Relation>(rc); } /*! \relates Parma_Polyhedra_Library::Result */ inline Result result_relation_class(Result r) { - return static_cast<Result>(r & (VR_MASK | VC_MASK)); + return r & (static_cast<Result>(VR_MASK) | static_cast<Result>(VC_MASK)); } inline int @@ -71,15 +94,7 @@ result_overflow(Result r) { inline bool result_representable(Result r) { - return (r & V_UNREPRESENTABLE) == 0; -} - -inline Result operator|(Result a, Result b) { - return static_cast<Result>((unsigned)a | (unsigned)b); -} - -inline Result operator-(Result a, Result b) { - return static_cast<Result>((unsigned)a & ~(unsigned)b); + return (r & V_UNREPRESENTABLE) != V_UNREPRESENTABLE; } } // namespace Parma_Polyhedra_Library diff --git a/src/globals.types.hh b/src/globals.types.hh index a74a80b..91cb692 100644 --- a/src/globals.types.hh +++ b/src/globals.types.hh @@ -39,13 +39,13 @@ enum Degenerate_Element { // This must be kept in sync with Result enum Relation_Symbol { //! \hideinitializer Equal to. - EQUAL = 1, + EQUAL = 1U, //! \hideinitializer Less than. - LESS_THAN = 2, + LESS_THAN = 2U, //! \hideinitializer Less than or equal to. LESS_OR_EQUAL = LESS_THAN | EQUAL, //! \hideinitializer Greater than. - GREATER_THAN = 4, + GREATER_THAN = 4U, //! \hideinitializer Greater than or equal to. GREATER_OR_EQUAL = GREATER_THAN | EQUAL, //! \hideinitializer Not equal to.

1 0

[GIT] ppl/ppl(master): Let bitwise operators be applied to unsigned integer types.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 803576355bab1ffbad948d7d5a75be21121765dc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=803576355bab… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 16:55:20 2012 +0100 Let bitwise operators be applied to unsigned integer types. Detected by ECLAIR service utypflag. --- src/Rounding_Dir.defs.hh | 15 +++++++++------ src/Rounding_Dir.inlines.hh | 42 +++++++++++++++++++++++++++++------------- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/src/Rounding_Dir.defs.hh b/src/Rounding_Dir.defs.hh index e1d9a1d..15c7d63 100644 --- a/src/Rounding_Dir.defs.hh +++ b/src/Rounding_Dir.defs.hh @@ -35,17 +35,17 @@ enum Rounding_Dir { /*! \hideinitializer Round toward \f$-\infty\f$. */ - ROUND_DOWN = 0, + ROUND_DOWN = 0U, /*! \hideinitializer Round toward \f$+\infty\f$. */ - ROUND_UP = 1, + ROUND_UP = 1U, /*! \hideinitializer Rounding is delegated to lower level. Result info is evaluated lazily. */ - ROUND_IGNORE = 6, + ROUND_IGNORE = 6U, ROUND_NATIVE = ROUND_IGNORE, /*! \hideinitializer @@ -53,22 +53,25 @@ enum Rounding_Dir { result is exact and representable in the destination type. Result info is evaluated lazily. */ - ROUND_NOT_NEEDED = 7, + ROUND_NOT_NEEDED = 7U, ROUND_DIRECT = ROUND_UP, ROUND_INVERSE = ROUND_DOWN, - ROUND_DIR_MASK = 7, + ROUND_DIR_MASK = 7U, /*! \hideinitializer The client code is willing to pay an extra price to know the exact relation between the exact result and the computed one. */ - ROUND_STRICT_RELATION = 8, + ROUND_STRICT_RELATION = 8U, ROUND_CHECK = ROUND_DIRECT | ROUND_STRICT_RELATION }; +Rounding_Dir operator&(Rounding_Dir x, Rounding_Dir y); +Rounding_Dir operator|(Rounding_Dir x, Rounding_Dir y); + /*! \brief Returns the inverse rounding mode of \p dir, <CODE>ROUND_IGNORE</CODE> being the inverse of itself. diff --git a/src/Rounding_Dir.inlines.hh b/src/Rounding_Dir.inlines.hh index af2de1c..12b9823 100644 --- a/src/Rounding_Dir.inlines.hh +++ b/src/Rounding_Dir.inlines.hh @@ -28,53 +28,77 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ +inline Rounding_Dir +operator&(Rounding_Dir x, Rounding_Dir y) { + unsigned res = static_cast<unsigned>(x) & static_cast<unsigned>(y); + return static_cast<Rounding_Dir>(res); +} + +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ +inline Rounding_Dir +operator|(Rounding_Dir x, Rounding_Dir y) { + unsigned res = static_cast<unsigned>(x) | static_cast<unsigned>(y); + return static_cast<Rounding_Dir>(res); +} + +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline Rounding_Dir round_dir(Rounding_Dir dir) { - return static_cast<Rounding_Dir>(dir & ROUND_DIR_MASK); + return dir & ROUND_DIR_MASK; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_down(Rounding_Dir dir) { return round_dir(dir) == ROUND_DOWN; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_up(Rounding_Dir dir) { return round_dir(dir) == ROUND_UP; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_ignore(Rounding_Dir dir) { return round_dir(dir) == ROUND_IGNORE; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_not_needed(Rounding_Dir dir) { return round_dir(dir) == ROUND_NOT_NEEDED; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_not_requested(Rounding_Dir dir) { return round_dir(dir) == ROUND_IGNORE || round_dir(dir) == ROUND_NOT_NEEDED; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_direct(Rounding_Dir dir) { return round_dir(dir) == ROUND_DIRECT; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_inverse(Rounding_Dir dir) { return round_dir(dir) == ROUND_INVERSE; } +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline bool round_strict_relation(Rounding_Dir dir) { - return (dir & ROUND_STRICT_RELATION) != 0; + return (dir & ROUND_STRICT_RELATION) == ROUND_STRICT_RELATION; } #if PPL_CAN_CONTROL_FPU +/*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline fpu_rounding_direction_type round_fpu_dir(Rounding_Dir dir) { switch (round_dir(dir)) { @@ -99,25 +123,17 @@ round_fpu_dir(Rounding_Dir dir) { /*! \relates Parma_Polyhedra_Library::Rounding_Dir */ inline Rounding_Dir inverse(Rounding_Dir dir) { - Rounding_Dir d = round_dir(dir); - switch (d) { + switch (round_dir(dir)) { case ROUND_UP: - d = ROUND_DOWN; - break; + return ROUND_DOWN | (dir & ROUND_STRICT_RELATION); case ROUND_DOWN: - d = ROUND_UP; - break; + return ROUND_UP | (dir & ROUND_STRICT_RELATION); case ROUND_IGNORE: return dir; default: PPL_UNREACHABLE; return dir; } - return static_cast<Rounding_Dir>((dir & ~ROUND_DIR_MASK) | d); -} - -inline Rounding_Dir operator|(Rounding_Dir x, Rounding_Dir y) { - return static_cast<Rounding_Dir>((unsigned)x | (unsigned)y); } } // namespace Parma_Polyhedra_Library

1 0

[GIT] ppl/ppl(master): Add the release date for PPL 0.11.2.
by Enea Zaffanella 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 6f0c06f03f3034842f06d7c99d4a56f9e08549ac URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6f0c06f03f30… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 20 14:23:24 2012 +0100 Add the release date for PPL 0.11.2. Mention a couple of bugs that have been corrected. --- NEWS | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index f5dd9ea..9809f66 100644 --- a/NEWS +++ b/NEWS @@ -44,8 +44,28 @@ o The input routine for PPL numeric datatypes has been extended to accept the ISO9899 (C99) hexadecimal floating constant syntax. +Bugfixes +======== + +o Corrected a precision bug in methods + + Box<ITV>::upper_bound_assign(const Box&) + Box<ITV>::upper_bound_assign_if_exact(const Box&) + + whereby, provided any argument is an empty box and under other rather + specific conditions, the computed result was correct but unnecessarily + imprecise. + +o Corrected a bug in method + + Grid::relation_with(const Constraint&) const + + whereby, under specific conditions, the method was creating invalid + Grid_Generator objects and providing an incorrect result. + + -------------------------------------------------------------------------- -NEWS for version 0.11.2 (released date to be decided) +NEWS for version 0.11.2 (released on February 27, 2011) -------------------------------------------------------------------------- Bugfixes

1 0

[GIT] ppl/ppl(master): Reduced the scope of some variables.
by Roberto Bagnara 18 Feb '12

18 Feb '12

Module: ppl/ppl Branch: master Commit: a3c18f959cc3f93de367b3b129e995a5fe629648 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a3c18f959cc3… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Feb 18 19:33:38 2012 +0100 Reduced the scope of some variables. Detected by ECLAIR service minscope. --- src/Bit_Row.cc | 3 +-- src/Box.templates.hh | 2 +- src/Linear_Form.inlines.hh | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index f9c73bd..47f153c 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -32,9 +32,8 @@ unsigned long PPL::Bit_Row::first() const { const mp_size_t vec_size = vec->_mp_size; PPL_ASSERT(vec_size >= 0); - mp_size_t li = 0; mp_srcptr p = vec->_mp_d; - for (; li < vec_size; ++li, ++p) { + 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); diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 1eb7023..e20fdc4 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -2364,7 +2364,6 @@ Box<ITV>::propagate_constraint_no_check(const Constraint& c) { // Here constraint c is non-trivial. PPL_ASSERT(last_k < c_space_dim); - Result r; Temp_Boundary_Type t_bound; Temp_Boundary_Type t_a; Temp_Boundary_Type t_x; @@ -2374,6 +2373,7 @@ Box<ITV>::propagate_constraint_no_check(const Constraint& c) { int sgn_a_k = sgn(a_k); if (sgn_a_k == 0) continue; + Result r; if (sgn_a_k > 0) { open = (c_type == Constraint::STRICT_INEQUALITY) ? T_YES : T_NO; if (open == T_NO) diff --git a/src/Linear_Form.inlines.hh b/src/Linear_Form.inlines.hh index 6778d68..de26a74 100644 --- a/src/Linear_Form.inlines.hh +++ b/src/Linear_Form.inlines.hh @@ -200,9 +200,10 @@ Linear_Form<C>::ascii_dump(std::ostream& s) const { using namespace IO_Operators; dimension_type space_dim = space_dimension(); s << space_dim << "\n"; - const char separator = ' '; - for (dimension_type i = 0; i <= space_dim; ++i) + for (dimension_type i = 0; i <= space_dim; ++i) { + const char separator = ' '; s << vec[i] << separator; + } s << "\n"; }

1 0

[GIT] ppl/ppl(master): Prefer explicit tests againts zero.
by Enea Zaffanella 17 Feb '12

17 Feb '12

Module: ppl/ppl Branch: master Commit: 7b5f76fb05d066c9e1e7192f1a6859974b662c6b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7b5f76fb05d0… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 17 12:54:04 2012 +0100 Prefer explicit tests againts zero. Detected by ECLAIR service utypflag. --- src/Powerset.templates.hh | 2 +- src/ppl-config.cc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Powerset.templates.hh b/src/Powerset.templates.hh index f75db0e..2c5d344 100644 --- a/src/Powerset.templates.hh +++ b/src/Powerset.templates.hh @@ -90,7 +90,7 @@ Powerset<D>::omega_reduce() const { xi = x.drop_disjunct(xi); else ++xi; - if (abandon_expensive_computations && xi != x.end()) { + if (abandon_expensive_computations != 0 && xi != x.end()) { // Hurry up! x.collapse(xi.base); break; diff --git a/src/ppl-config.cc.in b/src/ppl-config.cc.in index 9032589..0fafd39 100644 --- a/src/ppl-config.cc.in +++ b/src/ppl-config.cc.in @@ -241,7 +241,7 @@ void internal_error() { bool strcaseeq(const char* s1, const char* s2) { - while (*s1 && *s2 + while (*s1 != 0 && *s2 != 0 && tolower(static_cast<unsigned char>(*s1)) == tolower(static_cast<unsigned char>(*s2))) { ++s1;

1 0

[GIT] ppl/ppl(master): Avoid abusing sort-circuited logical operators.
by Enea Zaffanella 17 Feb '12

17 Feb '12

Module: ppl/ppl Branch: master Commit: 29d65d78b2f43ecac60f5dc0f1af0804d740acab URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=29d65d78b2f4… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 17 11:05:52 2012 +0100 Avoid abusing sort-circuited logical operators. --- src/Partially_Reduced_Product.templates.hh | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/Partially_Reduced_Product.templates.hh b/src/Partially_Reduced_Product.templates.hh index d79ab8f..313ed8a 100644 --- a/src/Partially_Reduced_Product.templates.hh +++ b/src/Partially_Reduced_Product.templates.hh @@ -442,12 +442,17 @@ Partially_Reduced_Product<D1, D2, R>::ascii_load(std::istream& s) { || str.substr(1) != "reduced") return false; reduced = (str[0] == yes); - return ((s >> str) && str == "Domain" - && (s >> str) && str == "1:" - && d1.ascii_load(s) - && (s >> str) && str == "Domain" - && (s >> str) && str == "2:" - && d2.ascii_load(s)); + if (!(s >> str) || str != "Domain") + return false; + if (!(s >> str) || str != "1:") + return false; + if (!d1.ascii_load(s)) + return false; + if (!(s >> str) || str != "Domain") + return false; + if (!(s >> str) || str != "2:") + return false; + return d2.ascii_load(s); } template <typename D1, typename D2>

1 0

[GIT] ppl/ppl(master): Avoid abusing short-circuited logical operators ( prefer explicit control flow).
by Enea Zaffanella 17 Feb '12

17 Feb '12

Module: ppl/ppl Branch: master Commit: b861970ac6a1e593686b21df0619cc0f171d7a70 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b861970ac6a1… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 17 11:04:37 2012 +0100 Avoid abusing short-circuited logical operators (prefer explicit control flow). Detected by ECLAIR service utypflag. --- src/Grid_chdims.cc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/Grid_chdims.cc b/src/Grid_chdims.cc index 8349adc..092dad7 100644 --- a/src/Grid_chdims.cc +++ b/src/Grid_chdims.cc @@ -365,7 +365,8 @@ PPL::Grid::remove_higher_space_dimensions(const dimension_type new_dimension) { // Count the actual number of rows that are now redundant. dimension_type num_redundant = 0; for (dimension_type row = space_dim; row > new_dimension; --row) - dim_kinds[row] == CON_VIRTUAL || ++num_redundant; + if (dim_kinds[row] != CON_VIRTUAL) + ++num_redundant; if (num_redundant > 0) { dimension_type rows = con_sys.num_rows(); // Shuffle the remaining rows upwards.

1 0

[GIT] ppl/ppl(master): Prefer explicit tests against zero.
by Enea Zaffanella 17 Feb '12

17 Feb '12

Module: ppl/ppl Branch: master Commit: 5712e36571a5ed8744e550d51199d16c3b9f89e7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5712e36571a5… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 17 10:38:40 2012 +0100 Prefer explicit tests against zero. Detected by ECLAIR service utypflag. --- src/PIP_Problem.cc | 4 ++-- src/PIP_Tree.cc | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index dfdc52b..bfe1c2c 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -335,7 +335,7 @@ PPL::PIP_Problem::OK() const { if (!initial_context.OK()) return false; - if (current_solution) { + if (current_solution != 0) { // Check well formedness of the solution tree. if (!current_solution->OK()) { #ifndef NDEBUG @@ -708,7 +708,7 @@ PPL::memory_size_type PPL::PIP_Problem::external_memory_in_bytes() const { memory_size_type n = initial_context.external_memory_in_bytes(); // Adding the external memory for `current_solution'. - if (current_solution) + if (current_solution != 0) n += current_solution->total_memory_in_bytes(); // Adding the external memory for `input_cs'. n += input_cs.capacity() * sizeof(Constraint); diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 8114340..ae86937 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1034,9 +1034,9 @@ PIP_Solution_Node::set_owner(const PIP_Problem* owner) { void PIP_Decision_Node::set_owner(const PIP_Problem* owner) { owner_ = owner; - if (false_child) + if (false_child != 0) false_child->set_owner(owner); - if (true_child) + if (true_child != 0) true_child->set_owner(owner); } @@ -1048,8 +1048,8 @@ PIP_Solution_Node::check_ownership(const PIP_Problem* owner) const { bool PIP_Decision_Node::check_ownership(const PIP_Problem* owner) const { return get_owner() == owner - && (!false_child || false_child->check_ownership(owner)) - && (!true_child || true_child->check_ownership(owner)); + && (false_child == 0 || false_child->check_ownership(owner)) + && (true_child == 0 || true_child->check_ownership(owner)); } const PIP_Solution_Node* @@ -1240,13 +1240,13 @@ PIP_Decision_Node::OK() const { return false; // Recursively check if child nodes are well-formed. - if (false_child && !false_child->OK()) + if (false_child != 0 && !false_child->OK()) return false; - if (true_child && !true_child->OK()) + if (true_child != 0 && !true_child->OK()) return false; // Decision nodes should always have a true child. - if (!true_child) { + if (true_child == 0) { #ifndef NDEBUG std::cerr << "PIP_Decision_Node with no 'true' child.\n"; #endif @@ -1254,9 +1254,9 @@ PIP_Decision_Node::OK() const { } // Decision nodes with a false child must have exactly one constraint. - if (false_child) { - dimension_type - dist = std::distance(constraints_.begin(), constraints_.end()); + if (false_child != 0) { + dimension_type dist = std::distance(constraints_.begin(), + constraints_.end()); if (dist != 1) { #ifndef NDEBUG std::cerr << "PIP_Decision_Node with a 'false' child has " @@ -1283,7 +1283,7 @@ PIP_Decision_Node::update_tableau( first_pending_constraint, input_cs, parameters); - if (false_child) + if (false_child != 0) false_child->update_tableau(pip, external_space_dim, first_pending_constraint, @@ -3411,7 +3411,7 @@ PIP_Decision_Node::external_memory_in_bytes() const { memory_size_type n = PIP_Tree_Node::external_memory_in_bytes(); PPL_ASSERT(true_child != 0); n += true_child->total_memory_in_bytes(); - if (false_child) + if (false_child != 0) n += false_child->total_memory_in_bytes(); return n; } @@ -3522,7 +3522,7 @@ PIP_Decision_Node::print_tree(std::ostream& s, unsigned indent, indent_and_print(s, indent, "else\n"); - if (false_child) + if (false_child != 0) false_child->print_tree(s, indent+1, pip_dim_is_param, child_first_art_dim); else

1 0