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

use structure for visited terms in hash.

Browse Source 
predicates that did stack expansion were declared safe.
This commit is contained in:
Vitor Santos Costa 2011-07-06 17:26:53 -04:00
parent e160d86304
commit 15f5277ca4
1 changed files with 38 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
C/utilpreds.c
View File

@ -3349,6 +3349,13 @@ AddAtomToHash(CELL *st, Atom at)
return st+len; return st+len;
} }
typedef struct visited {
CELL *start;
CELL *end;
CELL old;
UInt vdepth;
} visited_t;
static CELL * static CELL *
hash_complex_term(register CELL *pt0, hash_complex_term(register CELL *pt0,
register CELL *pt0_end, register CELL *pt0_end,
@ -3356,7 +3363,7 @@ hash_complex_term(register CELL *pt0,
CELL *st, CELL *st,
int variant USES_REGS) int variant USES_REGS)
{ {
register CELL **to_visit0, **to_visit = (CELL **)Yap_PreAllocCodeSpace(); register visited_t *to_visit0, *to_visit = (visited_t *)Yap_PreAllocCodeSpace();
to_visit0 = to_visit; to_visit0 = to_visit;
loop: loop:
@ -3385,24 +3392,16 @@ hash_complex_term(register CELL *pt0,
st = AddAtomToHash(st, AtomDot); st = AddAtomToHash(st, AtomDot);
if (depth == 1) if (depth == 1)
continue; continue;
if (to_visit + 1024 >= (CELL **)AuxSp) { if (to_visit + 256 >= (visited_t *)AuxSp) {
goto aux_overflow; goto aux_overflow;
} }
#ifdef RATIONAL_TREES to_visit->start = pt0;
to_visit[0] = pt0; to_visit->end = pt0_end;
to_visit[1] = pt0_end; to_visit->old = *pt0;
to_visit[2] = (CELL *)*pt0; to_visit->vdepth = depth;
to_visit[3] = (CELL *)(depth--); to_visit++;
to_visit += 4; depth--;
*pt0 = TermFoundVar; *pt0 = TermFoundVar;
#else
if (pt0 < pt0_end) {
to_visit[0] = pt0;
to_visit[1] = pt0_end;
to_visit[2] = (CELL *)(depth--);
to_visit += 3;
}
#endif
pt0 = RepPair(d0) - 1; pt0 = RepPair(d0) - 1;
pt0_end = RepPair(d0) + 1; pt0_end = RepPair(d0) + 1;
continue; continue;
@ -3456,25 +3455,16 @@ hash_complex_term(register CELL *pt0,
st = AddAtomToHash(st, NameOfFunctor(f)); st = AddAtomToHash(st, NameOfFunctor(f));
if (depth == 1) if (depth == 1)
continue; continue;
if (to_visit + 1024 >= (CELL **)AuxSp) { if (to_visit + 1024 >= (visited_t *)AuxSp) {
goto aux_overflow; goto aux_overflow;
} }
#ifdef RATIONAL_TREES to_visit->start = pt0;
to_visit[0] = pt0; to_visit->end = pt0_end;
to_visit[1] = pt0_end; to_visit->old = *pt0;
to_visit[2] = (CELL *)*pt0; to_visit->vdepth = depth;
to_visit[3] = (CELL *)(depth--); to_visit++;
to_visit += 4; depth--;
*pt0 = TermFoundVar; *pt0 = TermFoundVar;
#else
/* store the terms to visit */
if (pt0 < pt0_end) {
to_visit[0] = pt0;
to_visit[1] = pt0_end;
to_visit[2] = depth--;
to_visit += 3;
}
#endif
d0 = ArityOfFunctor(f); d0 = ArityOfFunctor(f);
pt0 = ap2; pt0 = ap2;
pt0_end = ap2 + d0; pt0_end = ap2 + d0;
@ -3484,6 +3474,7 @@ hash_complex_term(register CELL *pt0,
deref_body(d0, ptd0, hash_complex_unk, hash_complex_nvar); deref_body(d0, ptd0, hash_complex_unk, hash_complex_nvar);
fprintf(stderr,"found variable\n");
if (!variant) if (!variant)
return NULL; return NULL;
else else
@ -3491,42 +3482,31 @@ hash_complex_term(register CELL *pt0,
} }
/* Do we still have compound terms to visit */ /* Do we still have compound terms to visit */
if (to_visit > to_visit0) { if (to_visit > to_visit0) {
#ifdef RATIONAL_TREES to_visit--;
to_visit -= 4; pt0 = to_visit->start;
pt0 = to_visit[0]; pt0_end = to_visit->end;
pt0_end = to_visit[1]; *pt0 = to_visit->old;
*pt0 = (CELL)to_visit[2]; depth = to_visit->vdepth;
depth = (CELL)to_visit[3];
#else
to_visit -= 3;
pt0 = to_visit[0];
pt0_end = to_visit[1];
depth = (CELL)to_visit[2];
#endif
goto loop; goto loop;
} }
return st; return st;
aux_overflow: aux_overflow:
/* unwind stack */ /* unwind stack */
#ifdef RATIONAL_TREES
while (to_visit > to_visit0) { while (to_visit > to_visit0) {
to_visit -= 4; to_visit --;
pt0 = to_visit[0]; pt0 = to_visit->start;
*pt0 = (CELL)to_visit[2]; *pt0 = to_visit->old;
} }
#endif
return (CELL *)-1; return (CELL *)-1;
global_overflow: global_overflow:
/* unwind stack */ /* unwind stack */
#ifdef RATIONAL_TREES
while (to_visit > to_visit0) { while (to_visit > to_visit0) {
to_visit -= 4; to_visit --;
pt0 = to_visit[0]; pt0 = to_visit->start;
*pt0 = (CELL)to_visit[2]; *pt0 = to_visit->old;
} }
#endif
return (CELL *) -2; return (CELL *) -2;
} }
@ -4241,7 +4221,7 @@ void Yap_InitUtilCPreds(void)
Yap_InitCPred("copy_term_nat", 2, p_copy_term_no_delays, 0); Yap_InitCPred("copy_term_nat", 2, p_copy_term_no_delays, 0);
Yap_InitCPred("ground", 1, p_ground, SafePredFlag); Yap_InitCPred("ground", 1, p_ground, SafePredFlag);
Yap_InitCPred("$variables_in_term", 3, p_variables_in_term, HiddenPredFlag); Yap_InitCPred("$variables_in_term", 3, p_variables_in_term, HiddenPredFlag);
Yap_InitCPred("$non_singletons_in_term", 3, p_non_singletons_in_term, SafePredFlag|HiddenPredFlag); Yap_InitCPred("$non_singletons_in_term", 3, p_non_singletons_in_term, HiddenPredFlag);
Yap_InitCPred("term_variables", 2, p_term_variables, 0); Yap_InitCPred("term_variables", 2, p_term_variables, 0);
Yap_InitCPred("term_variables", 3, p_term_variables3, 0); Yap_InitCPred("term_variables", 3, p_term_variables3, 0);
Yap_InitCPred("term_attvars", 2, p_term_attvars, 0); Yap_InitCPred("term_attvars", 2, p_term_attvars, 0);
@ -4254,9 +4234,9 @@ void Yap_InitUtilCPreds(void)
Yap_InitCPred("export_term", 1, p_export_term, 0); Yap_InitCPred("export_term", 1, p_export_term, 0);
#endif #endif
CurrentModule = TERMS_MODULE; CurrentModule = TERMS_MODULE;
Yap_InitCPred("variable_in_term", 2, p_var_in_term, SafePredFlag); Yap_InitCPred("variable_in_term", 2, p_var_in_term, 0);
Yap_InitCPred("term_hash", 4, p_term_hash, SafePredFlag); Yap_InitCPred("term_hash", 4, p_term_hash, 0);
Yap_InitCPred("instantiated_term_hash", 4, p_instantiated_term_hash, SafePredFlag); Yap_InitCPred("instantiated_term_hash", 4, p_instantiated_term_hash, 0);
Yap_InitCPred("variant", 2, p_variant, 0); Yap_InitCPred("variant", 2, p_variant, 0);
Yap_InitCPred("subsumes", 2, p_subsumes, 0); Yap_InitCPred("subsumes", 2, p_subsumes, 0);
Yap_InitCPred("variables_within_term", 3, p_variables_within_term, 0); Yap_InitCPred("variables_within_term", 3, p_variables_within_term, 0);