- PPL-devel - BUGSENG Mailman

PPL's Int64_Box's CC76_widening
by Zhoulai 03 Sep '12

03 Sep '12

Hello, By PPL's Int64_Box.CC76_widening_assign , I get [1,1] \widen [1,2] = [1,2] whereas [1,+inf] is expected in this case. Here is my Java test code (below createIntBox (a,b) is a help function that creates an interval of dimension 1 between integers 'a' and 'b') Int64_Box b=createIntBox(1, 1); Int64_Box b2=createIntBox(1, 2); out.println(b+", " + b2); b2.CC76_widening_assign(b, new By_Reference<Integer>(0)); out.println(b+", " + b2); I get: A in 1, A in [1, 2] A in 1, A in [1, 2] I probably misunderstand something, but applying the original definition of widening as defined in CC76, we have the following: [1,1] \widening [1,2] = [1, +inf] which is different from PPL's result above. Strangely, if I change 'b2' to [1,3] ,i.e. Int64_Box b2=createIntBox(1, 3), I will get the expected results, i.e [1,1] \widening [1,3] = [1, +inf] So It becomes a bit confusing. Maybe PPL has another implementation of CC76's widening? Can you clarify a bit? Thanks. Zell. p.s For completeness, here is the 'createIntBox' part: private static Int64_Box createIntBox(int a, int b) { Linear_Expression_Variable var = new Linear_Expression_Variable(new Variable(0)); Linear_Expression le_a = new Linear_Expression_Coefficient(new Coefficient(a)); Linear_Expression le_b = new Linear_Expression_Coefficient(new Coefficient(b)); Int64_Box box=new Int64_Box(1, Degenerate_Element.UNIVERSE); box.add_constraint(new Constraint(var, Relation_Symbol.GREATER_OR_EQUAL, le_a)); box.add_constraint(new Constraint(var, Relation_Symbol.LESS_OR_EQUAL, le_b)); return box; }

2 1

[GIT] ppl/ppl(master): Updated news.
by Enea Zaffanella 30 Aug '12

30 Aug '12

Module: ppl/ppl Branch: master Commit: 6d75839dc6ad19ce268208bd459ba9724efaa562 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6d75839dc6ad… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Aug 30 16:56:38 2012 +0200 Updated news. --- NEWS | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 8b0b11e..c63e20a 100644 --- a/NEWS +++ b/NEWS @@ -37,6 +37,14 @@ Bugfixes o Portability improved. +o Fixed a precision regression in Polyhedron method + void drop_some_non_integer_points(const Variables_Set&, + Complexity_Class); + +o In the Java interface, fixed declaration of methods + void drop_some_non_integer_points(...); + so as to accept a Complexity_Class enum value. + -------------------------------------------------------------------------- NEWS for version 1.0 (released on June 28, 2012)

1 0

[GIT] ppl/ppl(master): Added a Java testcase for method drop_some_non_integer_points().
by Enea Zaffanella 30 Aug '12

30 Aug '12

Module: ppl/ppl Branch: master Commit: ec402f20b005730cac93521b9ce89718da352e00 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ec402f20b005… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Aug 30 15:15:47 2012 +0200 Added a Java testcase for method drop_some_non_integer_points(). --- interfaces/Java/tests/C_Polyhedron_test1.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/interfaces/Java/tests/C_Polyhedron_test1.java b/interfaces/Java/tests/C_Polyhedron_test1.java index 5859893..001b339 100644 --- a/interfaces/Java/tests/C_Polyhedron_test1.java +++ b/interfaces/Java/tests/C_Polyhedron_test1.java @@ -93,6 +93,27 @@ public class C_Polyhedron_test1 { return cs.isEmpty(); } + public static boolean test03() { + Variable A = new Variable(0); + Variable B = new Variable(1); + Generator_System gs = new Generator_System(); + gs.add(Generator.point(new Linear_Expression_Variable(A), + new Coefficient(2))); + gs.add(Generator.point(new Linear_Expression_Variable(B), + new Coefficient(2))); + C_Polyhedron ph = new C_Polyhedron(gs); + Variables_Set var_set = new Variables_Set(); + var_set.add(B); + ph.drop_some_non_integer_points(var_set, + Complexity_Class.ANY_COMPLEXITY); + Generator_System gs_out = ph.minimized_generators(); + boolean ok = (gs_out.size() == 1); + ph.drop_some_non_integer_points(Complexity_Class.ANY_COMPLEXITY); + gs_out = ph.minimized_generators(); + ok = ok && gs_out.isEmpty(); + return ok; + } + public static void main(String[] args) { Parma_Polyhedra_Library.initialize_library(); boolean test_result_ok =

1 0

[GIT] ppl/ppl(master): Fixed a precision problem in method
by Enea Zaffanella 30 Aug '12

30 Aug '12

Module: ppl/ppl Branch: master Commit: cd98130f36755b94076e4a870bf399a8cac4b873 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cd98130f3675… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Aug 30 15:14:19 2012 +0200 Fixed a precision problem in method Polyhedron::drop_some_non_integer_points(). --- src/Polyhedron_nonpublic.cc | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/Polyhedron_nonpublic.cc b/src/Polyhedron_nonpublic.cc index 7d38f3e..5657e32 100644 --- a/src/Polyhedron_nonpublic.cc +++ b/src/Polyhedron_nonpublic.cc @@ -2130,14 +2130,25 @@ PPL::Polyhedron::drop_some_non_integer_points(const Variables_Set* vars_p, const bool con_sys_was_sorted = con_sys.is_sorted(); + Variables_Set other_vars; + if (vars_p != 0) { + // Compute the complement of `*vars_p'. + for (dimension_type i = 0; i < space_dim; ++i) { + if (vars_p->find(i) == vars_p->end()) + other_vars.insert(Variable(i)); + } + } + for (dimension_type j = con_sys.sys.rows.size(); j-- > 0; ) { Constraint& c = con_sys.sys.rows[j]; if (c.is_tautological()) continue; - if (vars_p != 0) { - if (!c.expression().all_zeroes(*vars_p)) - goto next_constraint; + if (!other_vars.empty()) { + // Skip constraints having a nonzero coefficient for a variable + // that does not occurr in the input set. + if (!c.expression().all_zeroes(other_vars)) + continue; } if (!is_necessarily_closed()) { @@ -2180,22 +2191,17 @@ PPL::Polyhedron::drop_some_non_integer_points(const Variables_Set* vars_p, PPL_ASSERT(c.OK()); changed = true; } - - next_constraint: - ; } con_sys.set_sorted(!changed && con_sys_was_sorted); PPL_ASSERT(con_sys.sys.OK()); if (changed) { - if (!is_necessarily_closed()) + if (is_necessarily_closed()) + con_sys.insert(Constraint::zero_dim_positivity()); + else con_sys.insert(Constraint::epsilon_leq_one()); - // FIXME: make sure this is correct (otherwise it should be removed). - if (is_necessarily_closed() && con_sys_was_sorted) - con_sys.set_sorted(true); - // After changing the system of constraints, the generators // are no longer up-to-date and the constraints are no longer // minimized.

1 0

[GIT] ppl/ppl(master): Added a new test showing a precision problem in one of the methods
by Enea Zaffanella 30 Aug '12

30 Aug '12

Module: ppl/ppl Branch: master Commit: a9c8f53c83cc54b1a29e7a0df6ff691493364152 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a9c8f53c83cc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Aug 30 15:10:40 2012 +0200 Added a new test showing a precision problem in one of the methods Polyhedron::drop_some_non_integer_points(); --- tests/Polyhedron/dropsomenonintegerpoints2.cc | 35 +++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/tests/Polyhedron/dropsomenonintegerpoints2.cc b/tests/Polyhedron/dropsomenonintegerpoints2.cc index 4adcce6..bf350ed 100644 --- a/tests/Polyhedron/dropsomenonintegerpoints2.cc +++ b/tests/Polyhedron/dropsomenonintegerpoints2.cc @@ -150,6 +150,40 @@ test05() { return ok; } +bool +test06() { + Variable A(0); + Variable B(1); + + C_Polyhedron ph(2, EMPTY); + ph.add_generator(point(A, 2)); + ph.add_generator(point(B, 2)); + + print_generators(ph, "*** ph ***"); + + ph.drop_some_non_integer_points(Variables_Set(B)); + + C_Polyhedron known_result1(2, EMPTY); + known_result1.add_generator(point(A, 2)); + + bool ok = (ph == known_result1); + + print_constraints(ph, "*** after ph.drop_some_non_integer_points({B}) ***"); + + if (!ok) + return ok; + + ph.drop_some_non_integer_points(Variables_Set(A)); + + C_Polyhedron known_result2(2, EMPTY); + + ok = (ph == known_result2); + + print_constraints(ph, "*** after ph.drop_some_non_integer_points({A}) ***"); + + return ok; +} + } // namespace BEGIN_MAIN @@ -158,4 +192,5 @@ BEGIN_MAIN DO_TEST(test03); DO_TEST(test04); DO_TEST(test05); + DO_TEST(test06); END_MAIN

1 0

[GIT] ppl/ppl(master): Fixed Java interface issues for method drop_some_non_integer_points(),
by Enea Zaffanella 30 Aug '12

30 Aug '12

Module: ppl/ppl Branch: master Commit: 0f82172b6a51e2695d730f9f52e1becfd863583d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0f82172b6a51… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Aug 30 14:50:27 2012 +0200 Fixed Java interface issues for method drop_some_non_integer_points(), reported by Zell (Zhoulai). Corrected the declaration of the method by letting it accept a Complexity_Class enumeration value (rather than a plain integer). Also renamed the version taking a set of variables as input, which was using the suffix "_2", so as to exploit overloading. --- ...ppl_interface_generator_java_classes_cc_code.m4 | 4 ++-- ...l_interface_generator_java_classes_java_code.m4 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 index a06df38..349b01d 100644 --- a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 +++ b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 @@ -1171,7 +1171,7 @@ CATCH_ALL m4_define(`ppl_@CLASS@_drop_some_non_integer_points_code', `dnl -JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_@1CLASS@_drop_1some_1non_1integer_1points +JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_@1CLASS@_drop_1some_1non_1integer_1points__Lparma_1polyhedra_1library_Complexity_1Class_2 (JNIEnv* env, jobject j_this, jobject j_complexity) try { @CPP_CLASS@* this_ptr = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_this)); @@ -1200,7 +1200,7 @@ CATCH_ALL m4_define(`ppl_@CLASS@_drop_some_non_integer_points_2_code', `dnl -JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_@1CLASS@_drop_1some_1non_1integer_1points_12 +JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_@1CLASS@_drop_1some_1non_1integer_1points__Lparma_1polyhedra_1library_Variables_1Set_2Lparma_1polyhedra_1library_Complexity_1Class_2 (JNIEnv* env, jobject j_this, jobject j_v_set, jobject j_complexity) try { @CPP_CLASS@* this_ptr = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_this)); diff --git a/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 b/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 index cb86f1f..66723bc 100644 --- a/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 +++ b/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 @@ -538,7 +538,7 @@ m4_define(`ppl_@CLASS@_drop_some_non_integer_points_code', ___END_OF_FILE___ ___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ public native void drop_some_non_integer_points - (Integer complexity_threshold); + (Complexity_Class complexity); ') @@ -546,8 +546,8 @@ m4_define(`ppl_@CLASS@_drop_some_non_integer_points_2_code', `dnl ___END_OF_FILE___ ___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ - public native void drop_some_non_integer_points_2 - (Variables_Set vars, Integer complexity_threshold); + public native void drop_some_non_integer_points + (Variables_Set vars, Complexity_Class complexity); ')

1 0

drop_some_non_ineger_points raises " Invalid memory access of location 0x0 rip=0x1011a50ca "
by Zell 30 Aug '12

30 Aug '12

Hello, I may probably wrongly use the PPL's Java interface, but here are my naive questions among others, 1. Is it normal that the following codes raise this error " Invalid memory access of location 0x0 rip=0x1011a50ca " ? (The JAVA's interface for 'drop_some_non_integer_points" requies an integer or variable-set plus an integers as its parameters, rather than C's " void drop_some_non_integer_points (Complexity_Class complexity=ANY_COMPLEXITY)" ) . .....cod Constraint c = new Constraint(le_5Z, Relation_Symbol.GREATER_THAN, le_X); Constraint_System cs = new Constraint_System(); cs .add(c); NNC_Polyhedron ph2=new NNC_Polyhedron(cs); ph2.drop_some_non_integer_points(new Integer(1)); ...... 2. I don't find ways to specify a constraint with explicite rational or real numbers, like x>=2.5, because the 'Coefficient' only accepts integers. Does than mean that I am obliged to use 2 *x >=5 rather than x >2.5? Thanks. zell.

2 1

[GIT] ppl/ppl(master): Added test invocations that were left out by mistake .
by Roberto Bagnara 27 Aug '12

27 Aug '12

Module: ppl/ppl Branch: master Commit: a1141d90a6f39a0d473d1489ed5075ec6cb3739b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a1141d90a6f3… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Aug 27 08:21:22 2012 +0200 Added test invocations that were left out by mistake. --- tests/Box/refinewithcongruence1.cc | 2 ++ .../boundedaffineimage1.cc | 5 +++-- tests/Powerset/fromconstraints1.cc | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/Box/refinewithcongruence1.cc b/tests/Box/refinewithcongruence1.cc index 6b61c50..fb4e98c 100644 --- a/tests/Box/refinewithcongruence1.cc +++ b/tests/Box/refinewithcongruence1.cc @@ -191,5 +191,7 @@ BEGIN_MAIN DO_TEST(test02); DO_TEST(test03); DO_TEST(test04); + DO_TEST(test05); + DO_TEST(test06); DO_TEST(test07); END_MAIN diff --git a/tests/Partially_Reduced_Product/boundedaffineimage1.cc b/tests/Partially_Reduced_Product/boundedaffineimage1.cc index 7140d17..0b6c1ee 100644 --- a/tests/Partially_Reduced_Product/boundedaffineimage1.cc +++ b/tests/Partially_Reduced_Product/boundedaffineimage1.cc @@ -196,7 +196,7 @@ test08() { // Non-empty product. bounded_affine_preimage/3 bool -test16() { +test09() { Variable A(0); Variable B(1); Variable C(2); @@ -229,7 +229,7 @@ test16() { // Empty product. bounded_affine_preimage/3 bool -test09() { +test10() { Variable A(0); Variable B(1); Variable C(2); @@ -266,4 +266,5 @@ BEGIN_MAIN DO_TEST(test07); DO_TEST(test08); DO_TEST(test09); + DO_TEST(test10); END_MAIN diff --git a/tests/Powerset/fromconstraints1.cc b/tests/Powerset/fromconstraints1.cc index 5518696..fd5a335 100644 --- a/tests/Powerset/fromconstraints1.cc +++ b/tests/Powerset/fromconstraints1.cc @@ -177,4 +177,6 @@ BEGIN_MAIN DO_TEST(test08); DO_TEST(test09); DO_TEST(test10); + DO_TEST(test11); + DO_TEST(test12); END_MAIN

1 0

[GIT] ppl/ppl(master): Indentation fixed.
by Roberto Bagnara 27 Aug '12

27 Aug '12

Module: ppl/ppl Branch: master Commit: 70be8fa73540f064559b31be993b8f36a212556f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=70be8fa73540… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Aug 27 08:03:44 2012 +0200 Indentation fixed. --- src/C_Integer.hh | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/C_Integer.hh b/src/C_Integer.hh index 8b9a33d..e7432ed 100644 --- a/src/C_Integer.hh +++ b/src/C_Integer.hh @@ -84,7 +84,9 @@ struct C_Integer<char> : public True { template <> struct C_Integer<signed char> : public True { - enum const_bool_value { is_signed = true }; + enum const_bool_value { + is_signed = true + }; typedef void smaller_type; typedef void smaller_signed_type; typedef void smaller_unsigned_type; @@ -95,7 +97,9 @@ struct C_Integer<signed char> : public True { template <> struct C_Integer<signed short> : public True { - enum const_bool_value { is_signed = true }; + enum const_bool_value { + is_signed = true + }; typedef signed char smaller_type; typedef signed char smaller_signed_type; typedef unsigned char smaller_unsigned_type; @@ -106,7 +110,9 @@ struct C_Integer<signed short> : public True { template <> struct C_Integer<signed int> : public True { - enum const_bool_value { is_signed = true }; + enum const_bool_value { + is_signed = true + }; typedef signed short smaller_type; typedef signed short smaller_signed_type; typedef unsigned short smaller_unsigned_type; @@ -117,7 +123,9 @@ struct C_Integer<signed int> : public True { template <> struct C_Integer<signed long> : public True { - enum const_bool_value { is_signed = true }; + enum const_bool_value { + is_signed = true + }; typedef signed int smaller_type; typedef signed int smaller_signed_type; typedef unsigned int smaller_unsigned_type; @@ -128,7 +136,9 @@ struct C_Integer<signed long> : public True { template <> struct C_Integer<signed long long> : public True { - enum const_bool_value { is_signed = true }; + enum const_bool_value { + is_signed = true + }; typedef signed long smaller_type; typedef signed long smaller_signed_type; typedef unsigned long smaller_unsigned_type; @@ -139,7 +149,9 @@ struct C_Integer<signed long long> : public True { template <> struct C_Integer<unsigned char> : public True { - enum const_bool_value { is_signed = false }; + enum const_bool_value { + is_signed = false + }; typedef void smaller_type; typedef void smaller_signed_type; typedef void smaller_unsigned_type; @@ -150,7 +162,9 @@ struct C_Integer<unsigned char> : public True { template <> struct C_Integer<unsigned short> : public True { - enum const_bool_value { is_signed = false }; + enum const_bool_value { + is_signed = false + }; typedef unsigned char smaller_type; typedef signed char smaller_signed_type; typedef unsigned char smaller_unsigned_type; @@ -161,7 +175,9 @@ struct C_Integer<unsigned short> : public True { template <> struct C_Integer<unsigned int> : public True { - enum const_bool_value { is_signed = false }; + enum const_bool_value { + is_signed = false + }; typedef unsigned short smaller_type; typedef signed short smaller_signed_type; typedef unsigned short smaller_unsigned_type; @@ -172,7 +188,9 @@ struct C_Integer<unsigned int> : public True { template <> struct C_Integer<unsigned long> : public True { - enum const_bool_value { is_signed = false }; + enum const_bool_value { + is_signed = false + }; typedef unsigned int smaller_type; typedef signed int smaller_signed_type; typedef unsigned int smaller_unsigned_type; @@ -183,7 +201,9 @@ struct C_Integer<unsigned long> : public True { template <> struct C_Integer<unsigned long long> : public True { - enum const_bool_value { is_signed = false }; + enum const_bool_value { + is_signed = false + }; typedef unsigned long smaller_type; typedef signed long smaller_signed_type; typedef unsigned long smaller_unsigned_type;

1 0

[GIT] ppl/ppl(master): Avoided user defined and implementation define behaviors of left and right shift .
by Abramo Bagnara 25 Aug '12

25 Aug '12

Module: ppl/ppl Branch: master Commit: 685ee646b27f9f757e912ff3ae53610332292c35 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=685ee646b27f… Author: Abramo Bagnara <abramo.bagnara(a)bugseng.com> Date: Sat Aug 25 11:46:06 2012 +0200 Avoided user defined and implementation define behaviors of left and right shift. --- src/checked_int_inlines.hh | 113 +++++++++++++++++++++----------------------- 1 files changed, 54 insertions(+), 59 deletions(-) diff --git a/src/checked_int_inlines.hh b/src/checked_int_inlines.hh index f88677e..e92d806 100644 --- a/src/checked_int_inlines.hh +++ b/src/checked_int_inlines.hh @@ -1213,45 +1213,40 @@ template <typename To_Policy, typename From_Policy, typename Type> inline Result div_2exp_signed_int(Type& to, const Type x, unsigned int exp, Rounding_Dir dir) { - if (exp > sizeof_to_bits(sizeof(Type)) - 1) { - zero: - to = 0; + if (x < 0) { + if (exp >= sizeof_to_bits(sizeof(Type))) { + to = 0; + if (round_not_requested(dir)) + return V_LE; + return round_lt_int_no_overflow<To_Policy>(to, dir); + } + typedef typename C_Integer<Type>::other_type UType; + UType ux = x; + ux = -ux; + to = ~Type(~-(ux >> exp)); if (round_not_requested(dir)) - return V_LGE; - if (x < 0) + return V_LE; + if (ux & ((UType(1) << exp) -1)) return round_lt_int_no_overflow<To_Policy>(to, dir); - else if (x > 0) + return V_EQ; + } + else { + if (exp >= sizeof_to_bits(sizeof(Type)) - 1) { + to = 0; + if (round_not_requested(dir)) + return V_GE; + if (x == 0) + return V_EQ; + return round_gt_int_no_overflow<To_Policy>(to, dir); + } + to = x >> exp; + if (round_not_requested(dir)) + return V_GE; + if (x & ((Type(1) << exp) - 1)) return round_gt_int_no_overflow<To_Policy>(to, dir); else return V_EQ; } - if (exp == sizeof_to_bits(sizeof(Type)) - 1) { - if (x == C_Integer<Type>::min) { - to = -1; - return V_EQ; - } - goto zero; - } -#if 0 - to = x / (Type(1) << exp); - if (round_not_requested(dir)) - return V_GE; - Type r = x % (Type(1) << exp); - if (r < 0) - return round_lt_int_no_overflow<To_Policy>(to, dir); - else if (r > 0) - return round_gt_int_no_overflow<To_Policy>(to, dir); - else - return V_EQ; -#else - // Faster but compiler implementation dependent (see C++98 5.8.3) - to = x >> exp; - if (round_not_requested(dir)) - return V_GE; - if (x & ((Type(1) << exp) - 1)) - return round_gt_int_no_overflow<To_Policy>(to, dir); - return V_EQ; -#endif } template <typename To_Policy, typename From_Policy, typename Type> @@ -1337,12 +1332,9 @@ mul_2exp_unsigned_int(Type& to, const Type x, unsigned int exp, } return set_pos_overflow_int<To_Policy>(to, dir); } - if (x & (((Type(1) << exp) - 1) << (sizeof_to_bits(sizeof(Type)) - exp))) - return set_pos_overflow_int<To_Policy>(to, dir); - Type n = x << exp; - if (PPL_GT_SILENT(n, (Extended_Int<To_Policy, Type>::max))) + if (x > Extended_Int<To_Policy, Type>::max >> exp) return set_pos_overflow_int<To_Policy>(to, dir); - to = n; + to = x << exp; return V_EQ; } @@ -1350,37 +1342,40 @@ template <typename To_Policy, typename From_Policy, typename Type> inline Result mul_2exp_signed_int(Type& to, const Type x, unsigned int exp, Rounding_Dir dir) { - if (!To_Policy::check_overflow) { - to = x << exp; - return V_EQ; - } - if (exp >= sizeof_to_bits(sizeof(Type)) - 1) { - if (x < 0) - return set_neg_overflow_int<To_Policy>(to, dir); - else if (x > 0) - return set_pos_overflow_int<To_Policy>(to, dir); - else { - to = 0; + if (x < 0) { + if (!To_Policy::check_overflow) { + to = x * (Type(1) << exp); return V_EQ; } - } - Type mask = ((Type(1) << exp) - 1) << ((sizeof_to_bits(sizeof(Type)) - 1) - exp); - Type n; - if (x < 0) { - if ((x & mask) != mask) + if (exp >= sizeof_to_bits(sizeof(Type))) + return set_neg_overflow_int<To_Policy>(to, dir); + typedef typename C_Integer<Type>::other_type UType; + UType mask = UType(-1) << (sizeof_to_bits(sizeof(Type)) - exp - 1); + UType ux = x; + if ((ux & mask) != mask) return set_neg_overflow_int<To_Policy>(to, dir); - n = x << exp; + ux <<= exp; + Type n = ~(Type(~ux)); if (PPL_LT_SILENT(n, (Extended_Int<To_Policy, Type>::min))) return set_neg_overflow_int<To_Policy>(to, dir); + to = n; } else { - if (x & mask) + if (!To_Policy::check_overflow) { + to = x << exp; + return V_EQ; + } + if (exp >= sizeof_to_bits(sizeof(Type)) - 1) { + if (x == 0) { + to = 0; + return V_EQ; + } return set_pos_overflow_int<To_Policy>(to, dir); - n = x << exp; - if (PPL_GT_SILENT(n, (Extended_Int<To_Policy, Type>::max))) + } + if (x > Extended_Int<To_Policy, Type>::max >> exp) return set_pos_overflow_int<To_Policy>(to, dir); + to = x << exp; } - to = n; return V_EQ; }

1 0