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-12 12:29:00 +00:00
commit 795a958090
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
C/c_interface.c
View File

@ -562,6 +562,7 @@ X_API Term STD_PROTO(YAP_ImportTerm,(char *));
static UInt static UInt
current_arity(void) current_arity(void)
{ {
CACHE_REGS
if (P && PREVOP(P,Osbpp)->opc == Yap_opcode(_call_usercpred)) { if (P && PREVOP(P,Osbpp)->opc == Yap_opcode(_call_usercpred)) {
return PREVOP(P,Osbpp)->u.Osbpp.p->ArityOfPE; return PREVOP(P,Osbpp)->u.Osbpp.p->ArityOfPE;
} else { } else {

3
C/compiler.c
View File

@ -2174,6 +2174,7 @@ typedef struct env_tmp {
static void static void
AssignPerm(PInstr *pc, compiler_struct *cglobs) AssignPerm(PInstr *pc, compiler_struct *cglobs)
{ {
CACHE_REGS
int uses_var; int uses_var;
PInstr *opc = NULL; PInstr *opc = NULL;
#ifdef LOCALISE_VOIDS #ifdef LOCALISE_VOIDS
@ -2407,6 +2408,7 @@ typedef struct {
static void static void
CheckUnsafe(PInstr *pc, compiler_struct *cglobs) CheckUnsafe(PInstr *pc, compiler_struct *cglobs)
{ {
CACHE_REGS
int pending = 0; int pending = 0;
/* say that all variables are yet to initialise */ /* say that all variables are yet to initialise */
@ -2750,6 +2752,7 @@ copy_live_temps_bmap(int max, compiler_struct *cglobs)
static void static void
c_layout(compiler_struct *cglobs) c_layout(compiler_struct *cglobs)
{ {
CACHE_REGS
PInstr *savepc = cglobs->BodyStart->nextInst; PInstr *savepc = cglobs->BodyStart->nextInst;
register Ventry *v = cglobs->vtable; register Ventry *v = cglobs->vtable;
Int *up = cglobs->Uses; Int *up = cglobs->Uses;

1
C/errors.c
View File

@ -33,6 +33,7 @@
void void
Yap_RestartYap ( int flag ) Yap_RestartYap ( int flag )
{ {
CACHE_REGS
#if PUSH_REGS #if PUSH_REGS
restore_absmi_regs(&Yap_standard_regs); restore_absmi_regs(&Yap_standard_regs);
#endif #endif

2
library/dialect/swi/fli/swi.c
View File

@ -1796,7 +1796,7 @@ PL_skip_list(term_t list, term_t tail, size_t *len)
if ( len ) if ( len )
*len = length; *len = length;
if ( tail ) if ( tail )
{ Term t2 = Yap_GetFromSlot(tail); { Term t2 = Yap_GetFromSlot(tail PASS_REGS);
Yap_unify(t2, *t); Yap_unify(t2, *t);
} }