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

Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3

Browse Source
This commit is contained in:
Vítor Santos Costa 2012-02-14 18:58:29 +00:00
commit c602140953
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OPTYap/tab.tries.c
View File

@ -1068,7 +1068,7 @@ sg_fr_ptr subgoal_search(yamop *preg, CELL **Yaddr) {
RESET_VARIABLE(t); RESET_VARIABLE(t);
} }
sg_fr_ptr *sg_fr_end = get_insert_subgoal_frame_addr(current_sg_node PASS_REGS); volatile sg_fr_ptr *sg_fr_end = get_insert_subgoal_frame_addr(current_sg_node PASS_REGS);
#ifndef THREADS #ifndef THREADS
LOCK_SUBGOAL_NODE(current_sg_node); LOCK_SUBGOAL_NODE(current_sg_node);
#endif /* !THREADS */ #endif /* !THREADS */
@ -1087,7 +1087,7 @@ sg_fr_ptr subgoal_search(yamop *preg, CELL **Yaddr) {
TAG_AS_SUBGOAL_LEAF_NODE(current_sg_node); TAG_AS_SUBGOAL_LEAF_NODE(current_sg_node);
UNLOCK_SUBGOAL_NODE(current_sg_node); UNLOCK_SUBGOAL_NODE(current_sg_node);
#else /* THREADS_FULL_SHARING || THREADS_CONSUMER_SHARING */ #else /* THREADS_FULL_SHARING || THREADS_CONSUMER_SHARING */
sg_ent_ptr sg_ent = (sg_ent_ptr) TrNode_sg_ent(current_sg_node); sg_ent_ptr sg_ent = (sg_ent_ptr) UNTAG_SUBGOAL_NODE(TrNode_sg_ent(current_sg_node));
new_subgoal_frame(sg_fr, sg_ent); new_subgoal_frame(sg_fr, sg_ent);
#ifdef THREADS_CONSUMER_SHARING #ifdef THREADS_CONSUMER_SHARING
SgFr_state(sg_fr) = ready_external; SgFr_state(sg_fr) = ready_external;

7
os/pl-write.c
View File

@ -168,7 +168,9 @@ format_float(double f, char *buf)
char * char *
varName(term_t t, char *name) varName(term_t t, char *name)
{ CELL *adr = (CELL *)Yap_GetFromSlot(t); {
CACHE_REGS
CELL *adr = (CELL *)Yap_GetFromSlot(t PASS_REGS);
if (IsAttVar(adr)) { if (IsAttVar(adr)) {
Ssprintf(name, "_D%ld", (CELL)adr - (CELL)H0); Ssprintf(name, "_D%ld", (CELL)adr - (CELL)H0);
@ -183,6 +185,7 @@ varName(term_t t, char *name)
static bool static bool
writeTerm(term_t t, int prec, write_options *options) writeTerm(term_t t, int prec, write_options *options)
{ {
CACHE_REGS
UInt yap_flag = Use_SWI_Stream_f; UInt yap_flag = Use_SWI_Stream_f;
int flags = options->flags; int flags = options->flags;
Term old_module; Term old_module;
@ -207,7 +210,7 @@ writeTerm(term_t t, int prec, write_options *options)
yap_flag |= Blob_Portray_f; yap_flag |= Blob_Portray_f;
old_module = CurrentModule; old_module = CurrentModule;
CurrentModule = options->module; CurrentModule = options->module;
Yap_plwrite(Yap_GetFromSlot(t), options->out, options->max_depth, yap_flag, prec); Yap_plwrite(Yap_GetFromSlot(t PASS_REGS), options->out, options->max_depth, yap_flag, prec);
CurrentModule = old_module; CurrentModule = old_module;
return TRUE; return TRUE;
} }