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

SWI-portability changes

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@2088 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2008-02-12 17:03:59 +00:00
parent 5b2cc724f3
commit af0fb4f4d9
59 changed files with 4541 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
C/exec.c
View File

@@ -224,6 +224,8 @@ do_execute(Term t, Term mod)
else
XREGS[i] = d0;
#else
XREGS[i] = *pt++;
#endif
}
@@ -1795,18 +1797,30 @@ p_restore_regs2(void)
static Int
p_clean_ifcp(void) {
Term t = Deref(ARG1);
if (IsVarTerm(t)) {
Yap_Error(INSTANTIATION_ERROR, t, "cut_at/1");
return FALSE;
}
if (!IsIntegerTerm(t)) {
Yap_Error(TYPE_ERROR_INTEGER, t, "cut_at/1");
return FALSE;
}
#if SBA
choiceptr pt0 = (choiceptr)IntegerOfTerm(Deref(ARG1));
choiceptr pt0 = (choiceptr)IntegerOfTerm(t);
#else
choiceptr pt0 = (choiceptr)(LCL0-IntOfTerm(Deref(ARG1)));
choiceptr pt0 = cp_from_integer(t);
#endif
if (pt0 == B) {
if (pt0 < B) {
/* this should never happen */
return TRUE;
} else if (pt0 == B) {
B = B->cp_b;
HB = B->cp_h;
} else {
pt0->cp_ap = (yamop *)TRUSTFAILCODE;
}
return(TRUE);
return TRUE;
}
@@ -2059,8 +2073,10 @@ Yap_InitExecFs(void)
Yap_InitCPred("$execute_clause", 4, p_execute_clause, HiddenPredFlag);
CurrentModule = HACKS_MODULE;
Yap_InitCPred("current_choice_point", 1, p_save_cp, HiddenPredFlag);
Yap_InitCPred("current_choicepoint", 1, p_save_cp, HiddenPredFlag);
Yap_InitCPred("env_choice_point", 1, p_save_env_b, HiddenPredFlag);
Yap_InitCPred("trail_suspension_marker", 1, p_trail_suspension_marker, HiddenPredFlag);
Yap_InitCPred("cut_at", 1, p_clean_ifcp, SafePredFlag);
CurrentModule = cm;
Yap_InitCPred("$pred_goal_expansion_on", 0, p_pred_goal_expansion_on, SafePredFlag|HiddenPredFlag);
Yap_InitCPred("$restore_regs", 1, p_restore_regs, SafePredFlag|HiddenPredFlag);