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

source: a(X) :- true is a fact! 

fix use of value after possible overflow in IPred


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1128 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2004-09-08 17:56:48 +00:00
parent a9d6944b17
commit ab7489b93d
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
C/cdmgr.c
View File

@ -11,8 +11,11 @@
* File: cdmgr.c * * File: cdmgr.c *
* comments: Code manager * * comments: Code manager *
* * * *
* Last rev: $Date: 2004-09-07 16:48:04 $,$Author: vsc $ * * Last rev: $Date: 2004-09-08 17:56:45 $,$Author: vsc $ *
* $Log: not supported by cvs2svn $ * $Log: not supported by cvs2svn $
* Revision 1.130 2004/09/07 16:48:04 vsc
* fix bug in unwinding trail at amiops.h
*
* Revision 1.129 2004/09/07 16:25:22 vsc * Revision 1.129 2004/09/07 16:25:22 vsc
* memory management bug fixes * memory management bug fixes
* *
@ -1187,6 +1190,22 @@ addcl_permission_error(AtomEntry *ap, Int Arity, int in_use)
} }
} }
static int
is_fact(Term t)
{
Term a1;
if (IsAtomTerm(t))
return TRUE;
if (FunctorOfTerm(t) != FunctorAssert)
return TRUE;
a1 = ArgOfTerm(2, t);
if (a1 == MkAtomTerm(AtomTrue))
return TRUE;
return FALSE;
}
static Term static Term
addclause(Term t, yamop *cp, int mode, int mod) addclause(Term t, yamop *cp, int mode, int mod)
/* /*
@ -1257,16 +1276,14 @@ addclause(Term t, yamop *cp, int mode, int mod)
if (pflags & LogUpdatePredFlag) { if (pflags & LogUpdatePredFlag) {
LogUpdClause *clp = ClauseCodeToLogUpdClause(cp); LogUpdClause *clp = ClauseCodeToLogUpdClause(cp);
clp->ClFlags |= LogUpdMask; clp->ClFlags |= LogUpdMask;
if (IsAtomTerm(t) || if (is_fact(t)) {
FunctorOfTerm(t) != FunctorAssert) {
clp->ClFlags |= FactMask; clp->ClFlags |= FactMask;
clp->ClSource = NULL; clp->ClSource = NULL;
} }
} else { } else {
StaticClause *clp = ClauseCodeToStaticClause(cp); StaticClause *clp = ClauseCodeToStaticClause(cp);
clp->ClFlags |= StaticMask; clp->ClFlags |= StaticMask;
if (IsAtomTerm(t) || if (is_fact(t)) {
FunctorOfTerm(t) != FunctorAssert) {
clp->ClFlags |= FactMask; clp->ClFlags |= FactMask;
clp->usc.ClPred = p; clp->usc.ClPred = p;
} }
@ -3544,7 +3561,7 @@ p_static_clause(void)
IPred(pe); IPred(pe);
WRITE_UNLOCK(pe->PRWLock); WRITE_UNLOCK(pe->PRWLock);
} }
return fetch_next_static_clause(pe, pe->cs.p_code.TrueCodeOfPred, t1, ARG3, ARG4, P, TRUE); return fetch_next_static_clause(pe, pe->cs.p_code.TrueCodeOfPred, ARG1, ARG3, ARG4, P, TRUE);
} }
static Int /* $hidden_predicate(P) */ static Int /* $hidden_predicate(P) */

4
C/tracer.c
View File

@ -120,6 +120,10 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
/* extern int gc_calls; */ /* extern int gc_calls; */
vsc_count++; vsc_count++;
if (vsc_count < 845900)
return;
if (vsc_count == 845979)
jmp_deb(1);
#ifdef COMMENTED #ifdef COMMENTED
// if (vsc_count == 218280) // if (vsc_count == 218280)
// vsc_xstop = 1; // vsc_xstop = 1;