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

Cosmetic changes

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-04-13 13:15:30 +01:00
parent 00c58f5572
commit d1a230eb56
2 changed files with 219 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
C/bignum.c
View File

@ -194,7 +194,7 @@ Yap_blob_write_handler_from_slot(Int slot)
{ {
CACHE_REGS CACHE_REGS
CELL blob_info, blob_tag; CELL blob_info, blob_tag;
Term t = Yap_GetFromSlot(slot PASS_REGS); Term t = Yap_GetFromSlot(slot );
CELL *pt = RepAppl(t); CELL *pt = RepAppl(t);
#ifdef DEBUG #ifdef DEBUG
@ -269,7 +269,7 @@ Yap_blob_gc_relocate_handler(Term t)
extern Int Yap_blob_tag_from_slot(Int slot) extern Int Yap_blob_tag_from_slot(Int slot)
{ {
CACHE_REGS CACHE_REGS
Term t = Yap_GetFromSlot(slot PASS_REGS); Term t = Yap_GetFromSlot(slot);
CELL *pt = RepAppl(t); CELL *pt = RepAppl(t);
#ifdef DEBUG #ifdef DEBUG
@ -287,7 +287,7 @@ Yap_blob_info_from_slot(Int slot)
{ {
CACHE_REGS CACHE_REGS
MP_INT *blobp; MP_INT *blobp;
Term t = Yap_GetFromSlot(slot PASS_REGS); Term t = Yap_GetFromSlot(slot);
CELL *pt = RepAppl(t); CELL *pt = RepAppl(t);
#ifdef DEBUG #ifdef DEBUG

43
C/c_interface.c
View File

@ -1,5 +1,4 @@
/************************************************************************* /************************************************************************* *
* *
* YAP Prolog * * YAP Prolog *
* Yap Prolog was developed at NCCUP - Universidade do Porto * * Yap Prolog was developed at NCCUP - Universidade do Porto *
* * * *
@ -869,15 +868,15 @@ YAP_MkPairTerm(Term t1, Term t2)
BACKUP_H(); BACKUP_H();
while (HR > ASP-1024) { while (HR > ASP-1024) {
Int sl1 = Yap_InitSlot(t1 PASS_REGS); Int sl1 = Yap_InitSlot(t1);
Int sl2 = Yap_InitSlot(t2 PASS_REGS); Int sl2 = Yap_InitSlot(t2);
RECOVER_H(); RECOVER_H();
if (!Yap_dogc( 0, NULL PASS_REGS )) { if (!Yap_dogc( 0, NULL PASS_REGS )) {
return TermNil; return TermNil;
} }
BACKUP_H(); BACKUP_H();
t1 = Yap_GetFromSlot(sl1 PASS_REGS); t1 = Yap_GetFromSlot(sl1);
t2 = Yap_GetFromSlot(sl2 PASS_REGS); t2 = Yap_GetFromSlot(sl2);
Yap_RecoverSlots(2, sl2 PASS_REGS); Yap_RecoverSlots(2, sl2 PASS_REGS);
} }
t = MkPairTerm(t1, t2); t = MkPairTerm(t1, t2);
@ -895,13 +894,13 @@ YAP_MkListFromTerms(Term *ta, Int sz)
return TermNil; return TermNil;
BACKUP_H(); BACKUP_H();
while (HR+sz*2 > ASP-1024) { while (HR+sz*2 > ASP-1024) {
Int sl1 = Yap_InitSlot((CELL)ta PASS_REGS); Int sl1 = Yap_InitSlot((CELL)ta);
RECOVER_H(); RECOVER_H();
if (!Yap_dogc( 0, NULL PASS_REGS )) { if (!Yap_dogc( 0, NULL PASS_REGS )) {
return TermNil; return TermNil;
} }
BACKUP_H(); BACKUP_H();
ta = (CELL *)Yap_GetFromSlot(sl1 PASS_REGS); ta = (CELL *)Yap_GetFromSlot(sl1);
Yap_RecoverSlots(1, sl1 PASS_REGS); Yap_RecoverSlots(1, sl1 PASS_REGS);
} }
h = HR; h = HR;
@ -1202,14 +1201,14 @@ X_API Int
YAP_NewSlots(int n) YAP_NewSlots(int n)
{ {
CACHE_REGS CACHE_REGS
return Yap_NewSlots(n PASS_REGS); return Yap_NewSlots(n);
} }
X_API Int X_API Int
YAP_InitSlot(Term t) YAP_InitSlot(Term t)
{ {
CACHE_REGS CACHE_REGS
return Yap_InitSlot(t PASS_REGS); return Yap_InitSlot(t);
} }
X_API int X_API int
@ -1223,7 +1222,7 @@ X_API Term
YAP_GetFromSlot(Int slot) YAP_GetFromSlot(Int slot)
{ {
CACHE_REGS CACHE_REGS
return Yap_GetFromSlot(slot PASS_REGS); return Yap_GetFromSlot(slot);
} }
X_API Term * X_API Term *
@ -1882,7 +1881,7 @@ YAP_ReadBuffer(const char *s, Term *tp)
Int sl; Int sl;
BACKUP_H(); BACKUP_H();
sl = Yap_NewSlots(1 PASS_REGS); sl = Yap_NewSlots(1);
LOCAL_ErrorMessage=NULL; LOCAL_ErrorMessage=NULL;
while (!PL_chars_to_term(s,sl)) { while (!PL_chars_to_term(s,sl)) {
if (LOCAL_ErrorMessage) { if (LOCAL_ErrorMessage) {
@ -1909,7 +1908,7 @@ YAP_ReadBuffer(const char *s, Term *tp)
} }
} else { } else {
// get from slot has an exception // get from slot has an exception
*tp = Yap_GetFromSlot(sl PASS_REGS); *tp = Yap_GetFromSlot(sl);
RECOVER_H(); RECOVER_H();
return 0L; return 0L;
} }
@ -1920,7 +1919,7 @@ YAP_ReadBuffer(const char *s, Term *tp)
} }
} }
RECOVER_H(); RECOVER_H();
return Yap_GetFromSlot(sl PASS_REGS); return Yap_GetFromSlot(sl);
} }
/* copy a string to a buffer */ /* copy a string to a buffer */
@ -2172,7 +2171,7 @@ YAP_AtomToPredInModule(Atom at, Term mod)
static int static int
run_emulator(YAP_dogoalinfo *dgi USES_REGS) run_emulator(USES_REGS1)
{ {
int out; int out;
@ -2183,7 +2182,7 @@ run_emulator(YAP_dogoalinfo *dgi USES_REGS)
} }
X_API bool X_API bool
YAP_EnterGoal(PredEntry *pe, Term *ptr, YAP_dogoalinfo *dgi) YAP_EnterGoal(PredEntry *pe, yhandle_t ptr, YAP_dogoalinfo *dgi)
{ {
CACHE_REGS CACHE_REGS
bool out; bool out;
@ -2195,10 +2194,12 @@ YAP_EnterGoal(PredEntry *pe, Term *ptr, YAP_dogoalinfo *dgi)
dgi->CurSlot = LOCAL_CurSlot; dgi->CurSlot = LOCAL_CurSlot;
// ensure our current ENV receives current P. // ensure our current ENV receives current P.
Yap_PrepGoal(pe->ArityOfPE, ptr, B PASS_REGS); Yap_PrepGoal(pe->ArityOfPE, Yap_AddressFromSlot( ptr ), B PASS_REGS);
P = pe->CodeOfPred; P = pe->CodeOfPred;
__android_log_print(ANDROID_LOG_INFO, "YAP ", "ap=%p %d %x %x args=%x,%x slot=%d",
pe, pe->CodeOfPred->opc, FAILCODE, Deref(ARG1), Deref(ARG2), LOCAL_CurSlot);
dgi->b = LCL0-(CELL*)B; dgi->b = LCL0-(CELL*)B;
out = run_emulator(dgi PASS_REGS); out = run_emulator(PASS_REGS1);
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();
if (out) { if (out) {
dgi->EndSlot = LOCAL_CurSlot; dgi->EndSlot = LOCAL_CurSlot;
@ -2227,7 +2228,7 @@ YAP_RetryGoal(YAP_dogoalinfo *dgi)
/* make sure we didn't leave live slots when we backtrack */ /* make sure we didn't leave live slots when we backtrack */
ASP = (CELL *)B; ASP = (CELL *)B;
LOCAL_CurSlot = dgi->EndSlot; LOCAL_CurSlot = dgi->EndSlot;
out = run_emulator(dgi PASS_REGS); out = run_emulator(PASS_REGS1);
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();
if (out) { if (out) {
LOCAL_CurSlot = dgi->CurSlot; LOCAL_CurSlot = dgi->CurSlot;
@ -3786,7 +3787,7 @@ X_API yhandle_t
YAP_ArgsToSlots(int n) YAP_ArgsToSlots(int n)
{ {
CACHE_REGS CACHE_REGS
return Yap_NewSlots(n PASS_REGS); return Yap_NewSlots(n);
} }
X_API void X_API void
@ -3832,7 +3833,7 @@ X_API int
/* yhandle_t YAP_VarSlotToNumber(yhandle_t) */ /* yhandle_t YAP_VarSlotToNumber(yhandle_t) */
yhandle_t YAP_VarSlotToNumber(yhandle_t s) { yhandle_t YAP_VarSlotToNumber(yhandle_t s) {
CACHE_REGS CACHE_REGS
Term *t = (CELL *)Deref(Yap_GetFromSlot(s PASS_REGS)); Term *t = (CELL *)Deref(Yap_GetFromSlot(s));
if (t < HR) if (t < HR)
return t-H0; return t-H0;
return t-LCL0; return t-LCL0;