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

fix garbage collection of pointers to attributed variables.

Browse Source
This commit is contained in:
Vitor Santos Costa 2010-03-16 01:07:26 +00:00
parent 8df2b4a963
commit 57f55cbd28
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
C/heapgc.c
View File

@ -1664,22 +1664,13 @@ mark_trail(tr_fr_ptr trail_ptr, tr_fr_ptr trail_base, CELL *gc_H, choiceptr gc_B
#endif #endif
discard_trail_entries++; discard_trail_entries++;
} else { } else {
if ( IsAttVar(hp)) { if (trail_cell == (CELL)trail_base)
if (!detatt || hp >= detatt) { discard_trail_entries++;
mark_att_var(hp);
} else {
trail_cell = TrailTerm(trail_base) = (CELL)trail_base;
discard_trail_entries++;
}
} else {
if (trail_cell == (CELL)trail_base)
discard_trail_entries++;
#ifdef FROZEN_STACKS #ifdef FROZEN_STACKS
else { else {
mark_external_reference(&TrailVal(trail_base)); mark_external_reference(&TrailVal(trail_base));
}
#endif
} }
#endif
#ifdef EASY_SHUNTING #ifdef EASY_SHUNTING
if (hp < gc_H && hp >= H0 && !MARKED_PTR(hp)) { if (hp < gc_H && hp >= H0 && !MARKED_PTR(hp)) {
tr_fr_ptr nsTR = (tr_fr_ptr)cont_top0; tr_fr_ptr nsTR = (tr_fr_ptr)cont_top0;
@ -1707,10 +1698,11 @@ 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 (cptr > (CELL*)Yap_GlobalBase && cptr < H0) { if (IsAttVar(cptr)) {
trail_base++; TrailTerm(trail_base) = (CELL)cptr;
continue; mark_external_reference(&TrailTerm(trail_base));
} TrailTerm(trail_base) = trail_cell;
}
} }
#if MULTI_ASSIGNMENT_VARIABLES #if MULTI_ASSIGNMENT_VARIABLES
else { else {
@ -2483,9 +2475,12 @@ 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 (IsAttVar(pt0)) {
if (pt0 > (CELL*)Yap_GlobalBase && pt0 < H0) {
TrailTerm(dest) = trail_cell; TrailTerm(dest) = trail_cell;
/* be careful with partial gc */
if (HEAP_PTR(TrailTerm(dest))) {
into_relocation_chain(&TrailTerm(dest), GET_NEXT(trail_cell));
}
dest++; dest++;
trail_ptr++; trail_ptr++;
continue; continue;