From 81635b48fb8ad4ca9a8192438e7ef31eee9811b8 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Mon, 8 Mar 2010 09:17:40 +0000
Subject: [PATCH] use isattvar

---
 C/absmi.c | 216 +++++++++++++++++++++++++++---------------------------
 1 file changed, 108 insertions(+), 108 deletions(-)

diff --git a/C/absmi.c b/C/absmi.c
index d7e738b9d..7a64650d6 100644
--- a/C/absmi.c
+++ b/C/absmi.c
@@ -2039,7 +2039,7 @@ Yap_absmi(int inp)
 	      goto failloop;
 	    } else
 #endif /* FROZEN_STACKS */
-	      if (IN_BETWEEN(Yap_GlobalBase, pt1, H0))
+	      if (IsAttVar(pt1))
 		goto failloop;		       	    
 	    flags = *pt1;
 #if defined(YAPOR) || defined(THREADS)
@@ -3278,7 +3278,7 @@ Yap_absmi(int inp)
       BIND_AND_JUMP(pt0, d0);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       GONext();
 
@@ -3299,7 +3299,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, bind_gvalx_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_gvalx_var_nonvar:
 #endif
       GONext();
@@ -3311,14 +3311,14 @@ Yap_absmi(int inp)
       UnifyCells(pt0, pt1, uc1, uc2);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc1:
 #endif
       GONext();
 #ifdef COROUTINING
     uc2:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -3360,7 +3360,7 @@ Yap_absmi(int inp)
       BIND(pt1, d0, bind_gvaly_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt1, d0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
     bind_gvaly_nonvar_var:
 #endif
       GONext();
@@ -3379,7 +3379,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, bind_gvaly_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_gvaly_var_nonvar:
 #endif
       GONext();
@@ -3391,14 +3391,14 @@ Yap_absmi(int inp)
       UnifyCells(pt0, pt1, uc3, uc4);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc3:
 #endif
       GONext();
 #ifdef COROUTINING
     uc4:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -3432,7 +3432,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, bind_gatom);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_gatom:
 #endif
       GONext();
@@ -3463,7 +3463,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.cc.c1, gatom_2b);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.cc.c1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
     gatom_2b:
@@ -3489,7 +3489,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, gatom_2c);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     gatom_2c:
 #endif
       GONext();
@@ -3520,7 +3520,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.ccc.c1, gatom_3b);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.ccc.c1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
     gatom_3b:
@@ -3543,7 +3543,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.ccc.c2, gatom_3c);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.ccc.c2);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
     gatom_3c:
@@ -3569,7 +3569,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, gatom_3d);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     gatom_3d:
 #endif
       GONext();
@@ -3600,7 +3600,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.cccc.c1, gatom_4b);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.cccc.c1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
     gatom_4b:
@@ -3623,7 +3623,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.cccc.c2, gatom_4c);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.cccc.c2);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
     gatom_4c:
@@ -3646,7 +3646,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.cccc.c3, gatom_4d);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.cccc.c3);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
    gatom_4d:
@@ -3672,7 +3672,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, gatom_4e);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     gatom_4e:
 #endif
       GONext();
@@ -3703,7 +3703,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.ccccc.c1, gatom_5b);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.ccccc.c1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
     gatom_5b:
@@ -3726,7 +3726,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.ccccc.c2, gatom_5c);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.ccccc.c2);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
     gatom_5c:
@@ -3749,7 +3749,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.ccccc.c3, gatom_5d);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.ccccc.c3);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
    gatom_5d:
@@ -3772,7 +3772,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.ccccc.c4, gatom_5e);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.ccccc.c4);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
    gatom_5e:
@@ -3798,7 +3798,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, gatom_5f);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     gatom_5f:
 #endif
       GONext();
@@ -3829,7 +3829,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.cccccc.c1, gatom_6b);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.cccccc.c1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
     gatom_6b:
@@ -3852,7 +3852,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.cccccc.c2, gatom_6c);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.cccccc.c2);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
     gatom_6c:
@@ -3875,7 +3875,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.cccccc.c3, gatom_6d);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.cccccc.c3);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
    gatom_6d:
@@ -3898,7 +3898,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.cccccc.c4, gatom_6e);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.cccccc.c4);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
    gatom_6e:
@@ -3921,7 +3921,7 @@ Yap_absmi(int inp)
       BIND(pt0, PREG->u.cccccc.c5, gatom_6f);
 #ifdef COROUTINING
       DO_TRAIL(pt0, PREG->u.cccccc.c5);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 #endif
       ENDP(pt0);
     gatom_6f:
@@ -3947,7 +3947,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, gatom_6g);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     gatom_6g:
 #endif
       GONext();
@@ -3989,7 +3989,7 @@ Yap_absmi(int inp)
       BIND(pt0, d0, bind_glist);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) {
+      if (IsAttVar(pt0)) {
 	Yap_WakeUp(pt0);
 	S_SREG = H;
       }
@@ -4043,7 +4043,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, bind_gstruct);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) {
+      if (IsAttVar(pt0)) {
 	Yap_WakeUp(pt0);
       }
     bind_gstruct:
@@ -4109,7 +4109,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, bind_gfloat);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_gfloat:
 #endif
       GONext();
@@ -4154,7 +4154,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, bind_glongint);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_glongint:
 #endif
       GONext();
@@ -4202,7 +4202,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, bind_gbigint);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_gbigint:
 #endif
       GONext();
@@ -4241,7 +4241,7 @@ Yap_absmi(int inp)
       BIND(pt0, d1, bind_gdbterm);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_gdbterm:
 #endif
       GONext();
@@ -4293,7 +4293,7 @@ Yap_absmi(int inp)
       BIND(pt1, d0, bind_glist_valx_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt1, d0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
     bind_glist_valx_nonvar_var:
 #endif
       GONext();
@@ -4314,7 +4314,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d0, bind_glist_valx_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_glist_valx_var_nonvar:
 #endif
       GONext();
@@ -4326,14 +4326,14 @@ Yap_absmi(int inp)
       UnifyGlobalRegCells(pt0, pt1, uc5, uc6);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc5:
 #endif
       GONext();
 #ifdef COROUTINING
     uc6:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -4366,7 +4366,7 @@ Yap_absmi(int inp)
 
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     dbind:
 #endif
       ALWAYS_GONextW();
@@ -4415,7 +4415,7 @@ Yap_absmi(int inp)
       BIND(pt1, d0, bind_glist_valy_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt1, d0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
     bind_glist_valy_nonvar_var:
 #endif
       GONext();
@@ -4436,7 +4436,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_glist_valy_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_glist_valy_var_nonvar:
 #endif
       GONext();
@@ -4447,14 +4447,14 @@ Yap_absmi(int inp)
       UnifyGlobalRegCells(pt0, pt1, uc7, uc8);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc7:
 #endif
       GONext();
 #ifdef COROUTINING
     uc8:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -4473,7 +4473,7 @@ Yap_absmi(int inp)
       BIND(pt0, d0, bind_glist_valy_write);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) {
+      if (IsAttVar(pt0)) {
 	Yap_WakeUp(pt0);
 	pt1 = H;
       }
@@ -4530,7 +4530,7 @@ Yap_absmi(int inp)
       BIND(pt0, d0, bind_glist_varx_write);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_glist_varx_write:
 #endif
       PREG = NEXTOP(PREG, xx);
@@ -4581,7 +4581,7 @@ Yap_absmi(int inp)
       BIND(pt0, d0, bind_glist_void_vary_write);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_glist_void_vary_write:
 #endif
       GONext();
@@ -4626,7 +4626,7 @@ Yap_absmi(int inp)
       BIND(pt1, d0, bind_glist_void_valx_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt1, d0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
   bind_glist_void_valx_nonvar_var:
 #endif
       GONext();
@@ -4646,7 +4646,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_glist_void_valx_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_glist_void_valx_var_nonvar:
 #endif
       GONext();
@@ -4658,14 +4658,14 @@ Yap_absmi(int inp)
       UnifyGlobalRegCells(pt0, pt1, uc9, uc10);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc9:
 #endif
       GONext();
 #ifdef COROUTINING
     uc10:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -4681,7 +4681,7 @@ Yap_absmi(int inp)
       BIND(pt0, d0, bind_glist_void_valx_write);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) {
+      if (IsAttVar(pt0)) {
 	Yap_WakeUp(pt0);
 	pt1 = H;
       }
@@ -4738,7 +4738,7 @@ Yap_absmi(int inp)
       BIND(pt1, d0, bind_glist_void_valy_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt1, d0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
   bind_glist_void_valy_nonvar_var:
 #endif
       GONext();
@@ -4759,7 +4759,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_glist_void_valy_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_glist_void_valy_var_nonvar:
 #endif
       GONext();
@@ -4770,14 +4770,14 @@ Yap_absmi(int inp)
       UnifyGlobalRegCells(pt0, pt1, uc11, uc12);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc11:
 #endif
       GONext();
 #ifdef COROUTINING
     uc12:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -4793,7 +4793,7 @@ Yap_absmi(int inp)
       BIND(pt0, d0, bind_glist_void_valy_write);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) {
+      if (IsAttVar(pt0)) {
 	Yap_WakeUp(pt0);
 	S_SREG = H;
       }
@@ -5087,7 +5087,7 @@ Yap_absmi(int inp)
       BIND(pt1, d0, bind_uvalx_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt1, d0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
   bind_uvalx_nonvar_var:
 #endif
       GONext();
@@ -5106,7 +5106,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_uvalx_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_uvalx_var_nonvar:
 #endif
       GONext();
@@ -5119,14 +5119,14 @@ Yap_absmi(int inp)
       UnifyGlobalRegCells(pt0, pt1, uc13, uc14);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc13:
 #endif
       GONext();
 #ifdef COROUTINING
     uc14:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -5171,7 +5171,7 @@ Yap_absmi(int inp)
       BIND(pt1, d0, bind_ulvalx_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt1, d0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
   bind_ulvalx_nonvar_var:
 #endif
       GONext();
@@ -5189,7 +5189,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_ulvalx_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_ulvalx_var_nonvar:
 #endif
       GONext();
@@ -5201,14 +5201,14 @@ Yap_absmi(int inp)
       UnifyGlobalRegCells(pt0, pt1, uc15, uc16);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc15:
 #endif
       GONext();
 #ifdef COROUTINING
     uc16:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -5256,7 +5256,7 @@ Yap_absmi(int inp)
       BIND(pt1, d0, bind_uvaly_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt1, d0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
   bind_uvaly_nonvar_var:
 #endif
       GONext();
@@ -5277,7 +5277,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_uvaly_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_uvaly_var_nonvar:
 #endif
       GONext();
@@ -5289,14 +5289,14 @@ Yap_absmi(int inp)
       UnifyGlobalRegCells(pt0, pt1, uc17, uc18);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc17:
 #endif
       GONext();
 #ifdef COROUTINING
     uc18:
       DO_TRAIL(pt1, (CELL)pt1);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -5350,7 +5350,7 @@ Yap_absmi(int inp)
       BIND(pt1, d0, bind_ulvaly_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt1, d0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
   bind_ulvaly_nonvar_var:
 #endif
       GONext();
@@ -5370,7 +5370,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_ulvaly_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_ulvaly_var_nonvar:
 #endif
       GONext();
@@ -5383,14 +5383,14 @@ Yap_absmi(int inp)
       UnifyGlobalRegCells(pt0, pt1, uc19, uc20);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc19:
 #endif
       GONext();
 #ifdef COROUTINING
     uc20:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -5445,7 +5445,7 @@ Yap_absmi(int inp)
       BIND(pt1, d0, bind_uvalx_loc_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt1, d0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
   bind_uvalx_loc_nonvar_var:
 #endif
       GONext();
@@ -5465,7 +5465,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_uvalx_loc_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_uvalx_loc_var_nonvar:
 #endif
       GONext();
@@ -5480,14 +5480,14 @@ Yap_absmi(int inp)
       UnifyGlobalRegCells(pt0, pt1, uc21, uc22);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc21:
 #endif
       GONext();
 #ifdef COROUTINING
     uc22:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -5558,7 +5558,7 @@ Yap_absmi(int inp)
       BIND(pt0, d0, bind_ulvalx_loc_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_ulvalx_loc_nonvar_var:
 #endif
       GONext();
@@ -5575,7 +5575,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_ulvalx_loc_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_ulvalx_loc_var_nonvar:
 #endif
       GONext();
@@ -5587,14 +5587,14 @@ Yap_absmi(int inp)
       UnifyGlobalRegCells(pt0, pt1, uc23, uc24);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc23:
 #endif
       GONext();
 #ifdef COROUTINING
     uc24:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -5663,7 +5663,7 @@ Yap_absmi(int inp)
       BIND(pt1, d0, bind_uvaly_loc_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt1, d0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
   bind_uvaly_loc_nonvar_var:
 #endif
       GONext();
@@ -5684,7 +5684,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_uvaly_loc_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_uvaly_loc_var_nonvar:
 #endif
       GONext();
@@ -5698,14 +5698,14 @@ Yap_absmi(int inp)
       UnifyGlobalRegCells(pt0, pt1, uc25, uc26);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc25:
 #endif
       GONext();
 #ifdef COROUTINING
     uc26:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -5777,7 +5777,7 @@ Yap_absmi(int inp)
       BIND(pt1, d0, bind_ulvaly_loc_nonvar_var);
 #ifdef COROUTINING
       DO_TRAIL(pt1, d0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
   bind_ulvaly_loc_nonvar_var:
 #endif
       GONext();
@@ -5797,7 +5797,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_ulvaly_loc_var_nonvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_ulvaly_loc_var_nonvar:
 #endif
       GONext();
@@ -5810,14 +5810,14 @@ Yap_absmi(int inp)
       UnifyGlobalRegCells(pt0, pt1, uc27, uc28);
 #ifdef COROUTINING
       DO_TRAIL(pt0, (CELL)pt1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     uc27:
 #endif
       GONext();
 #ifdef COROUTINING
     uc28:
       DO_TRAIL(pt1, (CELL)pt0);
-      if (pt1 < H0) Yap_WakeUp(pt1);
+      if (IsAttVar(pt1)) Yap_WakeUp(pt1);
       GONext();
 #endif
       ENDP(pt1);
@@ -5947,7 +5947,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d0, bind_uatom);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_uatom:
 #endif
       GONext();
@@ -5980,7 +5980,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d0, bind_ulatom);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_ulatom:
 #endif
       GONext();
@@ -6016,7 +6016,7 @@ Yap_absmi(int inp)
 	  BIND_GLOBAL(pt0, d1, bind_unlatom);
 #ifdef COROUTINING
 	  DO_TRAIL(pt0, d1);
-	  if (pt0 < H0) Yap_WakeUp(pt0);
+	  if (IsAttVar(pt0)) Yap_WakeUp(pt0);
 	bind_unlatom:
 	  continue;
 #endif
@@ -6086,7 +6086,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_ufloat);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_ufloat:
 #endif
       GONext();
@@ -6139,7 +6139,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(S_SREG, d1, bind_ulfloat);
 #ifdef COROUTINING
       DO_TRAIL(S_SREG, d1);
-      if (S_SREG < H0) Yap_WakeUp(S_SREG);
+      if (IsAttVar(S_SREG)) Yap_WakeUp(S_SREG);
   bind_ulfloat:
 #endif
       GONext();
@@ -6188,7 +6188,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_ulongint);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_ulongint:
 #endif
       GONext();
@@ -6236,7 +6236,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(S_SREG, d1, bind_ullongint);
 #ifdef COROUTINING
       DO_TRAIL(S_SREG, d1);
-      if (S_SREG < H0) Yap_WakeUp(S_SREG);
+      if (IsAttVar(S_SREG)) Yap_WakeUp(S_SREG);
   bind_ullongint:
 #endif
       GONext();
@@ -6285,7 +6285,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_ubigint);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_ubigint:
 #endif
       GONext();
@@ -6330,7 +6330,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(S_SREG, d1, bind_ulbigint);
 #ifdef COROUTINING
       DO_TRAIL(S_SREG, d1);
-      if (S_SREG < H0) Yap_WakeUp(S_SREG);
+      if (IsAttVar(S_SREG)) Yap_WakeUp(S_SREG);
   bind_ulbigint:
 #endif
       GONext();
@@ -6363,7 +6363,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_udbterm);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_udbterm:
 #endif
       GONext();
@@ -6393,7 +6393,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(S_SREG, d1, bind_uldbterm);
 #ifdef COROUTINING
       DO_TRAIL(S_SREG, d1);
-      if (S_SREG < H0) Yap_WakeUp(S_SREG);
+      if (IsAttVar(S_SREG)) Yap_WakeUp(S_SREG);
   bind_uldbterm:
 #endif
       GONext();
@@ -6435,7 +6435,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d0, bind_ulist_var);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_ulist_var:
 #endif
       GONextW();
@@ -6495,7 +6495,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d0, bind_ullist_var);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
   bind_ullist_var:
 #endif
       GONextW();
@@ -6560,7 +6560,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_ustruct);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_ustruct:
 #endif
       /* now, set pt0 to point to the heap where we are going to
@@ -6636,7 +6636,7 @@ Yap_absmi(int inp)
       BIND_GLOBAL(pt0, d1, bind_ulstruct);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d1);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_ulstruct:
 #endif
       /* now, set pt0 to point to the heap where we are going to
@@ -13455,7 +13455,7 @@ Yap_absmi(int inp)
 	BIND(pt0, d0, bind_func_nvar_var);
 #ifdef COROUTINING
 	DO_TRAIL(pt0, d0);
-	if (pt0 < H0) Yap_WakeUp(pt0);
+	if (IsAttVar(pt0)) Yap_WakeUp(pt0);
       bind_func_nvar_var:
 #endif
 	/* I have to this here so that I don't have a jump to a closing bracket */
@@ -13482,7 +13482,7 @@ Yap_absmi(int inp)
 	/* Done */
 #ifdef COROUTINING
 	DO_TRAIL(pt0, d0);
-	if (pt0 < H0) Yap_WakeUp(pt0);
+	if (IsAttVar(pt0)) Yap_WakeUp(pt0);
       bind_func_nvar3_var:
 #endif
 	GONext();
@@ -13575,7 +13575,7 @@ Yap_absmi(int inp)
       BIND(pt0, d0, bind_func_var_3nvar);
 #ifdef COROUTINING
       DO_TRAIL(pt0, d0);
-      if (pt0 < H0) Yap_WakeUp(pt0);
+      if (IsAttVar(pt0)) Yap_WakeUp(pt0);
     bind_func_var_3nvar:
 #endif
       GONext();