more fixes over tabling changes
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@953 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
		
							
								
								
									
										15
									
								
								C/cdmgr.c
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								C/cdmgr.c
									
									
									
									
									
								
							@@ -1491,21 +1491,6 @@ p_showconslultlev(void)
 | 
				
			|||||||
static void
 | 
					static void
 | 
				
			||||||
end_consult(void)
 | 
					end_consult(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
#if defined(YAPOR) || defined(THREADS)
 | 
					 | 
				
			||||||
  consult_obj  *fp;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  /* force indexing for static and dynamic update predicates
 | 
					 | 
				
			||||||
     after consult and not when all hell may break loose ! */
 | 
					 | 
				
			||||||
  for (fp = ConsultSp; fp < ConsultBase; ++fp) {
 | 
					 | 
				
			||||||
    PredEntry *pred = RepPredProp(fp->p);
 | 
					 | 
				
			||||||
    WRITE_LOCK(pred->PRWLock);
 | 
					 | 
				
			||||||
    if (pred->OpcodeOfPred == INDEX_OPCODE) {
 | 
					 | 
				
			||||||
      IPred(pred);
 | 
					 | 
				
			||||||
      /* IPred does the unlocking */
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    WRITE_UNLOCK(pred->PRWLock);
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
  ConsultSp = ConsultBase;
 | 
					  ConsultSp = ConsultBase;
 | 
				
			||||||
  ConsultBase = ConsultSp+ConsultSp->c;
 | 
					  ConsultBase = ConsultSp+ConsultSp->c;
 | 
				
			||||||
  ConsultSp += 3;
 | 
					  ConsultSp += 3;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2873,8 +2873,8 @@ emit_protection_choicepoint(int first, int clleft, UInt nxtlbl, PredEntry *ap)
 | 
				
			|||||||
	but should work.
 | 
						but should work.
 | 
				
			||||||
      */
 | 
					      */
 | 
				
			||||||
      Yap_emit(retryme_op, (CELL)TRUSTFAILCODE, 0);
 | 
					      Yap_emit(retryme_op, (CELL)TRUSTFAILCODE, 0);
 | 
				
			||||||
    } else {
 | 
					 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
      Yap_emit(trustme_op, 0, 0);
 | 
					      Yap_emit(trustme_op, 0, 0);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user