February 2012 - PPL-devel - BUGSENG Mailman

Re: [PPL-devel] Problems installing PPL on Mac OS X Lion
by Roberto Bagnara 25 Feb '12

25 Feb '12

On 02/25/12 08:05, Jan Gustafsson wrote: > Hi! > > We had contact a few weeks ago when I (in vain) tried to install PPL > on Mac OS X 10.5.8. You recommended me to move to Lion which I have > done. Now installation of PPL comes a bit longer, but not all the > way. I get the following error message during linking in make: > > ld: illegal text-relocation to ___gmp_binvert_limb_table in > /usr/local/lib/libgmp.a(mp_minv_tab.o) from ___gmpn_divexact_1 in > /usr/local/lib/libgmp.a(dive_1.o) for architecture x86_64 > > Any advice? > > Kind regards > > Jan G [CC to the ppl-devel mailing list so as to reach other Mac OS X users.] Hi Jan, it looks like a problem with /usr/local/lib/libgmp.a that is unrelated to the PPL. Is /usr/local/lib/libgmp.a something you have compiled yourself with the same toolchain you are using for the PPL? Can it be the result of some previous experiment that now gets in the way? Otherwise I don't know: perhaps Mac OS X users on the ppl-devel list can provide advice. All the best, Roberto -- Prof. Roberto Bagnara Applied Formal Methods Laboratory Department of Mathematics, University of Parma, Italy http://www.cs.unipr.it/~bagnara/ mailto:bagnara@cs.unipr.it

3 2

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

25 Feb '12

Module: ppl/ppl Branch: master Commit: 4ddf6ce187e9217e560fb3e8d18b315fa28d6d92 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4ddf6ce187e9… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 25 12:18:10 2012 +0100 Prefer explicit tests against zero. Detected by ECLAIR service utypflag. --- src/c_streambuf.cc | 2 +- src/stdiobuf.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/c_streambuf.cc b/src/c_streambuf.cc index c76ca44..fdd630f 100644 --- a/src/c_streambuf.cc +++ b/src/c_streambuf.cc @@ -89,7 +89,7 @@ c_streambuf::int_type c_streambuf::overflow(int_type c) { const int_type eof = traits_type::eof(); if (traits_type::eq_int_type(c, eof)) - return sync() ? eof : traits_type::not_eof(c); + return (sync() != 0) ? eof : traits_type::not_eof(c); else { char buf = static_cast<char>(c); if (cb_write(&buf, 1) == 1) diff --git a/src/stdiobuf.cc b/src/stdiobuf.cc index 8a5fe95..a10a7ed 100644 --- a/src/stdiobuf.cc +++ b/src/stdiobuf.cc @@ -71,7 +71,7 @@ stdiobuf::int_type stdiobuf::overflow(int_type c) { const int_type eof = traits_type::eof(); if (traits_type::eq_int_type(c, eof)) - return fflush(fp) ? eof : traits_type::not_eof(c); + return (fflush(fp) != 0) ? eof : traits_type::not_eof(c); else return putc(c, fp); }

1 0

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

25 Feb '12

Module: ppl/ppl Branch: master Commit: 1ea98773b74de31caebd07558ec8b215d8298c6b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1ea98773b74d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 25 11:33:08 2012 +0100 Prefer explicit tests against zero. Detected by ECLAIR service utypflag. --- src/PIP_Problem.cc | 4 ++-- src/PIP_Tree.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index 9c82202..6c52d69 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -232,10 +232,10 @@ PPL::PIP_Problem::solve() const { external_space_dim, /*indent_level=*/ 0); // Update problem status. - x.status = (x.current_solution) ? OPTIMIZED : UNSATISFIABLE; + x.status = (x.current_solution != 0) ? OPTIMIZED : UNSATISFIABLE; PPL_ASSERT(OK()); - return (x.current_solution) + return (x.current_solution != 0) ? OPTIMIZED_PIP_PROBLEM : UNFEASIBLE_PIP_PROBLEM; } // End of handler for PARTIALLY_SATISFIABLE case. diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 76b5a0d..4f2e82e 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -3574,7 +3574,7 @@ PIP_Solution_Node::print_tree(std::ostream& s, const int indent, const Linear_Expression& PIP_Solution_Node::parametric_values(const Variable var) const { const PIP_Problem* pip = get_owner(); - PPL_ASSERT(pip); + PPL_ASSERT(pip != 0); const dimension_type space_dim = pip->space_dimension(); if (var.space_dimension() > space_dim) { @@ -3613,7 +3613,7 @@ PIP_Solution_Node::update_solution() const { return; const PIP_Problem* pip = get_owner(); - PPL_ASSERT(pip); + PPL_ASSERT(pip != 0); std::vector<bool> pip_dim_is_param(pip->space_dimension()); const Variables_Set& params = pip->parameter_space_dimensions(); for (Variables_Set::const_iterator p = params.begin(),

1 0

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

25 Feb '12

Module: ppl/ppl Branch: master Commit: 7b7ae1196e04b62461a77d98086479fad8712bc7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7b7ae1196e04… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 25 11:17:06 2012 +0100 Prefer explicit test against zero. Detected by ECLAIR service utypflag. --- src/checked_mpz.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/checked_mpz.inlines.hh b/src/checked_mpz.inlines.hh index 9b2c324..9b795d4 100644 --- a/src/checked_mpz.inlines.hh +++ b/src/checked_mpz.inlines.hh @@ -499,7 +499,7 @@ div_2exp_mpz(mpz_class& to, const mpz_class& x, unsigned int exp, PPL_ASSERT(round_up(dir)); mpz_cdiv_q_2exp(to.get_mpz_t(), n, exp); if (round_strict_relation(dir)) - return mpz_divisible_2exp_p(n, exp) ? V_EQ : V_LT; + return (mpz_divisible_2exp_p(n, exp) != 0) ? V_EQ : V_LT; return V_LE; } }

1 0

[GIT] ppl/ppl(master): Fixed a few misuses of assignment ( instead of comparison) in assertions.
by Enea Zaffanella 25 Feb '12

25 Feb '12

Module: ppl/ppl Branch: master Commit: 5e705a68649d84a32490ae8692158d19706cad2c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5e705a68649d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 25 11:10:45 2012 +0100 Fixed a few misuses of assignment (instead of comparison) in assertions. Detected by ECLAIR service utypflag. --- src/Dense_Row.inlines.hh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Dense_Row.inlines.hh b/src/Dense_Row.inlines.hh index 00d78d2..17b808f 100644 --- a/src/Dense_Row.inlines.hh +++ b/src/Dense_Row.inlines.hh @@ -100,7 +100,7 @@ Dense_Row::Dense_Row(const dimension_type sz, resize(sz, capacity); PPL_ASSERT(size() == sz); - PPL_ASSERT(impl.capacity = capacity); + PPL_ASSERT(impl.capacity == capacity); PPL_ASSERT(OK()); } @@ -155,7 +155,7 @@ Dense_Row::Dense_Row(const Dense_Row& y, } PPL_ASSERT(size() == y.size()); - PPL_ASSERT(impl.capacity = capacity); + PPL_ASSERT(impl.capacity == capacity); PPL_ASSERT(OK()); } @@ -185,7 +185,7 @@ Dense_Row::Dense_Row(const Dense_Row& y, } PPL_ASSERT(size() == sz); - PPL_ASSERT(impl.capacity = capacity); + PPL_ASSERT(impl.capacity == capacity); PPL_ASSERT(OK()); }

1 0

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

25 Feb '12

Module: ppl/ppl Branch: master Commit: e37265ae0a0f108cc0ed86f7e848b9ebc8ff7883 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e37265ae0a0f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 25 11:08:39 2012 +0100 Prefer explicit test against zero. Detected by ECLAIR service utypflag. --- src/checked_mpz.inlines.hh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/checked_mpz.inlines.hh b/src/checked_mpz.inlines.hh index e8aec87..9b2c324 100644 --- a/src/checked_mpz.inlines.hh +++ b/src/checked_mpz.inlines.hh @@ -329,14 +329,14 @@ assign_mpz_mpq(mpz_class& to, const mpq_class& from, Rounding_Dir dir) { if (round_down(dir)) { mpz_fdiv_q(to.get_mpz_t(), n, d); if (round_strict_relation(dir)) - return mpz_divisible_p(n, d) ? V_EQ : V_GT; + return (mpz_divisible_p(n, d) != 0) ? V_EQ : V_GT; return V_GE; } else { PPL_ASSERT(round_up(dir)); mpz_cdiv_q(to.get_mpz_t(), n, d); if (round_strict_relation(dir)) - return mpz_divisible_p(n, d) ? V_EQ : V_LT; + return (mpz_divisible_p(n, d) != 0) ? V_EQ : V_LT; return V_LE; } } @@ -403,14 +403,14 @@ div_mpz(mpz_class& to, const mpz_class& x, const mpz_class& y, if (round_down(dir)) { mpz_fdiv_q(to.get_mpz_t(), n, d); if (round_strict_relation(dir)) - return mpz_divisible_p(n, d) ? V_EQ : V_GT; + return (mpz_divisible_p(n, d) != 0) ? V_EQ : V_GT; return V_GE; } else { PPL_ASSERT(round_up(dir)); mpz_cdiv_q(to.get_mpz_t(), n, d); if (round_strict_relation(dir)) - return mpz_divisible_p(n, d) ? V_EQ : V_LT; + return (mpz_divisible_p(n, d) != 0) ? V_EQ : V_LT; return V_LE; } } @@ -492,7 +492,7 @@ div_2exp_mpz(mpz_class& to, const mpz_class& x, unsigned int exp, if (round_down(dir)) { mpz_fdiv_q_2exp(to.get_mpz_t(), n, exp); if (round_strict_relation(dir)) - return mpz_divisible_2exp_p(n, exp) ? V_EQ : V_GT; + return (mpz_divisible_2exp_p(n, exp) != 0) ? V_EQ : V_GT; return V_GE; } else {

1 0

[GIT] ppl/ppl(master): Avoid long line.
by Enea Zaffanella 25 Feb '12

25 Feb '12

Module: ppl/ppl Branch: master Commit: 20bbd20223a29626e84163094c0e0782b6ca4882 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=20bbd20223a2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 25 10:50:26 2012 +0100 Avoid long line. --- src/Interval_Info.defs.hh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/Interval_Info.defs.hh b/src/Interval_Info.defs.hh index e9751ce..5a2158e 100644 --- a/src/Interval_Info.defs.hh +++ b/src/Interval_Info.defs.hh @@ -190,7 +190,9 @@ public: set_boundary_property(t, SPECIAL, false); set_boundary_property(t, OPEN, false); } - void set_boundary_property(Boundary_Type t, const Boundary_NS::Property& p, bool value = true) { + void set_boundary_property(Boundary_Type t, + const Boundary_NS::Property& p, + bool value = true) { switch (p.type) { case Boundary_NS::Property::SPECIAL_: if (store_special) {

1 0

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

25 Feb '12

Module: ppl/ppl Branch: master Commit: 2ee9075c66455229ef794874e2f1bdf45e02c6d4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2ee9075c6645… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 25 10:49:52 2012 +0100 Prefer explicit test against zero. Detected by ECLAIR service utypflag. --- src/checked_mpz.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/checked_mpz.inlines.hh b/src/checked_mpz.inlines.hh index afa84b0..e8aec87 100644 --- a/src/checked_mpz.inlines.hh +++ b/src/checked_mpz.inlines.hh @@ -510,7 +510,7 @@ template <typename To_Policy, typename From_Policy> inline Result smod_2exp_mpz(mpz_class& to, const mpz_class& x, unsigned int exp, Rounding_Dir) { - if (mpz_tstbit(x.get_mpz_t(), exp - 1)) + if (mpz_tstbit(x.get_mpz_t(), exp - 1) != 0) mpz_cdiv_r_2exp(to.get_mpz_t(), x.get_mpz_t(), exp); else mpz_fdiv_r_2exp(to.get_mpz_t(), x.get_mpz_t(), exp);

1 0

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

25 Feb '12

Module: ppl/ppl Branch: master Commit: ed45790955fc4f20ef69774b573dd8b505a71d78 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ed45790955fc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 25 10:15:43 2012 +0100 Prefer explicit tests against zero. Detected by ECLAIR service utypflag. --- src/globals.defs.hh | 4 ++-- src/globals.inlines.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/globals.defs.hh b/src/globals.defs.hh index 314194d..2c54772 100644 --- a/src/globals.defs.hh +++ b/src/globals.defs.hh @@ -175,12 +175,12 @@ extern unsigned int in_assert; #define WEIGHT_BEGIN() #define WEIGHT_ADD(delta) \ do { \ - if (!Implementation::in_assert) \ + if (Implementation::in_assert == 0) \ Weightwatch_Traits::weight += delta; \ } while (false) #define WEIGHT_ADD_MUL(delta, factor) \ do { \ - if (!Implementation::in_assert) \ + if (Implementation::in_assert == 0) \ Weightwatch_Traits::weight += delta * factor; \ } while (false) #endif diff --git a/src/globals.inlines.hh b/src/globals.inlines.hh index 09936ec..d176bb0 100644 --- a/src/globals.inlines.hh +++ b/src/globals.inlines.hh @@ -64,7 +64,7 @@ Throwable::~Throwable() { inline void maybe_abandon() { #ifndef NDEBUG - if (Implementation::in_assert) + if (Implementation::in_assert != 0) return; #endif if (Weightwatch_Traits::check_function != 0)

1 0

[GIT] ppl/ppl(master): Code layout made conformat to the coding standard.
by Roberto Bagnara 25 Feb '12

25 Feb '12

Module: ppl/ppl Branch: master Commit: 206682b08f624911ad29cfdc1d64bef59d6e8278 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=206682b08f62… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Feb 25 08:43:06 2012 +0100 Code layout made conformat to the coding standard. --- src/compiler.hh | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/compiler.hh b/src/compiler.hh index 0aa3e85..a0a162d 100644 --- a/src/compiler.hh +++ b/src/compiler.hh @@ -82,7 +82,8 @@ struct Suppress_Uninitialized_Warnings_Type { #if !defined(__GNUC__) -inline unsigned int clz32(u_int32_t w) { +inline unsigned int +clz32(u_int32_t w) { unsigned int r = 31; if ((w & 0xffffffff00000000ULL) != 0) { w = (w >> 31) >> 1; @@ -109,14 +110,16 @@ inline unsigned int clz32(u_int32_t w) { return r; } -inline unsigned int clz64(u_int64_t w) { +inline unsigned int +clz64(u_int64_t w) { if ((w & 0xffffffff00000000ULL) == 0) return clz32(static_cast<u_int32_t>(w)) + 32; else return clz32(static_cast<u_int32_t>(w >> 32)); } -inline unsigned int ctz32(u_int32_t w) { +inline unsigned int +ctz32(u_int32_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, @@ -125,7 +128,8 @@ inline unsigned int ctz32(u_int32_t w) { return mod37_table[(w & -w) % 37]; } -inline unsigned int ctz64(u_int64_t w) { +inline unsigned int +ctz64(u_int64_t w) { if ((w & 0x00000000ffffffffULL) == 0) return ctz32(static_cast<u_int32_t>(w >> 32)) + 32; else

1 0