From 43a822b41f42c5aa764e9c4ecd83be793dfbb1cb Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Mon, 8 Mar 2010 09:21:16 +0000
Subject: [PATCH] IsAttVar

---
 C/exec.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/C/exec.c b/C/exec.c
index 91da5760c..fa5d0fe34 100644
--- a/C/exec.c
+++ b/C/exec.c
@@ -126,8 +126,8 @@ p_save_cp(void)
   td = cp_as_integer(B);
   BIND((CELL *)t,td,bind_save_cp);
 #ifdef COROUTINING
-  DO_TRAIL(CellPtr(t), td);
-  if (CellPtr(t) < H0) Yap_WakeUp((CELL *)t);
+  DO_TRAIL(VarOfTerm(t), td);
+  if (IsAttVar(VarOfTerm(t))) Yap_WakeUp((CELL *)t);
  bind_save_cp:
 #endif
   return(TRUE);
@@ -145,8 +145,8 @@ p_save_env_b(void)
   td = cp_as_integer((choiceptr)YENV[E_CB]);
   BIND((CELL *)t,td,bind_save_cp);
 #ifdef COROUTINING
-  DO_TRAIL(CellPtr(t), td);
-  if (CellPtr(t) < H0) Yap_WakeUp((CELL *)t);
+  DO_TRAIL(VarOfTerm(t), td);
+  if (IsAttVar(VarOfTerm(t))) Yap_WakeUp((CELL *)t);
  bind_save_cp:
 #endif
   return(TRUE);
@@ -1629,10 +1629,8 @@ Yap_InitYaamRegs(void)
   GlobalArena = TermNil;
   h0var = MkVarTerm();
 #if COROUTINING
-  DelayedVars = Yap_NewTimedVar(h0var);
   WokenGoals = Yap_NewTimedVar(TermNil);
   AttsMutableList = Yap_NewTimedVar(h0var);
-  GlobalDelayArena = TermNil;
 #endif
   GcGeneration = Yap_NewTimedVar(h0var);
   GcCurrentPhase = 0L;