diogo
/
yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3

This commit is contained in:
Vitor Santos Costa 2013-06-03 16:40:12 -05:00
parent 933ee11985 6af394a35e
commit b6b6b12c6f
4 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
C/absmi.c
View File

@ -2487,7 +2487,6 @@ Yap_absmi(int inp)
PELOCK(9,ap); PELOCK(9,ap);
DEC_CLREF_COUNT(cl); DEC_CLREF_COUNT(cl);
// fprintf(stderr,"%d %p=%lx\n",worker_id, cl, cl->ClRefCount);
erase = (cl->ClFlags & ErasedMask) && !(cl->ClRefCount); erase = (cl->ClFlags & ErasedMask) && !(cl->ClRefCount);
if (erase) { if (erase) {
saveregs(); saveregs();
@ -7824,6 +7823,24 @@ Yap_absmi(int inp)
/* restart index */ /* restart index */
setregs(); setregs();
UNLOCKPE(17,pe); UNLOCKPE(17,pe);
#ifdef DEBUG_LOCK
{ PredEntry *ap = pe;
if (ap->ArityOfPE) {
if ( ap->ModuleOfPred != IDB_MODULE)
printf("L9 %s\n", AtomName(NameOfFunctor(ap->FunctorOfPred)));
else
{
if (ap->PredFlags & NumberDBPredFlag) {
printf("L9 %ld\n", ap->src.IndxId);
} else if (ap->PredFlags & AtomDBPredFlag) {
printf("L9 %s\n", AtomName((Atom)(ap->FunctorOfPred)));
} else {
printf("L9 %s\n", AtomName(NameOfFunctor(ap->FunctorOfPred)));
}
}
}
}
#endif
PREG = pt0; PREG = pt0;
#if defined(YAPOR) || defined(THREADS) #if defined(YAPOR) || defined(THREADS)
if (!PP) { if (!PP) {

8
C/eval.c
View File

@ -245,12 +245,12 @@ static Int cont_between( USES_REGS1 )
Term tn; Term tn;
Int cmp; Int cmp;
cmp = Yap_acmp(t1, t2); cmp = Yap_acmp(t1, t2 PASS_REGS);
if (cmp == 0) if (cmp == 0)
cut_succeed(); cut_succeed();
t[0] = t1; t[0] = t1;
t[1] = MkIntTerm(1); t[1] = MkIntTerm(1);
tn = Eval(Yap_MkApplTerm(FunctorPlus, 2, t)); tn = Eval(Yap_MkApplTerm(FunctorPlus, 2, t) PASS_REGS);
EXTRA_CBACK_ARG(3,1) = tn; EXTRA_CBACK_ARG(3,1) = tn;
HB = B->cp_h = H; HB = B->cp_h = H;
return TRUE; return TRUE;
@ -336,11 +336,11 @@ init_between( USES_REGS1 )
Yap_Error(TYPE_ERROR_INTEGER, t3, "between/3"); Yap_Error(TYPE_ERROR_INTEGER, t3, "between/3");
return FALSE; return FALSE;
} }
if (Yap_acmp(t3, t1) >= 0 && Yap_acmp(t2,t3) >= 0 && P != FAILCODE) if (Yap_acmp(t3, t1 PASS_REGS) >= 0 && Yap_acmp(t2,t3 PASS_REGS) >= 0 && P != FAILCODE)
cut_succeed(); cut_succeed();
cut_fail(); cut_fail();
} }
cmp = Yap_acmp(t1, t2); cmp = Yap_acmp(t1, t2 PASS_REGS);
if (cmp > 0) cut_fail(); if (cmp > 0) cut_fail();
if (cmp == 0) { if (cmp == 0) {
Yap_unify(ARG3, t1); Yap_unify(ARG3, t1);

3
H/rheap.h
View File

@ -247,6 +247,7 @@ static char SccsId[] = "@(#)rheap.c 1.3 3/15/90";
#define RestoreDBErasedMarker() RestoreDBErasedMarker__( PASS_REGS1 ) #define RestoreDBErasedMarker() RestoreDBErasedMarker__( PASS_REGS1 )
#define RestoreLogDBErasedMarker() RestoreLogDBErasedMarker__( PASS_REGS1 ) #define RestoreLogDBErasedMarker() RestoreLogDBErasedMarker__( PASS_REGS1 )
#define RestoreForeignCode() RestoreForeignCode__( PASS_REGS1 ) #define RestoreForeignCode() RestoreForeignCode__( PASS_REGS1 )
#define RestoreEmptyWakeups() RestoreEmptyWakeups__( PASS_REGS1 )
#define RestoreAtoms() RestoreAtoms__( PASS_REGS1 ) #define RestoreAtoms() RestoreAtoms__( PASS_REGS1 )
#define RestoreWideAtoms() RestoreWideAtoms__( PASS_REGS1 ) #define RestoreWideAtoms() RestoreWideAtoms__( PASS_REGS1 )
#define RestoreSWIBlobs() RestoreSWIBlobs__( PASS_REGS1 ) #define RestoreSWIBlobs() RestoreSWIBlobs__( PASS_REGS1 )
@ -548,7 +549,7 @@ RestoreDBTerm(DBTerm *dbr, int attachments USES_REGS)
/* Restoring the heap */ /* Restoring the heap */
static void static void
RestoreEmptyWakeups(void) RestoreEmptyWakeups__( USES_REGS1 )
{ {
int i; int i;
for (i=0; i < MaxEmptyWakeups; i++) { for (i=0; i < MaxEmptyWakeups; i++) {

27
Makefile.in
View File

@ -705,7 +705,7 @@ all: startup.yss
@INSTALL_DLLS@ (cd library/system; $(MAKE)) @INSTALL_DLLS@ (cd library/system; $(MAKE))
@INSTALL_DLLS@ (cd library/tries; $(MAKE)) @INSTALL_DLLS@ (cd library/tries; $(MAKE))
@ENABLE_CLIB@ @INSTALL_DLLS@ (cd packages/clib; $(MAKE)) @ENABLE_CLIB@ @INSTALL_DLLS@ (cd packages/clib; $(MAKE))
@ENABLE_CHR@ @INSTALL_DLLS@ (cd packages/chr; $(MAKE)) @ENABLE_CHR@ (cd packages/chr; $(MAKE))
@ENABLE_HTTP@ @INSTALL_DLLS@ (cd packages/http; $(MAKE)) @ENABLE_HTTP@ @INSTALL_DLLS@ (cd packages/http; $(MAKE))
@ENABLE_PLDOC@ @INSTALL_DLLS@ (cd packages/pldoc; $(MAKE)) @ENABLE_PLDOC@ @INSTALL_DLLS@ (cd packages/pldoc; $(MAKE))
@ENABLE_PLUNIT@ @INSTALL_DLLS@ (cd packages/plunit; $(MAKE)) @ENABLE_PLUNIT@ @INSTALL_DLLS@ (cd packages/plunit; $(MAKE))
@ -713,17 +713,17 @@ all: startup.yss
@ENABLE_RDF@ @INSTALL_DLLS@ (cd packages/RDF; $(MAKE)) @ENABLE_RDF@ @INSTALL_DLLS@ (cd packages/RDF; $(MAKE))
@ENABLE_SEMWEB@ @INSTALL_DLLS@ (cd packages/semweb; $(MAKE)) @ENABLE_SEMWEB@ @INSTALL_DLLS@ (cd packages/semweb; $(MAKE))
@ENABLE_SGML@ @INSTALL_DLLS@ (cd packages/sgml; $(MAKE)) @ENABLE_SGML@ @INSTALL_DLLS@ (cd packages/sgml; $(MAKE))
@ENABLE_REAL@ (cd packages/real; $(MAKE)) @ENABLE_REAL@ @INSTALL_DLLS@ (cd packages/real; $(MAKE))
@ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE)) @ENABLE_CLPBN_BP@ @INSTALL_DLLS@ (cd packages/CLPBN/horus; $(MAKE))
@ENABLE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE)) @ENABLE_MINISAT@ @INSTALL_DLLS@ (cd packages/swi-minisat2/C; $(MAKE))
@ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE)) @ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE))
@ENABLE_ODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE)) @ENABLE_ODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE))
@ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE)) @ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE))
@ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE)) @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE))
@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE)) @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE))
@ENABLE_CPLINT@ (cd packages/cplint/slipcase; $(MAKE)) @ENABLE_CPLINT@ (cd packages/cplint/slipcase; $(MAKE))
@ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE)) @ENABLE_PRISM@ @INSTALL_DLLS@ (cd packages/prism/src/c; $(MAKE))
@ENABLE_BDDLIB@ (cd packages/bdd; $(MAKE)) @ENABLE_BDDLIB@ @INSTALL_DLLS@ (cd packages/bdd; $(MAKE))
@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE)) @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE))
@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE)) @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE))
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE)) @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
@ -793,12 +793,11 @@ install_unix: startup.yss libYap.a
@ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE) install) @ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE) install)
@ENABLE_ODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE) install) @ENABLE_ODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE) install)
@ENABLE_CLPBN_BP@ @INSTALL_DLLS@ (cd packages/CLPBN/horus; $(MAKE) install) @ENABLE_CLPBN_BP@ @INSTALL_DLLS@ (cd packages/CLPBN/horus; $(MAKE) install)
@ENABLE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) @ENABLE_MINISAT@ @INSTALL_DLLS@ (cd packages/swi-minisat2/C; $(MAKE) install)
@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install) @INSTALL_MATLAB@ @INSTALL_DLLS@ (cd library/matlab; $(MAKE) install)
@ENABLE_REAL@ (cd packages/real; $(MAKE) install) @ENABLE_REAL@ @INSTALL_DLLS@ (cd packages/real; $(MAKE) install)
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install) @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install)
@ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/python; $(MAKE) install) @ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/python; $(MAKE) install)
#@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/python; $(MAKE) install)
mkdir -p $(DESTDIR)$(INCLUDEDIR) mkdir -p $(DESTDIR)$(INCLUDEDIR)
mkdir -p $(DESTDIR)$(INCLUDEDIR)/src mkdir -p $(DESTDIR)$(INCLUDEDIR)/src
$(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)/src $(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)/src
@ -808,9 +807,9 @@ install_unix: startup.yss libYap.a
$(INSTALL) YapTermConfig.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL) YapTermConfig.h $(DESTDIR)$(INCLUDEDIR)
@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install) @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install)
@ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE) install) @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE) install)
@ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) install) @ENABLE_PRISM@ @INSTALL_DLLS@ (cd packages/prism/src/c; $(MAKE) install)
@ENABLE_PRISM@ (cd packages/prism/src/prolog; $(MAKE) install) @ENABLE_PRISM@ @INSTALL_DLLS@ (cd packages/prism/src/prolog; $(MAKE) install)
@ENABLE_BDDLIB@ (cd packages/bdd; $(MAKE) install) @ENABLE_BDDLIB@ @INSTALL_DLLS@ (cd packages/bdd; $(MAKE) install)
@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install) @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install)
@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) install) @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) install)
@ -928,7 +927,7 @@ clean: clean_docs
@ENABLE_REAL@ (cd packages/real; $(MAKE) clean) @ENABLE_REAL@ (cd packages/real; $(MAKE) clean)
@ENABLE_MINISAT@ (cd packages/swi-minisat2; $(MAKE) clean) @ENABLE_MINISAT@ (cd packages/swi-minisat2; $(MAKE) clean)
@ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE) clean) @ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE) clean)
@ENABLE_CHR@ @INSTALL_DLLS@ (cd packages/chr; $(MAKE) clean) @ENABLE_CHR@ (cd packages/chr; $(MAKE) clean)
@ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) clean) @ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) clean)
@ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) clean) @ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) clean)
@ENABLE_PRISM@ (cd packages/prism/src/prolog; $(MAKE) clean) @ENABLE_PRISM@ (cd packages/prism/src/prolog; $(MAKE) clean)