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

agc should not be called from gc

Browse Source 
agc should not crash on tabled execution.


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1851 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2007-03-18 23:09:12 +00:00
parent b55f58f05f
commit ce71569e66
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
C/agc.c
View File

@ -227,18 +227,20 @@ mark_atoms(void)
static void static void
mark_trail(void) mark_trail(void)
{ {
register CELL *pt; register tr_fr_ptr pt;
pt = (CELL *)TR; pt = TR;
/* moving the trail is simple */ /* moving the trail is simple */
while (pt != (CELL *)Yap_TrailBase) { while (pt != (tr_fr_ptr)Yap_TrailBase) {
register CELL reg = pt[-1]; CELL reg = TrailTerm(pt-1);
pt--;
if (!IsVarTerm(reg)) { if (!IsVarTerm(reg)) {
if (IsAtomTerm(reg)) { if (IsAtomTerm(reg)) {
MarkAtomEntry(RepAtom(AtomOfTerm(reg))); MarkAtomEntry(RepAtom(AtomOfTerm(reg)));
} }
} }
pt--;
} }
} }
@ -254,12 +256,16 @@ mark_local(void)
CELL reg = *--pt; CELL reg = *--pt;
if (!IsVarTerm(reg)) { if (!IsVarTerm(reg)) {
if (IsAtomTerm(reg)) { if (IsAtomTerm(reg)
#if TABLING
/* assume we cannot have atoms on first page,
so this must be an arity
*/
&& reg > Yap_page_size
#endif
) {
MarkAtomEntry(RepAtom(AtomOfTerm(reg))); MarkAtomEntry(RepAtom(AtomOfTerm(reg)));
} }
} else if (IsApplTerm(reg)) {
Functor f = FunctorOfTerm(reg);
FuncAdjust(f);
} }
} }
} }

1
C/heapgc.c
View File

@ -3772,7 +3772,6 @@ call_gc(UInt gc_lim, Int predarity, CELL *current_env, yamop *nextop)
(ASP-H0)*sizeof(CELL) > gc_lim && (ASP-H0)*sizeof(CELL) > gc_lim &&
H-H0 > (LCL0-ASP)/2) { H-H0 > (LCL0-ASP)/2) {
effectiveness = do_gc(predarity, current_env, nextop); effectiveness = do_gc(predarity, current_env, nextop);
Yap_atom_gc();
if (effectiveness < 0) if (effectiveness < 0)
return FALSE; return FALSE;
if (effectiveness > 90) { if (effectiveness > 90) {