From 8fc50d9935f081cbed2d31611b1898dbfd38788f Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Sat, 6 Mar 2010 00:16:49 +0000 Subject: [PATCH 1/7] make YAP throw a runtime-error on unknown arithmetic ops. --- C/arith1.c | 12 +--------- C/arith2.c | 12 +--------- pl/arith.yap | 68 ++++------------------------------------------------ 3 files changed, 6 insertions(+), 86 deletions(-) diff --git a/C/arith1.c b/C/arith1.c index 49d6fe112..f495bb632 100644 --- a/C/arith1.c +++ b/C/arith1.c @@ -901,17 +901,7 @@ p_unary_op_as_integer(void) ExpEntry *p; if (EndOfPAEntr(p = RepExpProp(Yap_GetExpProp(name, 1)))) { - Term ti[2]; - - /* error */ - ti[0] = t; - ti[1] = MkIntTerm(1); - t = Yap_MkApplTerm(FunctorSlash, 2, ti); - Yap_Error(TYPE_ERROR_EVALUABLE, t, - "functor %s/%d for arithmetic expression", - RepAtom(name)->StrOfAE,2); - P = FAILCODE; - return(FALSE); + return Yap_unify(ARG1,ARG2); } return Yap_unify_constant(ARG2,MkIntTerm(p->FOfEE)); } diff --git a/C/arith2.c b/C/arith2.c index cd4db2f96..250cb5ed6 100644 --- a/C/arith2.c +++ b/C/arith2.c @@ -1242,17 +1242,7 @@ p_binary_op_as_integer(void) ExpEntry *p; if (EndOfPAEntr(p = RepExpProp(Yap_GetExpProp(name, 2)))) { - Term ti[2]; - - /* error */ - ti[0] = t; - ti[1] = MkIntTerm(1); - t = Yap_MkApplTerm(FunctorSlash, 2, ti); - Yap_Error(TYPE_ERROR_EVALUABLE, t, - "functor %s/%d for arithmetic expression", - RepAtom(name)->StrOfAE,2); - P = FAILCODE; - return(FALSE); + return Yap_unify(ARG1,ARG2); } return Yap_unify_constant(ARG2,MkIntTerm(p->FOfEE)); } diff --git a/pl/arith.yap b/pl/arith.yap index be7347dc6..5defb58ac 100644 --- a/pl/arith.yap +++ b/pl/arith.yap @@ -85,7 +85,8 @@ do_not_compile_expressions :- set_value('$c_arith',[]). '$do_c_built_in'(X is Y, M, P) :- primitive(X), !, '$do_c_built_in'(X =:= Y, M, P). -'$do_c_built_in'(X is Y, M, (P,A=X)) :- nonvar(X), !, +'$do_c_built_in'(X is Y, M, (P,A=X)) :- + nonvar(X), !, '$do_c_built_in'(A is Y, M, P). '$do_c_built_in'(X is Y, _, P) :- nonvar(Y), % Don't rewrite variables @@ -163,11 +164,11 @@ do_not_compile_expressions :- set_value('$c_arith',[]). '$expand_expr'(A, true, A) :- atomic(A), !. '$expand_expr'(T, E, V) :- - '$unaryop'(T, O, A), !, + T =.. [O, A], !, '$expand_expr'(A, Q, X), '$expand_expr'(O, X, V, Q, E). '$expand_expr'(T, E, V) :- - '$binaryop'(T, O, A, B), !, + T =.. [O, A, B], !, '$expand_expr'(A, Q, X), '$expand_expr'(B, R, Y), '$expand_expr'(O, X, Y, V, Q, S), @@ -272,67 +273,6 @@ do_not_compile_expressions :- set_value('$c_arith',[]). '$preprocess_args_for_non_commutative'(X, Y, Z, W, E) :- '$do_and'(Z = X, Y = W, E). - - -% These are the unary arithmetic operators -'$unaryop'(+X ,+ ,X). -'$unaryop'(-X ,- ,X). -'$unaryop'(\(X) ,\ ,X). -'$unaryop'(exp(X) ,exp ,X). -'$unaryop'(log(X) ,log ,X). -'$unaryop'(log10(X) ,log10 ,X). -'$unaryop'(sqrt(X) ,sqrt ,X). -'$unaryop'(sin(X) ,sin ,X). -'$unaryop'(cos(X) ,cos ,X). -'$unaryop'(tan(X) ,tan ,X). -'$unaryop'(asin(X) ,asin ,X). -'$unaryop'(acos(X) ,acos ,X). -'$unaryop'(atan(X) ,atan ,X). -'$unaryop'(atan2(X) ,atan2 ,X). -'$unaryop'(sinh(X) ,sinh ,X). -'$unaryop'(cosh(X) ,cosh ,X). -'$unaryop'(tanh(X) ,tanh ,X). -'$unaryop'(asinh(X) ,asinh ,X). -'$unaryop'(acosh(X) ,acosh ,X). -'$unaryop'(atanh(X) ,atanh ,X). -'$unaryop'(floor(X) ,floor ,X). -'$unaryop'(abs(X) ,abs ,X). -'$unaryop'(float(X) ,float ,X). -'$unaryop'(+(X) ,+ ,X). -'$unaryop'(integer(X) ,integer,X). -'$unaryop'(truncate(X) ,truncate,X). -'$unaryop'(round(X) ,round ,X). -'$unaryop'(ceiling(X) ,ceiling,X). -'$unaryop'(msb(X) ,msb ,X). -'$unaryop'(sign(X) ,sign ,X). -'$unaryop'(float_fractional_part(X) ,float_fractional_part ,X). -'$unaryop'(float_integer_part(X) ,float_integer_part ,X). -'$unaryop'(lgamma(X) ,lgamma ,X). -'$unaryop'(erf(X) ,erf ,X). -'$unaryop'(erfc(X) ,erfc ,X). - -% These are the binary arithmetic operators -'$binaryop'(X+Y ,+ ,X,Y). -'$binaryop'(X-Y ,- ,X,Y). -'$binaryop'(X*Y ,* ,X,Y). -'$binaryop'(X/Y ,/ ,X,Y). -'$binaryop'(X mod Y ,mod ,X,Y). -'$binaryop'(X rem Y ,rem ,X,Y). -'$binaryop'(X//Y ,// ,X,Y). -'$binaryop'(X/\Y ,/\ ,X,Y). -'$binaryop'(X\/Y ,\/ ,X,Y). -'$binaryop'(X#Y ,'#' ,X,Y). -'$binaryop'(X<>Y ,>> ,X,Y). -'$binaryop'(X^Y ,^ ,X,Y). -'$binaryop'(X**Y ,** ,X,Y). -'$binaryop'(exp(X,Y) ,exp ,X,Y). -'$binaryop'(max(X,Y) ,max ,X,Y). -'$binaryop'(min(X,Y) ,min ,X,Y). -'$binaryop'(gcd(X,Y) ,gcd ,X,Y). -'$binaryop'(atan2(X,Y) ,atan2 ,X,Y). - - /* Arithmetics */ % M and N nonnegative integers, N is the successor of M From ffaad94334ae256e833290fdcad70fa79dd09981 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Sat, 6 Mar 2010 00:18:24 +0000 Subject: [PATCH 2/7] another exec_prefix (obs from Jos de Roo). --- LGPL/swi_console/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/LGPL/swi_console/Makefile.in b/LGPL/swi_console/Makefile.in index 6319f8c5e..76833a5ea 100644 --- a/LGPL/swi_console/Makefile.in +++ b/LGPL/swi_console/Makefile.in @@ -3,6 +3,7 @@ # (EROOT for architecture-dependent files) # prefix = @prefix@ +exec_prefix = @exec_prefix@ ROOTDIR = $(prefix) EROOTDIR = @exec_prefix@ # From fa517450ee084237bdfd447bb036f1fa44c01e0b Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Sat, 6 Mar 2010 00:25:22 +0000 Subject: [PATCH 3/7] Since YAPBOOTDIR doesn't appear to be referenced anywhere I've attached a patch to remove it from configure.in. (Keri Harris). --- configure | 6 +++--- configure.in | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 3940ba1e3..0273a7208 100755 --- a/configure +++ b/configure @@ -6871,7 +6871,7 @@ then YAPLIB="$DYNYAPLIB" DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib" PRE_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(abs_top_builddir)" - EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/pl YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" # CROSS_SIMULATOR="DYLD_LIBRARY_PATH=." ;; *) @@ -6886,7 +6886,7 @@ then JAVA_TARGET=sparc ;; esac - EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/pl YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" PRE_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(abs_top_builddir)" LDFLAGS="$LDFLAGS -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET" DYNYAPLIB=libYap"$SHLIB_SUFFIX" @@ -6895,7 +6895,7 @@ then esac else PRE_DYNLOADER_PATH="" - EXTEND_DYNLOADER_PATH="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/pl YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + EXTEND_DYNLOADER_PATH="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" DYNYAPLIB=libYap.notused fi diff --git a/configure.in b/configure.in index a39f27619..1f4ea7265 100755 --- a/configure.in +++ b/configure.in @@ -1016,7 +1016,7 @@ then YAPLIB="$DYNYAPLIB" DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib" PRE_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(abs_top_builddir)" - EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/pl YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" # CROSS_SIMULATOR="DYLD_LIBRARY_PATH=." ;; *) @@ -1031,7 +1031,7 @@ then JAVA_TARGET=sparc ;; esac - EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/pl YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" PRE_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(abs_top_builddir)" LDFLAGS="$LDFLAGS -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET" DYNYAPLIB=libYap"$SHLIB_SUFFIX" @@ -1040,7 +1040,7 @@ then esac else PRE_DYNLOADER_PATH="" - EXTEND_DYNLOADER_PATH="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/pl YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + EXTEND_DYNLOADER_PATH="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" DYNYAPLIB=libYap.notused fi From a98cc1ac65d8015a5498db9165cdfc734d281a39 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Mon, 8 Mar 2010 09:13:52 +0000 Subject: [PATCH 4/7] fix bad label for gc --- C/amasm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/C/amasm.c b/C/amasm.c index 1bedb0653..0ed3f350a 100644 --- a/C/amasm.c +++ b/C/amasm.c @@ -3510,6 +3510,7 @@ do_pass(int pass_no, yamop **entry_codep, int assembling, int *clause_has_blobsp if (!ystop_found && cip->cpc->nextInst != NULL && (cip->cpc->nextInst->op == mark_initialised_pvars_op || + cip->cpc->nextInst->op == mark_live_regs_op || cip->cpc->nextInst->op == blob_op)) { ystop_found = TRUE; code_p = a_il((CELL)*entry_codep, _Ystop, code_p, pass_no, cip); From 6dbc6f09fa38adcf5d3e7c0cc122c7c8f4539ae4 Mon Sep 17 00:00:00 2001 From: Ricardo Rocha Date: Tue, 9 Mar 2010 14:48:20 +0000 Subject: [PATCH 5/7] new built-in predicate abolish_all_frozen_choice_points/0 --- OPTYap/opt.preds.c | 23 +++++++++++++++++------ OPTYap/tab.macros.h | 10 ++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/OPTYap/opt.preds.c b/OPTYap/opt.preds.c index 96c15ae61..26b0ecc88 100644 --- a/OPTYap/opt.preds.c +++ b/OPTYap/opt.preds.c @@ -65,8 +65,9 @@ static Int p_worker(void); #endif /* YAPOR */ #ifdef TABLING -static Int p_freeze(void); -static Int p_wake(void); +static Int p_freeze_choice_point(void); +static Int p_wake_choice_point(void); +static Int p_abolish_all_frozen_choice_points(void); static Int p_table(void); static Int p_tabling_mode(void); static Int p_abolish_table(void); @@ -139,8 +140,9 @@ void Yap_init_optyap_preds(void) { Yap_InitCPred("or_statistics", 0, p_or_statistics, SafePredFlag|SyncPredFlag); #endif /* YAPOR */ #ifdef TABLING - Yap_InitCPred("freeze_choice_point", 1, p_freeze, SafePredFlag|SyncPredFlag); - Yap_InitCPred("wake_choice_point", 1, p_wake, SafePredFlag|SyncPredFlag); + Yap_InitCPred("freeze_choice_point", 1, p_freeze_choice_point, SafePredFlag|SyncPredFlag); + Yap_InitCPred("wake_choice_point", 1, p_wake_choice_point, SafePredFlag|SyncPredFlag); + Yap_InitCPred("abolish_all_frozen_choice_points", 0, p_abolish_all_frozen_choice_points, SafePredFlag|SyncPredFlag); Yap_InitCPred("$c_table", 2, p_table, SafePredFlag|SyncPredFlag|HiddenPredFlag); Yap_InitCPred("$c_tabling_mode", 3, p_tabling_mode, SafePredFlag|SyncPredFlag|HiddenPredFlag); Yap_InitCPred("$c_abolish_table", 2, p_abolish_table, SafePredFlag|SyncPredFlag|HiddenPredFlag); @@ -552,7 +554,8 @@ Int p_or_statistics(void) { #ifdef TABLING -static Int p_freeze(void) { +static +Int p_freeze_choice_point(void) { Term term_arg, term_cp; term_arg = Deref(ARG1); @@ -565,7 +568,8 @@ static Int p_freeze(void) { } -static Int p_wake(void) { +static +Int p_wake_choice_point(void) { Term term_arg; term_arg = Deref(ARG1); @@ -577,6 +581,13 @@ static Int p_wake(void) { } +static +Int p_abolish_all_frozen_choice_points(void) { + abolish_all_frozen_cps(); + return (TRUE); +} + + static Int p_table(void) { Term mod, t; diff --git a/OPTYap/tab.macros.h b/OPTYap/tab.macros.h index 3431b0ecd..906665ede 100644 --- a/OPTYap/tab.macros.h +++ b/OPTYap/tab.macros.h @@ -35,6 +35,7 @@ STD_PROTO(static inline void free_subgoal_trie_hash_chain, (sg_hash_ptr)); STD_PROTO(static inline void free_answer_trie_hash_chain, (ans_hash_ptr)); STD_PROTO(static inline choiceptr freeze_current_cp, (void)); STD_PROTO(static inline void resume_frozen_cp, (choiceptr)); +STD_PROTO(static inline void abolish_all_frozen_cps, (void)); #ifdef YAPOR STD_PROTO(static inline void pruning_over_tabling_data_structures, (void)); @@ -815,6 +816,15 @@ void resume_frozen_cp(choiceptr frozen_cp) { } +static inline +void abolish_all_frozen_cps(void) { + B_FZ = B_BASE; + H_FZ = H_BASE; + TR_FZ = TR_BASE; + return; +} + + #ifdef YAPOR static inline void pruning_over_tabling_data_structures(void) { From abe4744fe7777f3edcd23549c326e14572572656 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Tue, 9 Mar 2010 22:01:42 +0000 Subject: [PATCH 6/7] fix error handling. --- C/cmppreds.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/C/cmppreds.c b/C/cmppreds.c index c829f54e9..795b522c5 100644 --- a/C/cmppreds.c +++ b/C/cmppreds.c @@ -643,8 +643,11 @@ p_acomp(void) { /* $a_compare(?R,+X,+Y) */ Term t1 = Deref(ARG1); Term t2 = Deref(ARG2); + Int out; - return a_cmp(t1, t2); + out = a_cmp(t1, t2); + if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; } + return out; } static Int @@ -675,42 +678,48 @@ a_eq(Term t1, Term t2) } } out = a_cmp(t1,t2); - return !ArithError && (out == 0); + if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; } + return out == 0; } static Int a_dif(Term t1, Term t2) { Int out = a_cmp(Deref(t1),Deref(t2)); - return !ArithError && out != 0; + if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; } + return out != 0; } static Int a_gt(Term t1, Term t2) { /* A > B */ Int out = a_cmp(Deref(t1),Deref(t2)); - return !ArithError && out > 0; + if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; } + return out > 0; } static Int a_ge(Term t1, Term t2) { /* A >= B */ Int out = a_cmp(Deref(t1),Deref(t2)); - return !ArithError && out >= 0; + if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; } + return out >= 0; } static Int a_lt(Term t1, Term t2) { /* A < B */ Int out = a_cmp(Deref(t1),Deref(t2)); - return !ArithError && out < 0; + if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; } + return out < 0; } static Int a_le(Term t1, Term t2) { /* A <= B */ Int out = a_cmp(Deref(t1),Deref(t2)); - return !ArithError && out <= 0; + if (ArithError) { Yap_Error(Yap_Error_TYPE, Yap_Error_Term, Yap_ErrorMessage); return FALSE; } + return out <= 0; } From 96a15851a7d8cfb7c57a9e529562c989cf67ec74 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Tue, 9 Mar 2010 22:00:46 +0000 Subject: [PATCH 7/7] fix unnecessary choicepoint in [a]. --- pl/consult.yap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/consult.yap b/pl/consult.yap index 6a825be09..acda552b7 100644 --- a/pl/consult.yap +++ b/pl/consult.yap @@ -43,7 +43,7 @@ load_files(Files,Opts) :- '$check_files'(Files,Call) :- var(Files), !, '$do_error'(instantiation_error,Call). -'$check_files'(M:Files,Call) :- +'$check_files'(M:Files,Call) :- !, (var(M) -> '$do_error'(instantiation_error,Call)