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

fix PASS_REGS

Browse Source
This commit is contained in:
Vítor Santos Costa 2013-05-01 19:27:09 -05:00
parent 17cd9ab3c1
commit 6af394a35e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
C/eval.c
View File

@ -245,12 +245,12 @@ static Int cont_between( USES_REGS1 )
Term tn; Term tn;
Int cmp; Int cmp;
cmp = Yap_acmp(t1, t2); cmp = Yap_acmp(t1, t2 PASS_REGS);
if (cmp == 0) if (cmp == 0)
cut_succeed(); cut_succeed();
t[0] = t1; t[0] = t1;
t[1] = MkIntTerm(1); t[1] = MkIntTerm(1);
tn = Eval(Yap_MkApplTerm(FunctorPlus, 2, t)); tn = Eval(Yap_MkApplTerm(FunctorPlus, 2, t) PASS_REGS);
EXTRA_CBACK_ARG(3,1) = tn; EXTRA_CBACK_ARG(3,1) = tn;
HB = B->cp_h = H; HB = B->cp_h = H;
return TRUE; return TRUE;
@ -336,11 +336,11 @@ init_between( USES_REGS1 )
Yap_Error(TYPE_ERROR_INTEGER, t3, "between/3"); Yap_Error(TYPE_ERROR_INTEGER, t3, "between/3");
return FALSE; return FALSE;
} }
if (Yap_acmp(t3, t1) >= 0 && Yap_acmp(t2,t3) >= 0 && P != FAILCODE) if (Yap_acmp(t3, t1 PASS_REGS) >= 0 && Yap_acmp(t2,t3 PASS_REGS) >= 0 && P != FAILCODE)
cut_succeed(); cut_succeed();
cut_fail(); cut_fail();
} }
cmp = Yap_acmp(t1, t2); cmp = Yap_acmp(t1, t2 PASS_REGS);
if (cmp > 0) cut_fail(); if (cmp > 0) cut_fail();
if (cmp == 0) { if (cmp == 0) {
Yap_unify(ARG3, t1); Yap_unify(ARG3, t1);

3
H/rheap.h
View File

@ -247,6 +247,7 @@ static char SccsId[] = "@(#)rheap.c 1.3 3/15/90";
#define RestoreDBErasedMarker() RestoreDBErasedMarker__( PASS_REGS1 ) #define RestoreDBErasedMarker() RestoreDBErasedMarker__( PASS_REGS1 )
#define RestoreLogDBErasedMarker() RestoreLogDBErasedMarker__( PASS_REGS1 ) #define RestoreLogDBErasedMarker() RestoreLogDBErasedMarker__( PASS_REGS1 )
#define RestoreForeignCode() RestoreForeignCode__( PASS_REGS1 ) #define RestoreForeignCode() RestoreForeignCode__( PASS_REGS1 )
#define RestoreEmptyWakeups() RestoreEmptyWakeups__( PASS_REGS1 )
#define RestoreAtoms() RestoreAtoms__( PASS_REGS1 ) #define RestoreAtoms() RestoreAtoms__( PASS_REGS1 )
#define RestoreWideAtoms() RestoreWideAtoms__( PASS_REGS1 ) #define RestoreWideAtoms() RestoreWideAtoms__( PASS_REGS1 )
#define RestoreSWIBlobs() RestoreSWIBlobs__( PASS_REGS1 ) #define RestoreSWIBlobs() RestoreSWIBlobs__( PASS_REGS1 )
@ -548,7 +549,7 @@ RestoreDBTerm(DBTerm *dbr, int attachments USES_REGS)
/* Restoring the heap */ /* Restoring the heap */
static void static void
RestoreEmptyWakeups(void) RestoreEmptyWakeups__( USES_REGS1 )
{ {
int i; int i;
for (i=0; i < MaxEmptyWakeups; i++) { for (i=0; i < MaxEmptyWakeups; i++) {