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

put chr back to life

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@2265 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2008-06-08 08:05:11 +00:00
parent ea139a37c6
commit 87fcf6233c
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
C/heapgc.c
View File

@ -3456,15 +3456,15 @@ marking_phase(tr_fr_ptr old_TR, CELL *current_env, yamop *curp, CELL *max)
cont_top0 = (cont *)db_vec; cont_top0 = (cont *)db_vec;
#endif #endif
cont_top = (cont *)db_vec; cont_top = (cont *)db_vec;
#ifdef COROUTINING
mark_delays(max);
#endif
/* These two must be marked first so that our trail optimisation won't lose /* These two must be marked first so that our trail optimisation won't lose
values */ values */
mark_regs(old_TR); /* active registers & trail */ mark_regs(old_TR); /* active registers & trail */
/* active environments */ /* active environments */
mark_environments(current_env, EnvSize(curp), EnvBMap((CELL *)curp)); mark_environments(current_env, EnvSize(curp), EnvBMap((CELL *)curp));
mark_choicepoints(B, old_TR, is_gc_very_verbose()); /* choicepoints, and environs */ mark_choicepoints(B, old_TR, is_gc_very_verbose()); /* choicepoints, and environs */
#ifdef COROUTINING
mark_delays(max);
#endif
#ifdef EASY_SHUNTING #ifdef EASY_SHUNTING
set_conditionals(sTR); set_conditionals(sTR);
#endif #endif

2
C/tracer.c
View File

@ -164,8 +164,6 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
LOCK(Yap_heap_regs->low_level_trace_lock); LOCK(Yap_heap_regs->low_level_trace_lock);
sc = Yap_heap_regs; sc = Yap_heap_regs;
vsc_count++; vsc_count++;
if (vsc_count < 67689000LL)
return;
#ifdef THREADS #ifdef THREADS
Yap_heap_regs->thread_handle[worker_id].thread_inst_count++; Yap_heap_regs->thread_handle[worker_id].thread_inst_count++;
#endif #endif

2
library/rbtrees.yap
View File

@ -923,7 +923,7 @@ is_rbtree(t(_,T)) :-
is_rbtree(X,_) :- is_rbtree(X,_) :-
var(X), !, fail. var(X), !, fail.
is_rbtree(T,Goal) :- is_rbtree(T,Goal) :-
catch(rbtree1(T), msg(S,Args), format(S,Args)). catch(rbtree1(T), msg(S,Args), (once(Goal),format(S,Args))).
% %
% This code checks if a tree is ordered and a rbtree % This code checks if a tree is ordered and a rbtree