diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compilation without threads

Browse Source
This commit is contained in:
Vitor Santos Costa 2012-12-14 22:54:00 +00:00
parent e648d197a8
commit f329b5f06b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C/exec.c
View File

@ -1767,10 +1767,10 @@ Yap_InitYaamRegs( int myworker_id )
Yap_StartSlots( PASS_REGS1 ); Yap_StartSlots( PASS_REGS1 );
REMOTE_GlobalArena(myworker_id) = TermNil; REMOTE_GlobalArena(myworker_id) = TermNil;
h0var = MkVarTerm(); h0var = MkVarTerm();
#ifdef THREADS #if defined(YAPOR) || defined(THREADS)
LOCAL = REMOTE(myworker_id); LOCAL = REMOTE(myworker_id);
#endif /* THREADS */
worker_id = myworker_id; worker_id = myworker_id;
#endif /* THREADS */
#if COROUTINING #if COROUTINING
REMOTE_WokenGoals(myworker_id) = Yap_NewTimedVar(TermNil); REMOTE_WokenGoals(myworker_id) = Yap_NewTimedVar(TermNil);
REMOTE_AttsMutableList(myworker_id) = Yap_NewTimedVar(h0var); REMOTE_AttsMutableList(myworker_id) = Yap_NewTimedVar(h0var);

5
C/heapgc.c
View File

@ -3374,12 +3374,16 @@ compact_heap( USES_REGS1 )
ptr[0] = EndSpecials; ptr[0] = EndSpecials;
dest -= nofcells; dest -= nofcells;
current = ptr; current = ptr;
fprintf(stderr,"%p B\n",current);
int i; for (i=0; i < nofcells;i++)
fprintf(stderr,"%p U\n",current+i);
/* process the functor on a separate cycle */ /* process the functor on a separate cycle */
DEBUG_printf21("%p %ld\n", current-1, (long int)(nofcells+1)); DEBUG_printf21("%p %ld\n", current-1, (long int)(nofcells+1));
continue; continue;
} else { } else {
DEBUG_printf20("%p 1\n", current); DEBUG_printf20("%p 1\n", current);
} }
fprintf(stderr,"%p U\n",current);
#ifdef DEBUG #ifdef DEBUG
found_marked++; found_marked++;
#endif /* DEBUG */ #endif /* DEBUG */
@ -3403,6 +3407,7 @@ compact_heap( USES_REGS1 )
if (in_garbage) if (in_garbage)
start_from[0] = in_garbage; start_from[0] = in_garbage;
fprintf(stderr,"done\n");
#ifdef DEBUG #ifdef DEBUG
if (dest != start_from-1) if (dest != start_from-1)
fprintf(GLOBAL_stderr,"%% Bad Dest (%lu): %p should be %p\n", fprintf(GLOBAL_stderr,"%% Bad Dest (%lu): %p should be %p\n",