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

cannot trust H0 in the att test (use Yap_GlobalBase instead).

Browse Source
This commit is contained in:
Vítor Santos Costa II 2010-04-22 12:08:02 +01:00
parent 034c585489
commit 7f9f10a1d9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
C/heapgc.c
View File

@ -1173,7 +1173,7 @@ mark_variable(CELL_PTR current)
next = GET_NEXT(ccur); next = GET_NEXT(ccur);
if (IsVarTerm(ccur)) { if (IsVarTerm(ccur)) {
if (IN_BETWEEN(H0,current,H) && IsAttVar(current) && current==next) { if (IN_BETWEEN(Yap_GlobalBase,current,H) && IsAttVar(current) && current==next) {
if (next < H0) POP_CONTINUATION(); if (next < H0) POP_CONTINUATION();
if (!UNMARKED_MARK(next-1,local_bp)) { if (!UNMARKED_MARK(next-1,local_bp)) {
total_marked++; total_marked++;
@ -1682,7 +1682,7 @@ mark_trail(tr_fr_ptr trail_ptr, tr_fr_ptr trail_base, CELL *gc_H, choiceptr gc_B
} else if (IsPairTerm(trail_cell)) { } else if (IsPairTerm(trail_cell)) {
/* can safely ignore this */ /* can safely ignore this */
CELL *cptr = RepPair(trail_cell); CELL *cptr = RepPair(trail_cell);
if (IN_BETWEEN(H0,cptr,H) && if (IN_BETWEEN(Yap_GlobalBase,cptr,H) &&
IsAttVar(cptr)) { IsAttVar(cptr)) {
TrailTerm(trail_base) = (CELL)cptr; TrailTerm(trail_base) = (CELL)cptr;
mark_external_reference(&TrailTerm(trail_base)); mark_external_reference(&TrailTerm(trail_base));
@ -2465,7 +2465,7 @@ sweep_trail(choiceptr gc_B, tr_fr_ptr old_TR)
CELL *pt0 = RepPair(trail_cell); CELL *pt0 = RepPair(trail_cell);
CELL flags; CELL flags;
if (IN_BETWEEN(H0, pt0, H) && IsAttVar(pt0)) { if (IN_BETWEEN(Yap_GlobalBase, pt0, H) && IsAttVar(pt0)) {
TrailTerm(dest) = trail_cell; TrailTerm(dest) = trail_cell;
/* be careful with partial gc */ /* be careful with partial gc */
if (HEAP_PTR(TrailTerm(dest))) { if (HEAP_PTR(TrailTerm(dest))) {