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

fix bad compare in checking pt

Browse Source
This commit is contained in:
Vítor Santos Costa 2012-06-06 00:09:14 +01:00
parent c4bd913e34
commit 3a212944fb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
H/rheap.h
View File

@ -241,7 +241,7 @@ static char SccsId[] = "@(#)rheap.c 1.3 3/15/90";
#define ConstantTermAdjust(P) ConstantTermAdjust__(P PASS_REGS) #define ConstantTermAdjust(P) ConstantTermAdjust__(P PASS_REGS)
#define DBGroundTermAdjust(P) DBGroundTermAdjust__(P PASS_REGS) #define DBGroundTermAdjust(P) DBGroundTermAdjust__(P PASS_REGS)
#define AdjustDBTerm(P,A) AdjustDBTerm__(P,A PASS_REGS) #define AdjustDBTerm(P,A,B) AdjustDBTerm__(P,A,B PASS_REGS)
#define AdjustSwitchTable(op, table, i) AdjustSwitchTable__(op, table, i PASS_REGS) #define AdjustSwitchTable(op, table, i) AdjustSwitchTable__(op, table, i PASS_REGS)
#define RestoreOtaplInst(start, opc, pe) RestoreOtaplInst__(start, opc, pe PASS_REGS) #define RestoreOtaplInst(start, opc, pe) RestoreOtaplInst__(start, opc, pe PASS_REGS)
#define RestoreDBErasedMarker() RestoreDBErasedMarker__( PASS_REGS1 ) #define RestoreDBErasedMarker() RestoreDBErasedMarker__( PASS_REGS1 )
@ -460,7 +460,7 @@ RestoreInvisibleAtoms__( USES_REGS1 )
/* adjusts terms stored in the data base, when they have no variables */ /* adjusts terms stored in the data base, when they have no variables */
static Term static Term
AdjustDBTerm__(Term trm, Term *p_base USES_REGS) AdjustDBTerm__(Term trm, Term *p_base, Term *p_lim USES_REGS)
{ {
if (IsVarTerm(trm)) if (IsVarTerm(trm))
return CodeVarAdjust(trm); return CodeVarAdjust(trm);
@ -473,8 +473,8 @@ AdjustDBTerm__(Term trm, Term *p_base USES_REGS)
p = PtoHeapCellAdjust(RepPair(trm)); p = PtoHeapCellAdjust(RepPair(trm));
out = AbsPair(p); out = AbsPair(p);
loop: loop:
if (p >= p_base) { if (p >= p_base || p < p_lim) {
p[0] = AdjustDBTerm(p[0], p); p[0] = AdjustDBTerm(p[0], p, p_lim);
if (IsPairTerm(p[1])) { if (IsPairTerm(p[1])) {
/* avoid term recursion with very deep lists */ /* avoid term recursion with very deep lists */
Term *newp = PtoHeapCellAdjust(RepPair(p[1])); Term *newp = PtoHeapCellAdjust(RepPair(p[1]));
@ -483,7 +483,7 @@ AdjustDBTerm__(Term trm, Term *p_base USES_REGS)
p = newp; p = newp;
goto loop; goto loop;
} else { } else {
p[1] = AdjustDBTerm(p[1], p); p[1] = AdjustDBTerm(p[1], p, p_lim);
} }
} }
return out; return out;
@ -494,7 +494,7 @@ AdjustDBTerm__(Term trm, Term *p_base USES_REGS)
Term *p0 = p = PtoHeapCellAdjust(RepAppl(trm)); Term *p0 = p = PtoHeapCellAdjust(RepAppl(trm));
/* if it is before the current position, then we are looking /* if it is before the current position, then we are looking
at old code */ at old code */
if (p >= p_base) { if (p >= p_base || p < p_lim) {
f = (Functor)p[0]; f = (Functor)p[0];
if (!IsExtensionFunctor(f)) { if (!IsExtensionFunctor(f)) {
UInt Arity, i; UInt Arity, i;
@ -503,7 +503,7 @@ AdjustDBTerm__(Term trm, Term *p_base USES_REGS)
*p++ = (Term)f; *p++ = (Term)f;
Arity = ArityOfFunctor(f); Arity = ArityOfFunctor(f);
for (i = 0; i < Arity; ++i) { for (i = 0; i < Arity; ++i) {
*p = AdjustDBTerm(*p, p0); *p = AdjustDBTerm(*p, p0, p_lim);
p++; p++;
} }
} }
@ -519,7 +519,7 @@ RestoreDBTerm(DBTerm *dbr, int attachments USES_REGS)
if (attachments) { if (attachments) {
#ifdef COROUTINING #ifdef COROUTINING
if (dbr->ag.attachments) if (dbr->ag.attachments)
dbr->ag.attachments = AdjustDBTerm(dbr->ag.attachments, dbr->Contents); dbr->ag.attachments = AdjustDBTerm(dbr->ag.attachments, dbr->Contents, dbr->Contents);
#endif #endif
} else { } else {
if (dbr->ag.NextDBT) if (dbr->ag.NextDBT)
@ -534,7 +534,7 @@ RestoreDBTerm(DBTerm *dbr, int attachments USES_REGS)
while ((tm = *--cp) != 0) while ((tm = *--cp) != 0)
*cp = DBRefAdjust(tm); *cp = DBRefAdjust(tm);
} }
dbr->Entry = AdjustDBTerm(dbr->Entry, dbr->Contents); dbr->Entry = AdjustDBTerm(dbr->Entry, dbr->Contents, dbr->Contents);
} }
/* Restoring the heap */ /* Restoring the heap */
@ -551,7 +551,7 @@ RestoreStaticClause(StaticClause *cl USES_REGS)
char *x = (char *)DBTermAdjust(cl->usc.ClSource); char *x = (char *)DBTermAdjust(cl->usc.ClSource);
char *base = (char *)cl; char *base = (char *)cl;
if (x < base || x > base+cl->ClSize) { if (x < base || x >= base+cl->ClSize) {
cl->usc.ClPred = PtoPredAdjust(cl->usc.ClPred); cl->usc.ClPred = PtoPredAdjust(cl->usc.ClPred);
} else { } else {
cl->usc.ClSource = DBTermAdjust(cl->usc.ClSource); cl->usc.ClSource = DBTermAdjust(cl->usc.ClSource);