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

slots and recover ENV in failure

Browse Source
This commit is contained in:
Vitor Santos Costa 2013-01-18 14:30:35 +00:00
parent 8758b6de5a
commit 85acf5c4ea
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
C/c_interface.c
View File

@ -1663,6 +1663,10 @@ YAP_Execute(PredEntry *pe, CPredicate exec_code)
{ {
CACHE_REGS CACHE_REGS
Int ret; Int ret;
// Term omod = CurrentModule;
//if (pe->PredFlags & CArgsPredFlag) {
// CurrentModule = pe->ModuleOfPred;
//}
if (pe->PredFlags & SWIEnvPredFlag) { if (pe->PredFlags & SWIEnvPredFlag) {
CPredicateV codev = (CPredicateV)exec_code; CPredicateV codev = (CPredicateV)exec_code;
struct foreign_context ctx; struct foreign_context ctx;
@ -1683,6 +1687,7 @@ YAP_Execute(PredEntry *pe, CPredicate exec_code)
ret = (exec_code)( PASS_REGS1 ); ret = (exec_code)( PASS_REGS1 );
} }
PP = NULL; PP = NULL;
//CurrentModule = omod;
if (!ret) { if (!ret) {
Term t; Term t;
@ -2429,6 +2434,8 @@ YAP_RunGoal(Term t)
Yap_StartSlots( PASS_REGS1 ); Yap_StartSlots( PASS_REGS1 );
} else { } else {
ENV = B->cp_env; ENV = B->cp_env;
ENV = (CELL *)ENV[E_E];
CP = old_CP;
B = B->cp_b; B = B->cp_b;
LOCAL_AllowRestart = FALSE; LOCAL_AllowRestart = FALSE;
} }
@ -2567,7 +2574,6 @@ YAP_RestartGoal(void)
if (out == FALSE) { if (out == FALSE) {
/* cleanup */ /* cleanup */
Yap_trust_last(); Yap_trust_last();
Yap_CloseSlots( PASS_REGS1 );
LOCAL_AllowRestart = FALSE; LOCAL_AllowRestart = FALSE;
} }
} else { } else {