more small fixes

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1431 b08c6af1-5177-4d33-ba66-4b1c6b8b522a

C/arith0.c

@@ -242,13 +242,13 @@ Yap_ReInitConstExps(void)
     AtomEntry *ae = RepAtom(Yap_FullLookupAtom(InitConstTab[i].OpName));
 
     WRITE_LOCK(ae->ARWLock);
-    if ((p = Yap_GetExpPropHavingLock(ae, 0)) == NULL) {
+    if (!(p = Yap_GetExpPropHavingLock(ae, 0))) {
       WRITE_UNLOCK(ae->ARWLock);
-      return(FALSE);
+      return FALSE;
     }
     RepExpProp(p)->FOfEE.constant = InitConstTab[i].f;
     WRITE_UNLOCK(ae->ARWLock);
   }
-  return(TRUE);
+  return TRUE;
 }
 

C/arith1.c

@@ -2110,7 +2110,7 @@ Yap_ReInitUnaryExps(void)
     WRITE_LOCK(ae->ARWLock);
     if ((p = Yap_GetExpPropHavingLock(ae, 1)) == NULL) {
       WRITE_UNLOCK(ae->ARWLock);
-      return(FALSE);
+      return FALSE;
     }
     RepExpProp(p)->FOfEE.unary = InitUnTab[i].f;
     WRITE_UNLOCK(ae->ARWLock);

C/save.c

@@ -408,6 +408,11 @@ save_regs(int mode)
 #ifdef COROUTINING
     putout(DelayedVars);
 #endif
+#if defined(SBA) || defined(TABLING)
+    putcellptr(H_FZ);
+    putcellptr((CELL *)B_FZ);
+    putcellptr((CELL *)TR_FZ);
+#endif /* SBA || TABLING */
   }
   putout(CurrentModule);
   if (mode == DO_EVERYTHING) {
@@ -464,7 +469,7 @@ save_heap(void)
 {
   int j;
   /* Then save the whole heap */
-#if defined(YAPOR) || defined(TABLING)
+#if defined(YAPOR) || defined(TABLING) && !defined(YAP_MEMORY_ALLOC_SCHEME)
   /* skip the local and global data structures */
   j = Unsigned(&GLOBAL) - Unsigned(Yap_HeapBase);
   putout(j);
@@ -798,6 +803,17 @@ get_regs(int flag)
     if (Yap_ErrorMessage)
       return -1;
 #endif
+#if defined(SBA) || defined(TABLING)
+    H_FZ = get_cellptr();
+    if (Yap_ErrorMessage)
+      return -1;
+    B_FZ = (choiceptr)get_cellptr();
+    if (Yap_ErrorMessage)
+      return -1;
+    TR_FZ = (tr_fr_ptr)get_cellptr();
+    if (Yap_ErrorMessage)
+      return -1;
+#endif /* SBA || TABLING */
   }
   CurrentModule = get_cell();
     if (Yap_ErrorMessage)
@@ -875,7 +891,7 @@ get_hash(void)
 static int 
 CopyCode(void)
 {
-#if defined(YAPOR) || defined(TABLING)
+#if (defined(YAPOR) || defined(TABLING)) && !defined(YAP_MEMORY_ALLOC_SCHEME)
   /* skip the local and global data structures */
   CELL j = get_cell();
   if (Yap_ErrorMessage)

C/tracer.c

@@ -181,7 +181,6 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
 #if defined(THREADS) || defined(YAPOR)
   fprintf(Yap_stderr,"(%d)", worker_id);
 #endif
-  fprintf(Yap_stderr," %x ", Yap_ReadTimedVar(WokenGoals));
   /* check_trail_consistency(); */
   if (pred == NULL) 
     return;