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

fix compilation problems.

Browse Source
This commit is contained in:
Vitor Santos Costa 2010-02-01 21:44:21 +00:00
parent 3b1ab8cfd9
commit 929995f5a1
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
C/grow.c
View File

@ -221,6 +221,8 @@ MoveLocalAndTrail(void)
#endif #endif
} }
#if defined(THREADS) && defined(YAPOR)
static void static void
CopyLocalAndTrail(void) CopyLocalAndTrail(void)
{ {
@ -244,8 +246,6 @@ IncrementalCopyStacksFromWorker(void)
(size_t) (LOCAL_end_trail_copy - LOCAL_start_trail_copy)); (size_t) (LOCAL_end_trail_copy - LOCAL_start_trail_copy));
} }
#if THREADS
#include "opt.mavar.h" #include "opt.mavar.h"
static CELL static CELL
@ -319,7 +319,8 @@ RestoreTrail(int worker_p)
} }
} }
} }
#endif /* incremental */
#endif /* YAPOR && THREADS */
static void static void
MoveGlobal(void) MoveGlobal(void)
@ -410,12 +411,16 @@ AdjustTrail(int adjusting_heap, int thread_copying)
{ {
volatile tr_fr_ptr ptt, tr_base = (tr_fr_ptr)Yap_TrailBase; volatile tr_fr_ptr ptt, tr_base = (tr_fr_ptr)Yap_TrailBase;
#if defined(YAPOR) && defined(THREADS)
if (thread_copying == STACK_INCREMENTAL_COPYING) { if (thread_copying == STACK_INCREMENTAL_COPYING) {
ptt = (tr_fr_ptr)(LOCAL_end_trail_copy); ptt = (tr_fr_ptr)(LOCAL_end_trail_copy);
tr_base = (tr_fr_ptr)(LOCAL_start_trail_copy); tr_base = (tr_fr_ptr)(LOCAL_start_trail_copy);
} else { } else {
#endif
ptt = TR; ptt = TR;
#if defined(YAPOR) && defined(THREADS)
} }
#endif
/* moving the trail is simple */ /* moving the trail is simple */
while (ptt != tr_base) { while (ptt != tr_base) {
register CELL reg = TrailTerm(ptt-1); register CELL reg = TrailTerm(ptt-1);
@ -467,13 +472,17 @@ AdjustLocal(int thread_copying)
register CELL reg, *pt, *pt_bot; register CELL reg, *pt, *pt_bot;
/* Adjusting the local */ /* Adjusting the local */
#if defined(YAPOR) && defined(THREADS)
if (thread_copying == STACK_INCREMENTAL_COPYING) { if (thread_copying == STACK_INCREMENTAL_COPYING) {
pt = (CELL *) (LOCAL_end_local_copy); pt = (CELL *) (LOCAL_end_local_copy);
pt_bot = (CELL *) (LOCAL_start_local_copy); pt_bot = (CELL *) (LOCAL_start_local_copy);
} else { } else {
#endif
pt = LCL0; pt = LCL0;
pt_bot = ASP; pt_bot = ASP;
#if defined(YAPOR) && defined(THREADS)
} }
#endif
while (pt > pt_bot) { while (pt > pt_bot) {
reg = *--pt; reg = *--pt;
if (IsVarTerm(reg)) { if (IsVarTerm(reg)) {
@ -552,13 +561,17 @@ AdjustGlobal(long sz, int thread_copying)
* to clean the global now that functors are just variables pointing to * to clean the global now that functors are just variables pointing to
* the code * the code
*/ */
#if defined(YAPOR) && defined(THREADS)
if (thread_copying == STACK_INCREMENTAL_COPYING) { if (thread_copying == STACK_INCREMENTAL_COPYING) {
pt = (CELL *) (LOCAL_start_global_copy); pt = (CELL *) (LOCAL_start_global_copy);
pt_max = (CELL *) (LOCAL_end_global_copy); pt_max = (CELL *) (LOCAL_end_global_copy);
} else { } else {
#endif
pt = CurrentDelayTop; pt = CurrentDelayTop;
pt_max = (H-sz/CellSize); pt_max = (H-sz/CellSize);
#if defined(YAPOR) && defined(THREADS)
} }
#endif
pt = CurrentDelayTop; pt = CurrentDelayTop;
while (pt < pt_max) { while (pt < pt_max) {
CELL reg; CELL reg;
@ -1817,7 +1830,7 @@ p_inform_heap_overflows(void)
return(Yap_unify(tn, ARG1) && Yap_unify(tt, ARG2)); return(Yap_unify(tn, ARG1) && Yap_unify(tt, ARG2));
} }
#if THREADS #if defined(THREADS) && defined(YAPOR)
void void
Yap_CopyThreadStacks(int worker_q, int worker_p, int incremental) Yap_CopyThreadStacks(int worker_q, int worker_p, int incremental)
{ {

2
packages/jpl

@ -1 +1 @@
Subproject commit 88983bfdf74cfd89cd509fa2dd8060f2f9761917 Subproject commit d661852f76fe24441d983ef6f4e60ba90cfe17c4