February 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Avoid mixing boolean and arithmetic values.
by Enea Zaffanella 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 787dc72b55dd658b8e630e3d2eeb3cf7434c1f5d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=787dc72b55dd… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Feb 26 14:11:30 2012 +0100 Avoid mixing boolean and arithmetic values. Detected by ECLAIR service utypflag. --- src/Interval_Info.defs.hh | 2 +- src/Pointset_Powerset.templates.hh | 16 ++++++++-------- src/checked_int.inlines.hh | 22 ++++++++++++---------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/Interval_Info.defs.hh b/src/Interval_Info.defs.hh index 95d91d9..04fb3e9 100644 --- a/src/Interval_Info.defs.hh +++ b/src/Interval_Info.defs.hh @@ -75,7 +75,7 @@ set_bit(T& bits, unsigned int bit, bool value) { template <typename T> inline bool get_bit(const T& bits, unsigned int bit) { - return bits & (static_cast<T>(1) << bit); + return (bits & (static_cast<T>(1) << bit)) != 0; } template <typename T> diff --git a/src/Pointset_Powerset.templates.hh b/src/Pointset_Powerset.templates.hh index 76c1b9b..f2cb3c7 100644 --- a/src/Pointset_Powerset.templates.hh +++ b/src/Pointset_Powerset.templates.hh @@ -925,13 +925,13 @@ Pointset_Powerset<PSET>::maximize(const Linear_Expression& expr, PPL_DIRTY_TEMP_COEFFICIENT(best_sup_d); best_sup_n = 0; best_sup_d = 1; - bool best_max = 0; + bool best_max = false; PPL_DIRTY_TEMP_COEFFICIENT(iter_sup_n); PPL_DIRTY_TEMP_COEFFICIENT(iter_sup_d); iter_sup_n = 0; iter_sup_d = 1; - bool iter_max = 0; + bool iter_max = false; PPL_DIRTY_TEMP_COEFFICIENT(tmp); @@ -981,14 +981,14 @@ Pointset_Powerset<PSET>::maximize(const Linear_Expression& expr, PPL_DIRTY_TEMP_COEFFICIENT(best_sup_d); best_sup_n = 0; best_sup_d = 1; - bool best_max = 0; + bool best_max = false; Generator best_g = point(); PPL_DIRTY_TEMP_COEFFICIENT(iter_sup_n); PPL_DIRTY_TEMP_COEFFICIENT(iter_sup_d); iter_sup_n = 0; iter_sup_d = 1; - bool iter_max = 0; + bool iter_max = false; Generator iter_g = point(); PPL_DIRTY_TEMP_COEFFICIENT(tmp); @@ -1044,13 +1044,13 @@ Pointset_Powerset<PSET>::minimize(const Linear_Expression& expr, PPL_DIRTY_TEMP_COEFFICIENT(best_inf_d); best_inf_n = 0; best_inf_d = 1; - bool best_min = 0; + bool best_min = false; PPL_DIRTY_TEMP_COEFFICIENT(iter_inf_n); PPL_DIRTY_TEMP_COEFFICIENT(iter_inf_d); iter_inf_n = 0; iter_inf_d = 1; - bool iter_min = 0; + bool iter_min = false; PPL_DIRTY_TEMP_COEFFICIENT(tmp); @@ -1100,14 +1100,14 @@ Pointset_Powerset<PSET>::minimize(const Linear_Expression& expr, PPL_DIRTY_TEMP_COEFFICIENT(best_inf_d); best_inf_n = 0; best_inf_d = 1; - bool best_min = 0; + bool best_min = false; Generator best_g = point(); PPL_DIRTY_TEMP_COEFFICIENT(iter_inf_n); PPL_DIRTY_TEMP_COEFFICIENT(iter_inf_d); iter_inf_n = 0; iter_inf_d = 1; - bool iter_min = 0; + bool iter_min = false; Generator iter_g = point(); PPL_DIRTY_TEMP_COEFFICIENT(tmp); diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index bd31616..0a8175b 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -76,16 +76,18 @@ struct Extended_Int { : C_Integer<Type>::min); static const Type not_a_number = ((C_Integer<Type>::min >= 0) - ? (C_Integer<Type>::max - Policy::has_infinity * 2) - : (C_Integer<Type>::min + Policy::has_infinity)); - static const Type min = (C_Integer<Type>::min - + ((C_Integer<Type>::min >= 0) - ? 0 - : (Policy::has_infinity + Policy::has_nan))); - static const Type max = (C_Integer<Type>::max - - ((C_Integer<Type>::min >= 0) - ? (2*Policy::has_infinity + Policy::has_nan) - : Policy::has_infinity)); + ? (C_Integer<Type>::max - 2 * (Policy::has_infinity ? 1 : 0)) + : (C_Integer<Type>::min + (Policy::has_infinity ? 1 : 0))); + static const Type min + = (C_Integer<Type>::min + + ((C_Integer<Type>::min >= 0) + ? 0 + : ((Policy::has_infinity ? 1 : 0) + (Policy::has_nan ? 1 : 0)))); + static const Type max + = (C_Integer<Type>::max + - ((C_Integer<Type>::min >= 0) + ? (2 * (Policy::has_infinity ? 1 : 0) + (Policy::has_nan ? 1 : 0)) + : (Policy::has_infinity ? 1 : 0))); }; template <typename Policy, typename To>

1 0

[GIT] ppl/ppl(master): Get rid of redundant declarations of a couple of functions.
by Enea Zaffanella 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: cb5de9a40b4ce3ccde1104e90da8a154ca877607 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cb5de9a40b4c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Feb 26 14:09:45 2012 +0100 Get rid of redundant declarations of a couple of functions. Detected by ECLAIR service funtypes. --- src/GMP_Integer.defs.hh | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/src/GMP_Integer.defs.hh b/src/GMP_Integer.defs.hh index e438f97..a80ea6f 100644 --- a/src/GMP_Integer.defs.hh +++ b/src/GMP_Integer.defs.hh @@ -43,23 +43,6 @@ mpz_class& raw_value(GMP_Integer& x); //@} // Accessor Functions -//! \name Memory Size Inspection Functions -//@{ - -#ifndef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS -//! Returns the total size in bytes of the memory occupied by \p x. -/*! \relates GMP_Integer */ -#endif // !defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -memory_size_type total_memory_in_bytes(const GMP_Integer& x); - -#ifndef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS -//! Returns the size in bytes of the memory managed by \p x. -/*! \relates GMP_Integer */ -#endif // !defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -memory_size_type external_memory_in_bytes(const GMP_Integer& x); - -//@} // Memory Size Inspection Functions - //! \name Arithmetic Operators //@{

1 0

[GIT] ppl/ppl(master): Simplified Interval_Info::ascii_load().
by Enea Zaffanella 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: e9fc312f33c36f9e2a3eb520f4881b9abff5d75e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e9fc312f33c3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Feb 26 13:51:03 2012 +0100 Simplified Interval_Info::ascii_load(). Resettting format flags does not change the istream status, which was previously tested and is known to be good: hence, return true. --- src/Interval_Info.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Interval_Info.inlines.hh b/src/Interval_Info.inlines.hh index 0aa03f6..da03cc8 100644 --- a/src/Interval_Info.inlines.hh +++ b/src/Interval_Info.inlines.hh @@ -90,7 +90,7 @@ Interval_Info_Bitset<T, Policy>::ascii_load(std::istream& s) { if (!s) return false; s.flags(old); - return s; + return true; } #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS

1 0

[GIT] ppl/ppl(master): `#error' messages made consistent.
by Roberto Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 93bbf657068ab68e114336684eef87f7a6ce787c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=93bbf657068a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 26 14:19:28 2012 +0100 `#error' messages made consistent. --- demos/ppl_lcdd/ppl_lcdd.cc | 2 +- demos/ppl_pips/ppl_pips.cc | 2 +- fedora/ppl.hh | 2 +- fedora/ppl_c.h | 2 +- fedora/pwl.hh | 2 +- src/BDS_Status.idefs.hh | 2 +- src/Box_Status.idefs.hh | 2 +- src/Float.defs.hh | 6 +++--- src/Grid_Status.idefs.hh | 2 +- src/Og_Status.idefs.hh | 2 +- src/Ph_Status.idefs.hh | 2 +- src/fpu.defs.hh | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index e30de0e..71f22a4 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -30,7 +30,7 @@ site: http://bugseng.com/products/ppl/ . */ (defined(USE_PPL) && defined(USE_POLKA)) \ || (defined(USE_PPL) && defined(USE_POLYLIB)) \ || (defined(USE_POLKA) && defined(USE_POLYLIB)) -#error "Exactly one among USE_PPL, USE_POLKA and USE_POLYLIB must be defined." +#error "Exactly one among USE_PPL, USE_POLKA and USE_POLYLIB must be defined" #endif #if defined(USE_PPL) diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 291a6dd..a3d27d7 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -26,7 +26,7 @@ site: http://bugseng.com/products/ppl/ . */ #if (!defined(USE_PPL) && !defined(USE_PIPLIB)) #define USE_PPL 1 #elif (defined(USE_PPL) && defined(USE_PIPLIB)) -#error "Exactly one among USE_PPL and USE_PIPLIB must be defined." +#error "Exactly one among USE_PPL and USE_PIPLIB must be defined" #endif #if defined(USE_PPL) diff --git a/fedora/ppl.hh b/fedora/ppl.hh index b5dbb62..9acdaa8 100644 --- a/fedora/ppl.hh +++ b/fedora/ppl.hh @@ -46,5 +46,5 @@ site: http://bugseng.com/products/ppl/ . */ #elif defined(__sparc__) #include "ppl-sparc.hh" #else -#error "This architecture is not supported by the currently installed ppl-devel packages." +#error "This architecture is not supported by the currently installed ppl-devel packages" #endif diff --git a/fedora/ppl_c.h b/fedora/ppl_c.h index 6132279..23b9617 100644 --- a/fedora/ppl_c.h +++ b/fedora/ppl_c.h @@ -46,5 +46,5 @@ site: http://bugseng.com/products/ppl/ . */ #elif defined(__sparc__) #include "ppl_c-sparc.h" #else -#error "This architecture is not supported by the currently installed ppl-devel packages." +#error "This architecture is not supported by the currently installed ppl-devel packages" #endif diff --git a/fedora/pwl.hh b/fedora/pwl.hh index c468ed7..6ec04b9 100644 --- a/fedora/pwl.hh +++ b/fedora/pwl.hh @@ -46,5 +46,5 @@ site: http://www.cs.unipr.it/Software/ . */ #elif defined(__sparc__) #include "pwl-sparc.hh" #else -#error "This architecture is not supported by the currently installed ppl-pwl-devel packages." +#error "This architecture is not supported by the currently installed ppl-pwl-devel packages" #endif diff --git a/src/BDS_Status.idefs.hh b/src/BDS_Status.idefs.hh index ad25156..cfe2580 100644 --- a/src/BDS_Status.idefs.hh +++ b/src/BDS_Status.idefs.hh @@ -25,7 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_BDS_Status_idefs_hh 1 #ifndef PPL_IN_BD_Shape_CLASS -#error "Do not include BDS_Status.idefs.hh directly; use BD_Shape.defs.hh instead." +#error "Do not include BDS_Status.idefs.hh directly; use BD_Shape.defs.hh instead" #endif //! A conjunctive assertion about a BD_Shape<T> object. diff --git a/src/Box_Status.idefs.hh b/src/Box_Status.idefs.hh index 3455232..c0dc5e6 100644 --- a/src/Box_Status.idefs.hh +++ b/src/Box_Status.idefs.hh @@ -25,7 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_Box_Status_idefs_hh 1 #ifndef PPL_IN_Box_CLASS -#error "Do not include Box_Status.idefs.hh directly; use Box.defs.hh instead." +#error "Do not include Box_Status.idefs.hh directly; use Box.defs.hh instead" #endif //! A conjunctive assertion about a Box<ITV> object. diff --git a/src/Float.defs.hh b/src/Float.defs.hh index c34de63..9d177c4 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -295,7 +295,7 @@ public: #elif PPL_CXX_FLOAT_BINARY_FORMAT == PPL_FLOAT_INTEL_DOUBLE_EXTENDED typedef float_intel_double_extended Binary; #else -#error "invalid value for PPL_CXX_FLOAT_BINARY_FORMAT" +#error "Invalid value for PPL_CXX_FLOAT_BINARY_FORMAT" #endif union { float number; @@ -324,7 +324,7 @@ public: #elif PPL_CXX_DOUBLE_BINARY_FORMAT == PPL_FLOAT_INTEL_DOUBLE_EXTENDED typedef float_intel_double_extended Binary; #else -#error "invalid value for PPL_CXX_DOUBLE_BINARY_FORMAT" +#error "Invalid value for PPL_CXX_DOUBLE_BINARY_FORMAT" #endif union { double number; @@ -353,7 +353,7 @@ public: #elif PPL_CXX_LONG_DOUBLE_BINARY_FORMAT == PPL_FLOAT_INTEL_DOUBLE_EXTENDED typedef float_intel_double_extended Binary; #else -#error "invalid value for PPL_CXX_LONG_DOUBLE_BINARY_FORMAT" +#error "Invalid value for PPL_CXX_LONG_DOUBLE_BINARY_FORMAT" #endif union { long double number; diff --git a/src/Grid_Status.idefs.hh b/src/Grid_Status.idefs.hh index cf4e1db..2c94896 100644 --- a/src/Grid_Status.idefs.hh +++ b/src/Grid_Status.idefs.hh @@ -25,7 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_Grid_Status_idefs_hh 1 #ifndef PPL_IN_Grid_CLASS -#error "Do not include Grid_Status.idefs.hh directly; use Grid.defs.hh instead." +#error "Do not include Grid_Status.idefs.hh directly; use Grid.defs.hh instead" #endif //! A conjunctive assertion about a grid. diff --git a/src/Og_Status.idefs.hh b/src/Og_Status.idefs.hh index c1db1db..007c3cb 100644 --- a/src/Og_Status.idefs.hh +++ b/src/Og_Status.idefs.hh @@ -25,7 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_Og_Status_idefs_hh 1 #ifndef PPL_IN_Octagonal_Shape_CLASS -#error "Do not include Og_Status.idefs.hh directly; use Octagonal_Shape.defs.hh instead." +#error "Do not include Og_Status.idefs.hh directly; use Octagonal_Shape.defs.hh instead" #endif //! A conjunctive assertion about a Octagonal_Shape<T> object. diff --git a/src/Ph_Status.idefs.hh b/src/Ph_Status.idefs.hh index 5c5a522..dcbe38c 100644 --- a/src/Ph_Status.idefs.hh +++ b/src/Ph_Status.idefs.hh @@ -25,7 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_Status_idefs_hh 1 #ifndef PPL_IN_Polyhedron_CLASS -#error "Do not include Ph_Status.idefs.hh directly; use Polyhedron.defs.hh instead." +#error "Do not include Ph_Status.idefs.hh directly; use Polyhedron.defs.hh instead" #endif //! A conjunctive assertion about a polyhedron. diff --git a/src/fpu.defs.hh b/src/fpu.defs.hh index b1933a6..d2a4e12 100644 --- a/src/fpu.defs.hh +++ b/src/fpu.defs.hh @@ -87,7 +87,7 @@ fpu_check_inexact(); #elif defined(PPL_HAVE_FENV_H) #include "fpu-c99.inlines.hh" #else -#error "PPL_CAN_CONTROL_FPU evaluates to true, but why?" +#error "PPL_CAN_CONTROL_FPU evaluates to true: why?" #endif #else // !PPL_CAN_CONTROL_FPU

1 0

[GIT] ppl/ppl(master): Variable names fixed.
by Roberto Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 5d988a3b5b9c564a81d91cf3a919cb8bb959bbf8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5d988a3b5b9c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 26 14:15:07 2012 +0100 Variable names fixed. --- src/compiler.hh | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/compiler.hh b/src/compiler.hh index 5ceb298..fe802cd 100644 --- a/src/compiler.hh +++ b/src/compiler.hh @@ -154,9 +154,9 @@ clz(unsigned long ul) { #if defined(__GNUC__) return static_cast<unsigned int>(__builtin_clzl(ul)); #elif PPL_SIZEOF_LONG == 4 - return clz32(u); + return clz32(ul); #elif PPL_SIZEOF_LONG == 8 - return clz64(u); + return clz64(ul); #else #error "Unsupported unsigned long size" #endif @@ -168,9 +168,9 @@ clz(unsigned long long ull) { #if defined(__GNUC__) return static_cast<unsigned int>(__builtin_clzll(ull)); #elif PPL_SIZEOF_LONG_LONG == 4 - return clz32(u); + return clz32(ull); #elif PPL_SIZEOF_LONG_LONG == 8 - return clz64(u); + return clz64(ull); #else #error "Unsupported unsigned long long size" #endif @@ -197,9 +197,9 @@ ctz(unsigned long ul) { #if defined(__GNUC__) return static_cast<unsigned int>(__builtin_ctzl(ul)); #elif PPL_SIZEOF_LONG == 4 - return ctz32(u); + return ctz32(ul); #elif PPL_SIZEOF_LONG == 8 - return ctz64(u); + return ctz64(ul); #else #error "Unsupported unsigned long size" #endif @@ -211,9 +211,9 @@ ctz(unsigned long long ull) { #if defined(__GNUC__) return static_cast<unsigned int>(__builtin_ctzll(ull)); #elif PPL_SIZEOF_LONG_LONG == 4 - return ctz32(u); + return ctz32(ull); #elif PPL_SIZEOF_LONG_LONG == 8 - return ctz64(u); + return ctz64(ull); #else #error "Unsupported unsigned long long size" #endif

1 0

[GIT] ppl/ppl(master): Avoid to use Variable references. Uniformed Variable creations.
by Abramo Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 5f775db925bb1a3f3dcf5fd7de81873e6bc8fcf0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5f775db925bb… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sun Feb 26 12:04:50 2012 +0100 Avoid to use Variable references. Uniformed Variable creations. --- interfaces/C/ppl_c_implementation_common.cc | 2 +- interfaces/Java/jni/ppl_java_common.defs.hh | 2 +- interfaces/Java/jni/ppl_java_common.inlines.hh | 2 +- src/BD_Shape.templates.hh | 8 ++++---- src/Box.templates.hh | 2 +- src/Grid_public.cc | 8 ++++---- src/Octagonal_Shape.templates.hh | 14 +++++++------- src/Polyhedron_public.cc | 8 ++++---- src/Variable.cc | 4 ++-- src/Variable.defs.hh | 8 ++++---- src/Variables_Set.cc | 2 +- src/Variables_Set.defs.hh | 4 ++-- src/Variables_Set.inlines.hh | 2 +- src/termination.templates.hh | 4 ++-- src/wrap_assign.hh | 10 +++++----- tests/Polyhedron/affineimage2.cc | 2 +- tests/Polyhedron/bgp99extrapolation1.cc | 2 +- tests/Polyhedron/bhz03widening1.cc | 4 ++-- tests/Polyhedron/boundedbhrz03extrapolation1.cc | 2 +- tests/Polyhedron/writevariable1.cc | 2 +- tests/ppl_test.cc | 2 +- tests/ppl_test.hh | 4 ++-- 22 files changed, 49 insertions(+), 49 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=5f775db9…

1 0

[GIT] ppl/ppl(master): Types fixed. Useless if-then-else removed.
by Roberto Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 32409aa205f59894ca35f15ca7494ce4a702d2c9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=32409aa205f5… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 26 13:53:47 2012 +0100 Types fixed. Useless if-then-else removed. --- src/compiler.hh | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/compiler.hh b/src/compiler.hh index a0a162d..5ceb298 100644 --- a/src/compiler.hh +++ b/src/compiler.hh @@ -83,12 +83,8 @@ struct Suppress_Uninitialized_Warnings_Type { #if !defined(__GNUC__) inline unsigned int -clz32(u_int32_t w) { +clz32(uint32_t w) { unsigned int r = 31; - if ((w & 0xffffffff00000000ULL) != 0) { - w = (w >> 31) >> 1; - r -= 32; - } if ((w & 0xffff0000U) != 0) { w >>= 16; r -= 16; @@ -111,15 +107,15 @@ clz32(u_int32_t w) { } inline unsigned int -clz64(u_int64_t w) { +clz64(uint64_t w) { if ((w & 0xffffffff00000000ULL) == 0) - return clz32(static_cast<u_int32_t>(w)) + 32; + return clz32(static_cast<uint32_t>(w)) + 32; else - return clz32(static_cast<u_int32_t>(w >> 32)); + return clz32(static_cast<uint32_t>(w >> 32)); } inline unsigned int -ctz32(u_int32_t w) { +ctz32(uint32_t w) { static const unsigned int mod37_table[] = { 32, 0, 1, 26, 2, 23, 27, 0, 3, 16, 24, 30, 28, 11, 0, 13, 4, 7, 17, 0, 25, 22, 31, 15, 29, 10, 12, 6, 0, 21, 14, 9, @@ -129,11 +125,11 @@ ctz32(u_int32_t w) { } inline unsigned int -ctz64(u_int64_t w) { +ctz64(uint64_t w) { if ((w & 0x00000000ffffffffULL) == 0) - return ctz32(static_cast<u_int32_t>(w >> 32)) + 32; + return ctz32(static_cast<uint32_t>(w >> 32)) + 32; else - return ctz32(static_cast<u_int32_t>(w)); + return ctz32(static_cast<uint32_t>(w)); } #endif

1 0

[GIT] ppl/ppl(master): Use `libtool' to test linking with GMP only if the option `--with-gmp-build' was given.
by Roberto Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 8e8ea55b9bf4cbcf3c06216f83cf8e2021eef523 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8e8ea55b9bf4… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 26 13:05:34 2012 +0100 Use `libtool' to test linking with GMP only if the option `--with-gmp-build' was given. --- m4/ac_check_gmp.m4 | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/m4/ac_check_gmp.m4 b/m4/ac_check_gmp.m4 index 3fbd6a3..2d5fd65 100644 --- a/m4/ac_check_gmp.m4 +++ b/m4/ac_check_gmp.m4 @@ -71,8 +71,12 @@ AC_ARG_WITH(gmp-build, gmp_library_options="$gmp_library_options $gmp_libs" -ac_save_CXX="$CXX" -CXX="libtool --mode=link --tag=CXX $CXX" +if test -n "$with_gmp_build" +then + ac_save_CXX="$CXX" + CXX="libtool --mode=link --tag=CXX $CXX" +fi + ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $gmp_include_options" ac_save_LIBS="$LIBS" @@ -223,5 +227,9 @@ AC_LANG_POP(C++) eval $shared_library_path_env_var=\"$ac_save_shared_library_path\" LIBS="$ac_save_LIBS" CPPFLAGS="$ac_save_CPPFLAGS" -CXX="$ac_save_CXX" + +if test -n "$with_gmp_build" +then + CXX="$ac_save_CXX" +fi ])

1 0

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

26 Feb '12

Module: ppl/ppl Branch: master Commit: 0d2064c3d8080286fe7a3fb44065be95e271ff56 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0d2064c3d808… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Feb 26 12:59:39 2012 +0100 Prefer explicit tests against zero. Avoid using boolean values as integer values. Detected by ECLAIR service utypflag. --- src/Congruence_System.cc | 6 ++++-- src/Interval_Info.defs.hh | 16 +++++++++------- src/Ph_Status.inlines.hh | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/Congruence_System.cc b/src/Congruence_System.cc index fc16b4f..87b2371 100644 --- a/src/Congruence_System.cc +++ b/src/Congruence_System.cc @@ -332,8 +332,10 @@ PPL::Congruence_System::has_a_free_dimension() const { // Check that there are free_dims dimensions marked free // in free_dim. dimension_type count = 0; - for (dimension_type i = space_dim; i-- > 0; ) - count += free_dim[i]; + for (dimension_type i = space_dim; i-- > 0; ) { + if (free_dim[i]) + ++count; + } PPL_ASSERT(count == free_dims); #endif return true; diff --git a/src/Interval_Info.defs.hh b/src/Interval_Info.defs.hh index 5a2158e..95d91d9 100644 --- a/src/Interval_Info.defs.hh +++ b/src/Interval_Info.defs.hh @@ -170,13 +170,15 @@ public: const_bool_nodef(cache_empty, Policy::cache_empty); const_bool_nodef(cache_singleton, Policy::cache_singleton); const_int_nodef(lower_special_bit, Policy::next_bit); - const_int_nodef(lower_open_bit, lower_special_bit + store_special); - const_int_nodef(upper_special_bit, lower_open_bit + store_open); - const_int_nodef(upper_open_bit, upper_special_bit + store_special); - const_int_nodef(cardinality_is_bit, upper_open_bit + store_open); - const_int_nodef(cardinality_0_bit, cardinality_is_bit + ((cache_empty || cache_singleton) ? 1 : 0)); - const_int_nodef(cardinality_1_bit, cardinality_0_bit + cache_empty); - const_int_nodef(next_bit, cardinality_1_bit + cache_singleton); + const_int_nodef(lower_open_bit, lower_special_bit + (store_special ? 1 : 0)); + const_int_nodef(upper_special_bit, lower_open_bit + (store_open ? 1 : 0)); + const_int_nodef(upper_open_bit, upper_special_bit + (store_special ? 1 : 0)); + const_int_nodef(cardinality_is_bit, upper_open_bit + (store_open ? 1 : 0)); + const_int_nodef(cardinality_0_bit, cardinality_is_bit + + ((cache_empty || cache_singleton) ? 1 : 0)); + const_int_nodef(cardinality_1_bit, cardinality_0_bit + (cache_empty ? 1 : 0)); + const_int_nodef(next_bit, cardinality_1_bit + (cache_singleton ? 1 : 0)); + Interval_Info_Bitset() { // FIXME: would we have speed benefits with uninitialized info? // (Dirty_Temp) diff --git a/src/Ph_Status.inlines.hh b/src/Ph_Status.inlines.hh index 160507e..0c828de 100644 --- a/src/Ph_Status.inlines.hh +++ b/src/Ph_Status.inlines.hh @@ -43,7 +43,7 @@ Polyhedron::Status::test_all(flags_t mask) const { inline bool Polyhedron::Status::test_any(flags_t mask) const { - return flags & mask; + return (flags & mask) != 0; } inline void

1 0

[GIT] ppl/ppl(master): Improved implementation of OR_Matrix<T>:: any_row_iterator::operator+=().
by Enea Zaffanella 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 756ef076d4574278d3665d3885b7dc41526a2b81 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=756ef076d457… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Feb 26 11:29:11 2012 +0100 Improved implementation of OR_Matrix<T>::any_row_iterator::operator+=(). Increased readability: - separated explicit type conversions from code performing arithmetic operations (on non-mixed typed values); - added a few redundant parentheses. Similar improvement applied to a couple of other functions. Detected by ECLAIR service utypflag. --- src/Linear_Form.templates.hh | 5 +++-- src/OR_Matrix.inlines.hh | 18 ++++++++++++------ src/checked_float.inlines.hh | 7 ++++--- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/Linear_Form.templates.hh b/src/Linear_Form.templates.hh index aa52658..2630f0f 100644 --- a/src/Linear_Form.templates.hh +++ b/src/Linear_Form.templates.hh @@ -422,8 +422,9 @@ Linear_Form<C>::relative_error( C error_propagator; // We assume that f_base is a power of 2. - int power = static_cast<int>(msb_position(f_base) * f_mantissa_bits); - analyzer_format lb = static_cast<analyzer_format>(ldexp(1.0, -power)); + unsigned int u_power = msb_position(f_base) * f_mantissa_bits; + int neg_power = -static_cast<int>(u_power); + analyzer_format lb = static_cast<analyzer_format>(ldexp(1.0, neg_power)); error_propagator.build(i_constraint(GREATER_OR_EQUAL, -lb), i_constraint(LESS_OR_EQUAL, lb)); diff --git a/src/OR_Matrix.inlines.hh b/src/OR_Matrix.inlines.hh index 7a20e71..a138c01 100644 --- a/src/OR_Matrix.inlines.hh +++ b/src/OR_Matrix.inlines.hh @@ -243,14 +243,20 @@ template <typename T> template <typename U> inline typename OR_Matrix<T>::template any_row_iterator& OR_Matrix<T>::any_row_iterator::operator+=(const difference_type m) { - difference_type increment = m + m * m / 2 + m * static_cast<difference_type>(e); - if (e % 2 == 0 && m % 2 != 0) + difference_type e_dt = static_cast<difference_type>(e); + difference_type i_dt = static_cast<difference_type>(i); + difference_type increment = m + (m * m / 2) + (m * e_dt); + if (e_dt % 2 == 0 && m % 2 != 0) ++increment; - e = static_cast<dimension_type>(static_cast<difference_type>(e) + m); - i = static_cast<dimension_type>(static_cast<difference_type>(i) + increment); + e_dt += m; + i_dt += increment; + e = static_cast<dimension_type>(e_dt); + i = static_cast<dimension_type>(i_dt); value.first += increment; #if PPL_OR_MATRIX_EXTRA_DEBUG - value.size_ = static_cast<dimension_type>(static_cast<difference_type>(value.size_) + m - m % 2); + difference_type value_size_dt = static_cast<difference_type>(value.size_); + value_size_dt += (m - m % 2); + value.size_ = static_cast<dimension_type>(value_size_dt); #endif return *this; } @@ -262,7 +268,7 @@ inline typename Enable_If<(static_cast<Unsigned>(-1) > 0), typename OR_Matrix<T>::template any_row_iterator& >::type OR_Matrix<T>::any_row_iterator::operator+=(Unsigned m) { - dimension_type increment = m + m * m / 2 + m * e; + dimension_type increment = m + (m * m / 2) + (m * e); if (e % 2 == 0 && m % 2 != 0) ++increment; e += m; diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 08b7251..7f261a2 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -880,9 +880,10 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { return set_pos_overflow_float<To_Policy>(to, dir); } unsigned int needed_bits = Float<T>::Binary::MANTISSA_BITS + 1; - if (exponent < Float<T>::Binary::EXPONENT_MIN) - needed_bits -= static_cast<unsigned int>(Float<T>::Binary::EXPONENT_MIN - - exponent); + if (exponent < Float<T>::Binary::EXPONENT_MIN) { + long diff = Float<T>::Binary::EXPONENT_MIN - exponent; + needed_bits -= static_cast<unsigned int>(diff); + } mpz_t mantissa; mpz_init(mantissa); {

1 0