yapor stuff

This commit is contained in:
Vitor Santos Costa 2013-10-04 18:18:57 +01:00
parent 30b567ae66
commit f3cefdf895
3 changed files with 6 additions and 6 deletions

View File

@ -3053,7 +3053,7 @@ YAP_Init(YAP_init_args *yap_init)
In the SBA we cannot just happily inherit registers In the SBA we cannot just happily inherit registers
from the other workers from the other workers
*/ */
Yap_InitYaamRegs( 0 ); Yap_InitYaamRegs( worker_id );
#endif /* YAPOR_COPY || YAPOR_SBA */ #endif /* YAPOR_COPY || YAPOR_SBA */
#ifndef YAPOR_THREADS #ifndef YAPOR_THREADS
Yap_InitPreAllocCodeSpace( 0 ); Yap_InitPreAllocCodeSpace( 0 );

View File

@ -4263,6 +4263,10 @@ Yap_gc(Int predarity, CELL *current_env, yamop *nextop)
{ {
CACHE_REGS CACHE_REGS
int res; int res;
#if YAPOR_COPY
fprintf(stderr, "\n\n***** Trying to call the garbage collector in YAPOR/copying ****\n\n\n");
exit( 1 );
#endif
LOCAL_PrologMode |= GCMode; LOCAL_PrologMode |= GCMode;
res=call_gc(4096, predarity, current_env, nextop PASS_REGS); res=call_gc(4096, predarity, current_env, nextop PASS_REGS);
LeaveGCMode( PASS_REGS1 ); LeaveGCMode( PASS_REGS1 );

View File

@ -887,11 +887,7 @@ InitStdPreds(void)
Yap_InitCPreds(); Yap_InitCPreds();
Yap_InitBackCPreds(); Yap_InitBackCPreds();
BACKUP_MACHINE_REGS(); BACKUP_MACHINE_REGS();
#if YAPOR
Yap_InitYaamRegs( worker_id );
#else
Yap_InitYaamRegs( 0 ); Yap_InitYaamRegs( 0 );
#endif
#if HAVE_MPE #if HAVE_MPE
Yap_InitMPE (); Yap_InitMPE ();
@ -1322,7 +1318,7 @@ Yap_InitWorkspace(UInt Heap, UInt Stack, UInt Trail, UInt Atts, UInt max_table_s
else else
Atts = AdjustPageSize(Atts * K); Atts = AdjustPageSize(Atts * K);
Atts /= (K); Atts /= (K);
#if defined(YAPOR) || defined(THREADS) #if defined(THREADS) || defined(YAPOR)
worker_id = 0; worker_id = 0;
#endif /* YAPOR || THREADS */ #endif /* YAPOR || THREADS */
#ifdef YAPOR #ifdef YAPOR