*** empty log message ***

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@2215 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
ricroc
2008-04-11 16:30:28 +00:00
parent 516a349aad
commit ddcd80d2a9
6 changed files with 29 additions and 23 deletions

View File

@@ -10,8 +10,11 @@
* File: c_interface.c *
* comments: c_interface primitives definition *
* *
* Last rev: $Date: 2008-04-04 13:35:41 $,$Author: vsc $ *
* Last rev: $Date: 2008-04-11 16:30:27 $,$Author: ricroc $ *
* $Log: not supported by cvs2svn $
* Revision 1.114 2008/04/04 13:35:41 vsc
* fix duplicate dependency frame at entry
*
* Revision 1.113 2008/04/04 09:10:02 vsc
* restore was restoring twice
*
@@ -1763,11 +1766,7 @@ YAP_Init(YAP_init_args *yap_init)
}
yap_flags[FAST_BOOT_FLAG] = yap_init->FastBoot;
#if defined(YAPOR) || defined(TABLING)
#ifdef YAP_MEMORY_ALLOC_SCHEME
if (restore_result != DO_ONLY_CODE &&
restore_result != DO_EVERYTHING)
#endif
make_root_frames();
make_root_frames();
#ifdef YAPOR
init_workers();
#endif /* YAPOR */

View File

@@ -11,8 +11,11 @@
* File: cdmgr.c *
* comments: Code manager *
* *
* Last rev: $Date: 2008-04-01 22:28:41 $,$Author: vsc $ *
* Last rev: $Date: 2008-04-11 16:30:27 $,$Author: ricroc $ *
* $Log: not supported by cvs2svn $
* Revision 1.226 2008/04/01 22:28:41 vsc
* put YAPOR back to life.
*
* Revision 1.225 2008/04/01 08:42:45 vsc
* fix restore and small VISTA thingies
*
@@ -1585,9 +1588,6 @@ add_first_static(PredEntry *p, yamop *cp, int spy_flag)
p->PredFlags |= ProfiledPredFlag;
} else
p->PredFlags &= ~ProfiledPredFlag;
#ifdef YAPOR
p->PredFlags |= SequentialPredFlag;
#endif /* YAPOR */
if (spy_flag) {
p->OpcodeOfPred = Yap_opcode(_spy_pred);
p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred));

View File

@@ -471,7 +471,7 @@ save_heap(void)
{
int j;
/* Then save the whole heap */
#if (defined(YAPOR) || defined(TABLING)) && !defined(YAP_MEMORY_ALLOC_SCHEME)
#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);
@@ -483,7 +483,7 @@ save_heap(void)
j = Unsigned(HeapTop) - Unsigned(Yap_HeapBase);
/* store 10 more cells because of the memory manager */
mywrite(splfild, (char *) Yap_HeapBase, j);
#endif /* YAPOR || TABLING */
#endif /* YAPOR || (TABLING && !YAP_MEMORY_ALLOC_SCHEME) */
}
static void
@@ -908,7 +908,7 @@ get_hash(void)
static int
CopyCode(void)
{
#if (defined(YAPOR) || defined(TABLING)) && !defined(YAP_MEMORY_ALLOC_SCHEME)
#if defined(YAPOR) || (defined(TABLING) && !defined(YAP_MEMORY_ALLOC_SCHEME))
/* skip the local and global data structures */
CELL j = get_cell();
if (Yap_ErrorMessage)
@@ -928,7 +928,7 @@ CopyCode(void)
if (myread(splfild, (char *) Yap_HeapBase,
(Unsigned(OldHeapTop) - Unsigned(OldHeapBase))) < 0)
return -1;
#endif /* YAPOR || TABLING */
#endif /* YAPOR || (TABLING && !YAP_MEMORY_ALLOC_SCHEME) */
return 1;
}