- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Fixed bool vs. numeric unsafe mixing.
by Abramo Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 7f72ff168aa3989740f248c1fbe636f01157a9e6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7f72ff168aa3… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Nov 3 16:13:06 2011 +0100 Fixed bool vs. numeric unsafe mixing. Detected by ECLAIR service utypflag. --- src/checked_float.inlines.hh | 6 +++--- src/fpu-c99.inlines.hh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 5f91f67..c6ed19a 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -801,12 +801,12 @@ 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_z = from.get_mpz_t(); - int sign = mpz_sgn(from_z); + int sign = sgn(from); if (sign == 0) { to = 0; return V_EQ; } + mpz_srcptr from_z = from.get_mpz_t(); size_t exponent = mpz_sizeinbase(from_z, 2) - 1; if (exponent > size_t(Float<T>::Binary::EXPONENT_MAX)) { if (sign < 0) @@ -846,7 +846,7 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { 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); + int sign = sgn(num); signed long exponent = mpz_sizeinbase(num_z, 2) - mpz_sizeinbase(den_z, 2); if (exponent < Float<T>::Binary::EXPONENT_MIN_DENORM) { to = 0; diff --git a/src/fpu-c99.inlines.hh b/src/fpu-c99.inlines.hh index 7fc12de..cda7a4c 100644 --- a/src/fpu-c99.inlines.hh +++ b/src/fpu-c99.inlines.hh @@ -87,7 +87,7 @@ fpu_restore_rounding_direction(fpu_rounding_control_word_type w) { inline int fpu_check_inexact() { #if PPL_CXX_SUPPORTS_IEEE_INEXACT_FLAG - return fetestexcept(FE_INEXACT) != 0; + return fetestexcept(FE_INEXACT) != 0 ? 1 : 0; #else return -1; #endif

1 0

[GIT] ppl/ppl(master): Avoid implicit integral conversion reducing size of underlying type.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: ad542abaf25726e348754a9fb139074f6df9f81b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ad542abaf257… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 15:19:21 2011 +0100 Avoid implicit integral conversion reducing size of underlying type. Detected by ECLAIR service utypflag. --- src/checked.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/checked.cc b/src/checked.cc index ed71a67..d1a8aed 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -278,7 +278,7 @@ parse_number_part(std::istream& is, number_struct& num) { exp: state = EXPONENT; max_exp_div = LONG_MAX / num.base; - max_exp_rem = LONG_MAX % num.base; + max_exp_rem = static_cast<int>(LONG_MAX % num.base); if (!is.get(c)) return V_CVT_STR_UNK; if (c == '-') {

1 0

[GIT] ppl/ppl(master): Fixed bool vs. numeric unsafe mixing.
by Abramo Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 8eebe6d762e82c521dd7c0be6206df2928e4fcb1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8eebe6d762e8… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Nov 3 10:15:26 2011 +0100 Fixed bool vs. numeric unsafe mixing. Detected by ECLAIR service utypflag. --- src/Float.defs.hh | 24 ++++++++++++------------ src/Float.inlines.hh | 24 ++++++++++++------------ src/Interval_Info.defs.hh | 2 +- src/checked.cc | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Float.defs.hh b/src/Float.defs.hh index 541b9df..1e50ecc 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -66,9 +66,9 @@ struct float_ieee754_half { - static_cast<int>(MANTISSA_BITS); static const Floating_Point_Format floating_point_format = IEEE754_HALF; int is_inf() const; - int is_nan() const; + bool is_nan() const; int is_zero() const; - int sign_bit() const; + bool sign_bit() const; void negate(); void dec(); void inc(); @@ -99,9 +99,9 @@ struct float_ieee754_single { - static_cast<int>(MANTISSA_BITS); static const Floating_Point_Format floating_point_format = IEEE754_SINGLE; int is_inf() const; - int is_nan() const; + bool is_nan() const; int is_zero() const; - int sign_bit() const; + bool sign_bit() const; void negate(); void dec(); void inc(); @@ -145,9 +145,9 @@ struct float_ieee754_double { - static_cast<int>(MANTISSA_BITS); static const Floating_Point_Format floating_point_format = IEEE754_DOUBLE; int is_inf() const; - int is_nan() const; + bool is_nan() const; int is_zero() const; - int sign_bit() const; + bool sign_bit() const; void negate(); void dec(); void inc(); @@ -177,9 +177,9 @@ struct float_ibm_single { - static_cast<int>(MANTISSA_BITS); static const Floating_Point_Format floating_point_format = IBM_SINGLE; int is_inf() const; - int is_nan() const; + bool is_nan() const; int is_zero() const; - int sign_bit() const; + bool sign_bit() const; void negate(); void dec(); void inc(); @@ -230,9 +230,9 @@ struct float_intel_double_extended { static const Floating_Point_Format floating_point_format = INTEL_DOUBLE_EXTENDED; int is_inf() const; - int is_nan() const; + bool is_nan() const; int is_zero() const; - int sign_bit() const; + bool sign_bit() const; void negate(); void dec(); void inc(); @@ -269,9 +269,9 @@ struct float_ieee754_quad { static const int EXPONENT_MIN_DENORM = EXPONENT_MIN - static_cast<int>(MANTISSA_BITS); int is_inf() const; - int is_nan() const; + bool is_nan() const; int is_zero() const; - int sign_bit() const; + bool sign_bit() const; void negate(); void dec(); void inc(); diff --git a/src/Float.inlines.hh b/src/Float.inlines.hh index ba3a42b..a456606 100644 --- a/src/Float.inlines.hh +++ b/src/Float.inlines.hh @@ -39,7 +39,7 @@ float_ieee754_half::is_inf() const { return 0; } -inline int +inline bool float_ieee754_half::is_nan() const { return (word & ~SGN_MASK) > POS_INF; } @@ -58,7 +58,7 @@ float_ieee754_half::negate() { word ^= SGN_MASK; } -inline int +inline bool float_ieee754_half::sign_bit() const { return !!(word & SGN_MASK); } @@ -100,7 +100,7 @@ float_ieee754_single::is_inf() const { return 0; } -inline int +inline bool float_ieee754_single::is_nan() const { return (word & ~SGN_MASK) > POS_INF; } @@ -119,7 +119,7 @@ float_ieee754_single::negate() { word ^= SGN_MASK; } -inline int +inline bool float_ieee754_single::sign_bit() const { return !!(word & SGN_MASK); } @@ -163,7 +163,7 @@ float_ieee754_double::is_inf() const { return 0; } -inline int +inline bool float_ieee754_double::is_nan() const { uint32_t a = msp & ~MSP_SGN_MASK; return a > MSP_POS_INF || (a == MSP_POS_INF && lsp != LSP_INF); @@ -185,7 +185,7 @@ float_ieee754_double::negate() { msp ^= MSP_SGN_MASK; } -inline int +inline bool float_ieee754_double::sign_bit() const { return !!(msp & MSP_SGN_MASK); } @@ -247,7 +247,7 @@ float_ibm_single::is_inf() const { return 0; } -inline int +inline bool float_ibm_single::is_nan() const { return (word & ~SGN_MASK) > POS_INF; } @@ -266,7 +266,7 @@ float_ibm_single::negate() { word ^= SGN_MASK; } -inline int +inline bool float_ibm_single::sign_bit() const { return !!(word & SGN_MASK); } @@ -311,7 +311,7 @@ float_intel_double_extended::is_inf() const { return 0; } -inline int +inline bool float_intel_double_extended::is_nan() const { return (msp & MSP_POS_INF) == MSP_POS_INF && lsp != LSP_INF; @@ -334,7 +334,7 @@ float_intel_double_extended::negate() { msp ^= MSP_SGN_MASK; } -inline int +inline bool float_intel_double_extended::sign_bit() const { return !!(msp & MSP_SGN_MASK); } @@ -392,7 +392,7 @@ float_ieee754_quad::is_inf() const { return 0; } -inline int +inline bool float_ieee754_quad::is_nan() const { return (msp & ~MSP_SGN_MASK) == MSP_POS_INF && lsp != LSP_INF; @@ -414,7 +414,7 @@ float_ieee754_quad::negate() { msp ^= MSP_SGN_MASK; } -inline int +inline bool float_ieee754_quad::sign_bit() const { return !!(msp & MSP_SGN_MASK); } diff --git a/src/Interval_Info.defs.hh b/src/Interval_Info.defs.hh index 3c12f2f..9312dfd 100644 --- a/src/Interval_Info.defs.hh +++ b/src/Interval_Info.defs.hh @@ -178,7 +178,7 @@ public: const_int_nodef(upper_open_bit, upper_special_bit + store_special); const_int_nodef(upper_normalized_bit, upper_open_bit + store_open); const_int_nodef(cardinality_is_bit, upper_normalized_bit + cache_normalized); - const_int_nodef(cardinality_0_bit, cardinality_is_bit + (cache_empty || cache_singleton)); + 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); Interval_Info_Bitset() { diff --git a/src/checked.cc b/src/checked.cc index 842611f..ed71a67 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -404,7 +404,7 @@ input_mpq(mpq_class& to, std::istream& is) { mpz_ptr den = to.get_den().get_mpz_t(); mpz_set_str(num, num_struct.mantissa.c_str(), num_struct.base); if (den_struct.base) { - if (num_struct.neg_mantissa ^ den_struct.neg_mantissa) + if (num_struct.neg_mantissa != den_struct.neg_mantissa) mpz_neg(num, num); mpz_set_str(den, den_struct.mantissa.c_str(), den_struct.base); if (num_struct.exponent || den_struct.exponent) {

1 0

[GIT] ppl/ppl(master): Fixed plain char vs. numeric unsafe mixing.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 5e7acd07fc98bbc595c40e5705656010ac54d614 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5e7acd07fc98… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 09:36:07 2011 +0100 Fixed plain char vs. numeric unsafe mixing. Detected by ECLAIR service utypflag. --- src/C_Integer.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/C_Integer.hh b/src/C_Integer.hh index f0cdbee..84c03e6 100644 --- a/src/C_Integer.hh +++ b/src/C_Integer.hh @@ -78,8 +78,8 @@ struct C_Integer<char> : public True { #else typedef signed char other_type; #endif - static const char min = CHAR_MIN; - static const char max = CHAR_MAX; + static const char min = static_cast<char>(CHAR_MIN); + static const char max = static_cast<char>(CHAR_MAX); }; template <>

1 0

[GIT] ppl/ppl(master): Fixed plain char vs. numeric unsafe mixing.
by Abramo Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 20692dc4750f2990bb5d83b0fa943c4c046f99f5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=20692dc4750f… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Nov 3 09:33:34 2011 +0100 Fixed plain char vs. numeric unsafe mixing. Detected by ECLAIR service utypflag. --- src/Interval.templates.hh | 61 +++++----- src/c_streambuf.cc | 4 +- src/checked.cc | 276 ++++++++++++++++++++++++++------------------ 3 files changed, 195 insertions(+), 146 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=20692dc4…

1 0

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

03 Nov '11

Module: ppl/ppl Branch: master Commit: 3ec1ffd46d745193932cd1c60c9b843a723c5e84 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3ec1ffd46d74… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Nov 3 07:33:09 2011 +0100 Avoid explicit integral conversions that change the signedness of the underlying type of complex expressions. Detected by ECLAIR service utypflag. --- src/CO_Tree.inlines.hh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/CO_Tree.inlines.hh b/src/CO_Tree.inlines.hh index 9ff72a7..fe0064e 100644 --- a/src/CO_Tree.inlines.hh +++ b/src/CO_Tree.inlines.hh @@ -31,7 +31,8 @@ CO_Tree::dfs_index(const_iterator itr) const { PPL_ASSERT(itr.current_index != 0); PPL_ASSERT(itr.current_index >= indexes + 1); PPL_ASSERT(itr.current_index <= indexes + reserved_size); - return static_cast<dimension_type>(itr.current_index - indexes); + const ptrdiff_t index = itr.current_index - indexes; + return static_cast<dimension_type>(index); } inline dimension_type @@ -39,7 +40,8 @@ CO_Tree::dfs_index(iterator itr) const { PPL_ASSERT(itr.current_index != 0); PPL_ASSERT(itr.current_index >= indexes + 1); PPL_ASSERT(itr.current_index <= indexes + reserved_size); - return static_cast<dimension_type>(itr.current_index - indexes); + const ptrdiff_t index = itr.current_index - indexes; + return static_cast<dimension_type>(index); } inline

1 0

[GIT] ppl/ppl(master): Revert "Fixed plain char vs. numeric unsafe mixing."
by Roberto Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: a6e777561ba56e830bd44128adc8038609c8cb23 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a6e777561ba5… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Nov 3 07:08:13 2011 +0100 Revert "Fixed plain char vs. numeric unsafe mixing." This reverts commit e9ce6bcef3d6f7481e5399d8746062ccc72b25b0. --- src/Interval.templates.hh | 47 ++++---- src/c_streambuf.cc | 4 +- src/checked.cc | 276 ++++++++++++++++++-------------------------- 3 files changed, 140 insertions(+), 187 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=a6e77756…

1 0

[GIT] ppl/ppl(master): Fixed plain char vs. numeric unsafe mixing.
by Abramo Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: e9ce6bcef3d6f7481e5399d8746062ccc72b25b0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e9ce6bcef3d6… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Wed Nov 2 23:43:16 2011 +0100 Fixed plain char vs. numeric unsafe mixing. Detected by ECLAIR service utypflag. --- src/Interval.templates.hh | 47 ++++---- src/c_streambuf.cc | 4 +- src/checked.cc | 276 ++++++++++++++++++++++++++------------------ 3 files changed, 187 insertions(+), 140 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=e9ce6bce…

1 0

[GIT] ppl/ppl(master): Do not mix plain char and numeric values.
by Enea Zaffanella 02 Nov '11

02 Nov '11

Module: ppl/ppl Branch: master Commit: aacd89e5ee21cb50aeb5311b017f9f1d66cc952c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=aacd89e5ee21… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Nov 2 14:00:48 2011 +0100 Do not mix plain char and numeric values. Detected by ECLAIR service utypflag. --- src/Variable.cc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Variable.cc b/src/Variable.cc index 19d907b..d8aec32 100644 --- a/src/Variable.cc +++ b/src/Variable.cc @@ -38,8 +38,10 @@ PPL::Variable::OK() const { void PPL::Variable::default_output_function(std::ostream& s, const Variable& v) { dimension_type varid = v.id(); - s << static_cast<char>('A' + varid % 26); - if (dimension_type i = varid / 26) + static const char var_name_letters[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + const dimension_type num_letters = sizeof(var_name_letters) - 1; + s << var_name_letters[varid % num_letters]; + if (dimension_type i = varid / num_letters) s << i; }

1 0

[GIT] ppl/ppl(master): Use an explicitly signed char type when dealing with numeric info.
by Enea Zaffanella 02 Nov '11

02 Nov '11

Module: ppl/ppl Branch: master Commit: 6e68ec708a90b7099e3a32cc97b39b5e629a969a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6e68ec708a90… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Nov 2 08:42:59 2011 +0100 Use an explicitly signed char type when dealing with numeric info. Detected by ECLAIR service utypflag. --- src/CO_Tree.cc | 4 ++-- src/CO_Tree.templates.hh | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index 3c0a9fd..3f3caa1 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -1002,7 +1002,7 @@ PPL::CO_Tree::move_data_from(CO_Tree& tree) { // with operation 0, one element with operation 2 and one element // with operation 3. An additional element with operation 1 can be at the // top of the tree. - static std::pair<dimension_type,char> + static std::pair<dimension_type, signed char> stack[5*CHAR_BIT*sizeof(dimension_type)]; dimension_type stack_first_empty = 0; @@ -1025,7 +1025,7 @@ PPL::CO_Tree::move_data_from(CO_Tree& tree) { // top_n = stack.top().first; // top_operation = stack.top().second; const dimension_type top_n = stack[stack_first_empty - 1].first; - const char top_operation = stack[stack_first_empty - 1].second; + const signed char top_operation = stack[stack_first_empty - 1].second; switch (top_operation) { diff --git a/src/CO_Tree.templates.hh b/src/CO_Tree.templates.hh index d00df4f..15d5b67 100644 --- a/src/CO_Tree.templates.hh +++ b/src/CO_Tree.templates.hh @@ -1,4 +1,3 @@ - /* CO_Tree class implementation: non-inline template functions. Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> Copyright (C) 2010-2011 BUGSENG srl (http://bugseng.com) @@ -54,7 +53,7 @@ CO_Tree::CO_Tree(Iterator i, dimension_type n) { // with operation 0, one element with operation 2 and one element // with operation 3. An additional element with operation 1 can be at the // top of the tree. - static std::pair<dimension_type,char> + static std::pair<dimension_type, signed char> stack[4*CHAR_BIT*sizeof(dimension_type)+1]; dimension_type stack_first_empty = 0; @@ -77,7 +76,7 @@ CO_Tree::CO_Tree(Iterator i, dimension_type n) { // top_n = stack.top().first; // top_operation = stack.top().second; const dimension_type top_n = stack[stack_first_empty - 1].first; - const char top_operation = stack[stack_first_empty - 1].second; + const signed char top_operation = stack[stack_first_empty - 1].second; switch (top_operation) {

1 0