June 2020 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(devel): Adapted to recent versions of Ciao.
by Roberto Bagnara 25 Jun '20

25 Jun '20

Module: ppl/ppl Branch: devel Commit: c06aa5000b307aa7a70f6f5995e569feb8edf148 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c06aa5000b30… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Thu Jun 25 15:41:40 2020 +0200 Adapted to recent versions of Ciao. --- .../Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/interfaces/Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 b/interfaces/Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 index 0e3756e..c0c4146 100644 --- a/interfaces/Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 +++ b/interfaces/Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 @@ -32,11 +32,12 @@ m4_divert`'dnl m4_include(`ppl_interface_generator_copyright')dnl */ -:- module(ppl_ciao, +:- export( [ m4_divert(1) -], -[ +]). + +:- use_package([ assertions, basicmodes, regtypes,

1 0

[GIT] ppl/ppl(devel): Dependencies fixed.
by Roberto Bagnara 25 Jun '20

25 Jun '20

Module: ppl/ppl Branch: devel Commit: 642bb22fa743f5f7192393ba0e91c005cf25557b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=642bb22fa743… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Thu Jun 25 14:12:37 2020 +0200 Dependencies fixed. --- interfaces/Prolog/Ciao/ciao_pl_check.pl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/Prolog/Ciao/ciao_pl_check.pl b/interfaces/Prolog/Ciao/ciao_pl_check.pl index b28350c..afbc80b 100644 --- a/interfaces/Prolog/Ciao/ciao_pl_check.pl +++ b/interfaces/Prolog/Ciao/ciao_pl_check.pl @@ -22,10 +22,10 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ :- module(_, [main/0], []). -:- use_module(library(debugger)). -:- use_module(library(dynamic)). +:- use_package(dynamic). :- use_module(library(lists)). -:- use_module(library(prolog_sys)). +:- use_module(engine(runtime_control)). +:- use_module(library(streams)). :- use_module(library(read)). :- use_module(library(write)). :- use_module(ppl_ciao, [

1 0

[GIT] ppl/ppl(devel): Adapted to modern versions of Ciao Prolog.
by Roberto Bagnara 25 Jun '20

25 Jun '20

Module: ppl/ppl Branch: devel Commit: a25c7886a3738efaa98c6c6ba597a7b6d9b670da URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a25c7886a373… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Thu Jun 25 12:06:02 2020 +0200 Adapted to modern versions of Ciao Prolog. --- .../Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 b/interfaces/Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 index 504c20e..0e3756e 100644 --- a/interfaces/Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 +++ b/interfaces/Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 @@ -65,12 +65,12 @@ m4_define(`term', `Term$1')dnl m4_define(`anyterm', `any_term')dnl m4_define(`interm', `in(Term$1)')dnl m4_define(`m4_expanded_procedure_schema', `m4_ifelse(check_fail($3), nofail, - `:- true pred $1`'m4_ifelse(`$2', 0, ,(`'m4_term_sequence($2, `interm')) + `:- trust pred $1`'m4_ifelse(`$2', 0, ,(`'m4_term_sequence($2, `interm')) :: `'m4_term_sequence($2, `anyterm', ` *')) + foreign. ', - `:- true pred $1_2(`'m4_term_sequence($2, `interm')`'m4_ifelse(`$2', 0, `go(Success)', `, go(Success)')) - :: `'m4_term_sequence($2, `anyterm', ` *')`'m4_ifelse(`$2', 0, ` int', ` * int') + `:- trust pred $1_2(`'m4_term_sequence($2, `interm')`'m4_ifelse(`$2', 0, `go(Success)', `, go(Success)')) + :: `'m4_term_sequence($2, `anyterm', ` *')`'m4_ifelse(`$2', 0, ` c_int', ` * c_int') + (returns(Success), foreign($1)). $1`'m4_ifelse(`$2', 0, ,`(m4_term_sequence($2, `term'))') :-

1 0

[GIT] ppl/ppl(devel): Common forein language interface for Ciao Prolog updated.
by Roberto Bagnara 25 Jun '20

25 Jun '20

Module: ppl/ppl Branch: devel Commit: 7c03fce5f76e423281813c535520c282f7a6345e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7c03fce5f76e… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Thu Jun 25 11:55:22 2020 +0200 Common forein language interface for Ciao Prolog updated. --- interfaces/Prolog/Ciao/ciao_cfli.hh | 33 ++++++++++++++++++++++++++------- interfaces/Prolog/Ciao/ciao_efli.cc | 6 +++--- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/interfaces/Prolog/Ciao/ciao_cfli.hh b/interfaces/Prolog/Ciao/ciao_cfli.hh index b4be37f..fcea5dc 100644 --- a/interfaces/Prolog/Ciao/ciao_cfli.hh +++ b/interfaces/Prolog/Ciao/ciao_cfli.hh @@ -58,7 +58,7 @@ Prolog_put_term(Prolog_term_ref& t, Prolog_term_ref u) { */ inline int Prolog_put_long(Prolog_term_ref& t, long l) { - t = ciao_integer(l); + t = ciao_mk_c_long(l); return 1; } @@ -68,7 +68,7 @@ Prolog_put_long(Prolog_term_ref& t, long l) { inline int Prolog_put_ulong(Prolog_term_ref& t, unsigned long ul) { if (ul < INT_MAX) - t = ciao_integer(ul); + t = ciao_mk_c_long(ul); else { std::ostringstream s; s << ul; @@ -99,11 +99,21 @@ Prolog_put_atom(Prolog_term_ref& t, Prolog_atom a) { } /*! + Assign to \p t the list terminator <CODE>[]</CODE> (which needs not + be an atom). +*/ +inline int +Prolog_put_nil(Prolog_term_ref& t) { + t = ciao_empty_list(); + return 1; +} + +/*! Assign to \p t a term representing the address contained in \p p. */ inline int Prolog_put_address(Prolog_term_ref& t, void* p) { - t = ciao_pointer_to_address(ciao_implicit_state, p); + t = ciao_pointer_to_address(ciao_implicit_ctx, p); return 1; } @@ -222,7 +232,7 @@ Prolog_is_integer(Prolog_term_ref t) { */ inline int Prolog_is_address(Prolog_term_ref t) { - return ciao_is_address(ciao_implicit_state, t); + return ciao_is_address(ciao_implicit_ctx, t); } /*! @@ -250,8 +260,8 @@ Prolog_is_cons(Prolog_term_ref t) { inline int Prolog_get_long(Prolog_term_ref t, long* lp) { assert(ciao_is_integer(t)); - if (ciao_fits_in_int(t)) { - *lp = ciao_to_integer(t); + if (ciao_fits_in_c_long(t)) { + *lp = ciao_get_c_long(t); return 1; } else { @@ -275,7 +285,7 @@ Prolog_get_long(Prolog_term_ref t, long* lp) { inline int Prolog_get_address(Prolog_term_ref t, void** vpp) { assert(Prolog_is_address(t)); - *vpp = ciao_address_to_pointer(ciao_implicit_state, t); + *vpp = ciao_address_to_pointer(ciao_implicit_ctx, t); return 1; } @@ -317,6 +327,15 @@ Prolog_get_arg(int i, Prolog_term_ref t, Prolog_term_ref& a) { } /*! + Succeeds if and only if \p t represents the list terminator <CODE>[]</CODE> + (which needs not be an atom). +*/ +inline int +Prolog_get_nil(Prolog_term_ref t) { + return ciao_is_empty_list(t); +} + +/*! If \p c is a Prolog cons (list constructor), assign its head and tail to \p h and \p t, respectively. The behavior is undefined if \p c is not a Prolog cons. diff --git a/interfaces/Prolog/Ciao/ciao_efli.cc b/interfaces/Prolog/Ciao/ciao_efli.cc index 7d069ed..daf2957 100644 --- a/interfaces/Prolog/Ciao/ciao_efli.cc +++ b/interfaces/Prolog/Ciao/ciao_efli.cc @@ -52,8 +52,8 @@ ppl_Prolog_sysdep_deinit() { int Prolog_get_Coefficient(Prolog_term_ref t, Coefficient& n) { assert(Prolog_is_integer(t)); - if (ciao_fits_in_int(t)) - n = ciao_to_integer(t); + if (ciao_fits_in_c_long(t)) + n = ciao_get_c_long(t); else { const char* s = ciao_get_number_chars(t); n = Coefficient(s); @@ -68,7 +68,7 @@ Prolog_put_Coefficient(Prolog_term_ref& t, const Coefficient& n) { int i; Result r = assign_r(i, n, ROUND_IGNORE); if (!result_overflow(r)) - t = ciao_integer(i); + t = ciao_mk_c_long(i); else { std::ostringstream s; s << n;

1 0

[GIT] ppl/ppl(devel): Obtain include directory from modern versions of Ciao .
by Roberto Bagnara 25 Jun '20

25 Jun '20

Module: ppl/ppl Branch: devel Commit: 8eac2ba54812861a09b0492d799df653ad112ec8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8eac2ba54812… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Thu Jun 25 10:18:08 2020 +0200 Obtain include directory from modern versions of Ciao. --- m4/ac_check_ciao.m4 | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/m4/ac_check_ciao.m4 b/m4/ac_check_ciao.m4 index 71ed5fa..7102e17 100644 --- a/m4/ac_check_ciao.m4 +++ b/m4/ac_check_ciao.m4 @@ -40,13 +40,13 @@ then (umask 077 && mkdir "$tmp") } || exit $? cat >$tmp/print_include_dir.pl <<_CIAO_PRINT_INCLUDE_DIR_EOF +:- use_module(engine(system_info)). + main(_) :- - ciaolibdir(Lib_Dir), - get_os(Os), - get_arch(Arch), - format("~p/include/~p~p", [[Lib_Dir, Os, Arch]]). + ciao_c_headers_dir(Dir), + format("~p", [Dir]). _CIAO_PRINT_INCLUDE_DIR_EOF - ciao_prolog_include_dir=`$ciao_prolog $tmp/print_include_dir.pl` + ciao_prolog_include_dir=`$ciao_prolog run $tmp/print_include_dir.pl` rm -rf $tmp CIAO_PROLOG_INCLUDE_OPTIONS="-I${ciao_prolog_include_dir}"

1 0

[GIT] ppl/ppl(devel): Obsolete link option removed.
by Roberto Bagnara 25 Jun '20

25 Jun '20

Module: ppl/ppl Branch: devel Commit: 395a6220191367667190e8e543edc7cf7ed3be8b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=395a62201913… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Thu Jun 25 08:57:24 2020 +0200 Obsolete link option removed. --- .../Prolog/XSB/ppl_interface_generator_xsb_H.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/Prolog/XSB/ppl_interface_generator_xsb_H.m4 b/interfaces/Prolog/XSB/ppl_interface_generator_xsb_H.m4 index 1ee05c7..07edf7e 100644 --- a/interfaces/Prolog/XSB/ppl_interface_generator_xsb_H.m4 +++ b/interfaces/Prolog/XSB/ppl_interface_generator_xsb_H.m4 @@ -35,7 +35,7 @@ m4_include(`ppl_interface_generator_copyright')dnl :- export m4_divert(1) -:- ldoption('-L../../../src/.libs -lppl -L../../../Watchdog/.libs -lpwl -lgmp -lgmpxx'). +:- ldoption('-L../../../src/.libs -lppl -L../../../Watchdog/.libs -lgmp -lgmpxx'). m4_define(`m4_expanded_procedure_schema', `m4_ifelse($4, 0, ` $1/$2', `COMMA $1/$2')')

1 0

[GIT] ppl/ppl(devel): Added missing braces. Fixed indentation.
by Roberto Bagnara 25 Jun '20

25 Jun '20

Module: ppl/ppl Branch: devel Commit: 1bcfe132213c6cb6f1037beed552d831174c2424 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1bcfe132213c… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Wed Jun 24 20:26:41 2020 +0200 Added missing braces. Fixed indentation. --- .../ppl_interface_generator_prolog_cc_code.m4 | 24 ++++++++++--------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 index a710aa6..176c7b1 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 @@ -37,23 +37,25 @@ ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension(Prolog_term_ref t_nd, @TOPOLOGY@@CPP_CLASS@* ph; Prolog_atom uoe = term_to_universe_or_empty(t_uoe, where); - if (uoe == a_empty) + if (uoe == a_empty) { ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, where), EMPTY); - else + } + else { ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, where), UNIVERSE); - - Prolog_term_ref tmp = Prolog_new_term_ref(); - Prolog_put_address(tmp, ph); - if (Prolog_unify(t_ph, tmp)) { - PPL_REGISTER(ph); - return PROLOG_SUCCESS; - } - else - delete ph; + } + Prolog_term_ref tmp = Prolog_new_term_ref(); + Prolog_put_address(tmp, ph); + if (Prolog_unify(t_ph, tmp)) { + PPL_REGISTER(ph); + return PROLOG_SUCCESS; + } + else { + delete ph; + } } CATCH_ALL; }

1 0

[GIT] ppl/ppl(devel): Support modern versions of SWI-Prolog.
by Roberto Bagnara 25 Jun '20

25 Jun '20

Module: ppl/ppl Branch: devel Commit: e83a2d4eb3a22b436bd974899970f27fb873ffa4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e83a2d4eb3a2… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Wed Jun 24 20:20:45 2020 +0200 Support modern versions of SWI-Prolog. --- interfaces/Prolog/SWI/Makefile.am | 1 + interfaces/Prolog/SWI/ppl_pl.cc | 2 +- m4/ac_check_swi_prolog.m4 | 2 ++ 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index d1a7dbe..bac949e 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -53,6 +53,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/interfaces/Prolog \ -I$(top_buildir)/interfaces/Prolog \ -I$(top_builddir)/src \ +$(SWI_PROLOG_DEFINE_OPTIONS) \ $(SWI_PROLOG_INCLUDE_OPTIONS) \ @extra_includes@ diff --git a/interfaces/Prolog/SWI/ppl_pl.cc b/interfaces/Prolog/SWI/ppl_pl.cc index 4976402..de964bd 100644 --- a/interfaces/Prolog/SWI/ppl_pl.cc +++ b/interfaces/Prolog/SWI/ppl_pl.cc @@ -31,9 +31,9 @@ main(int argc, char **argv) { PL_action(PL_GMP_SET_ALLOC_FUNCTIONS, FALSE); #endif + putenv("SWI_HOME_DIR=" SWI_PROLOG_BASE); if (!PL_initialise(argc, argv)) PL_halt(1); - PL_install_readline(); install_libppl_swiprolog(); int ret_val = PL_toplevel(); diff --git a/m4/ac_check_swi_prolog.m4 b/m4/ac_check_swi_prolog.m4 index a02313b..04c8309 100644 --- a/m4/ac_check_swi_prolog.m4 +++ b/m4/ac_check_swi_prolog.m4 @@ -59,6 +59,7 @@ then AC_PATH_PROG(swi_prolog_ld, plld$EXEEXT) fi + SWI_PROLOG_DEFINE_OPTIONS="-DSWI_PROLOG_BASE='\"${swi_prolog_base}\"'" # In Fedora, SWI-Prolog.h is installed only in /usr/include/pl, which, # IMHO, is a bug (https://bugzilla.redhat.com/show_bug.cgi?id=471071) SWI_PROLOG_INCLUDE_OPTIONS="-I${swi_prolog_base}/include -I/usr/include/pl" @@ -96,6 +97,7 @@ main() { SWI_PROLOG_LD="$swi_prolog_ld" AC_SUBST(SWI_PROLOG) AC_SUBST(SWI_PROLOG_LD) + AC_SUBST(SWI_PROLOG_DEFINE_OPTIONS) AC_SUBST(SWI_PROLOG_INCLUDE_OPTIONS) AC_SUBST(SWI_PROLOG_LD_OPTIONS) fi

1 0

[GIT] ppl/ppl(devel): Comment fixed.
by Roberto Bagnara 25 Jun '20

25 Jun '20

Module: ppl/ppl Branch: devel Commit: 8d3f553e0b15448619958aacdf764920a3bd94c7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8d3f553e0b15… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Wed Jun 24 18:34:01 2020 +0200 Comment fixed. --- demos/ppl_lcdd/Thread_Pool_defs.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/demos/ppl_lcdd/Thread_Pool_defs.hh b/demos/ppl_lcdd/Thread_Pool_defs.hh index 20d2586..3103f36 100644 --- a/demos/ppl_lcdd/Thread_Pool_defs.hh +++ b/demos/ppl_lcdd/Thread_Pool_defs.hh @@ -17,7 +17,7 @@ Note: these are significantly abridged versions, removing all functionalities except those directly used in the multi-threaded - version of ppl_devel. + version of the PPL. */ template <typename T>

1 0

[GIT] ppl/ppl(devel): New commits
by Roberto Bagnara 24 Jun '20

24 Jun '20

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2d65e137baca… Merge: 641a5cd2eee688a9c93665ce3b3f03df13116f5a 872a6795e60fb3c7c45095ba35ea5598d5745327 Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Wed Jun 24 16:02:25 2020 +0200 Merge branch 'master' into devel. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=872a6795e60f… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Wed Jan 22 09:31:07 2020 +0100 Copyright years bumped. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7651c0de3240… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Tue Dec 10 15:35:01 2019 +0100 Avoid mixing build log with analysis results. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=360445d21d3d… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Mon Dec 9 15:50:06 2019 +0100 Added sample analysis script. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=26787291164e… Author: Abramo Bagnara <abramo.bagnara(a)bugseng.com> Date: Wed Aug 14 18:09:51 2019 +0200 Removed pointless qualifier. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fe66d8719af7… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Tue Aug 13 19:46:46 2019 +0200 Updated. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1948fb22f102… Author: Abramo Bagnara <abramo.bagnara(a)bugseng.com> Date: Mon Feb 25 08:36:19 2019 +0100 Added suport for SWI-Prolog 8 in windows.

1 0