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

call the garbage collector the right way

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@902 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2003-10-17 02:11:21 +00:00
parent 76160f72a8
commit 526ec2e50f
12 changed files with 172 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
C/compiler.c
View File

@@ -1184,20 +1184,20 @@ c_goal(Term Goal, int mod)
#ifdef TABLING
READ_LOCK(CurrentPred->PRWLock);
if (is_tabled(CurrentPred)) {
Yap_emit(cut_op, Zero, Zero);
Yap_emit_3ops(cut_op, Zero, Zero, Zero);
Yap_emit(table_new_answer_op, Zero, CurrentPred->ArityOfPE);
}
else
#endif /* TABLING */
{
Yap_emit(cutexit_op, Zero, Zero);
Yap_emit_3ops(cutexit_op, Zero, Zero, Zero);
}
#ifdef TABLING
READ_UNLOCK(CurrentPred->PRWLock);
#endif
}
else {
Yap_emit(cut_op, Zero, Zero);
Yap_emit_3ops(cut_op, Zero, Zero, Zero);
/* needs to adjust previous commits */
adjust_current_commits();
}
@@ -1611,10 +1611,9 @@ c_goal(Term Goal, int mod)
&& !(p->PredFlags & SyncPredFlag)
#endif /* YAPOR */
) {
if (onlast)
Yap_emit(deallocate_op, Zero, Zero);
Yap_emit(safe_call_op, (CELL) p0, Zero);
if (onlast) {
Yap_emit(deallocate_op, Zero, Zero);
#ifdef TABLING
READ_LOCK(CurrentPred->PRWLock);
if (is_tabled(CurrentPred))
@@ -1842,6 +1841,8 @@ AssignPerm(PInstr *pc)
}
#endif
pc->rnd2 = nperm;
} else if (pc->op == cut_op || pc->op == cutexit_op) {
pc->rnd2 = nperm;
}
opc = pc;
pc = npc;
@@ -2054,6 +2055,14 @@ CheckUnsafe(PInstr *pc)
pc->rnd1 = (CELL)labelno;
add_bvarray_op(pc, vstat, pc->rnd2);
break;
case cut_op:
case cutexit_op:
/* just get ourselves a label describing how
many permanent variables are alive */
Yap_emit(label_op, ++labelno, Zero);
pc->rnd1 = (CELL)labelno;
add_bvarray_op(pc, vstat, pc->rnd2);
break;
case call_op:
Yap_emit(label_op, ++labelno, Zero);
pc->ops.opseqt[1] = (CELL)labelno;
@@ -2490,6 +2499,18 @@ c_layout(void)
for (rn = 1; rn < MaxCTemps; ++rn)
*up++ = *cop++ = NIL;
break;
case cut_op:
case cutexit_op:
{
int i, max;
max = 0;
for (i = 1; i < MaxCTemps; ++i) {
if (Contents[i]) max = i;
}
cpc->ops.opseqt[1] = max;
}
break;
case restore_tmps_and_skip_op:
case restore_tmps_op:
/*
@@ -2497,7 +2518,7 @@ c_layout(void)
how many temporaries are live right now. It is also useful when
waking up goals before an either or ! instruction.
*/
{
{
PInstr *mycpc = cpc, *oldCodeStart = CodeStart;
int i, max;