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

fix debugger when tracing over system builtins.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@241 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2001-12-27 22:38:41 +00:00
parent e34262878d
commit eade3e8e44
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
C/dbase.c
View File

@ -606,6 +606,7 @@ static CELL *MkDBTerm(register CELL *pt0, register CELL *pt0_end,
#ifdef COROUTINING #ifdef COROUTINING
Term ConstraintsTerm = TermNil; Term ConstraintsTerm = TermNil;
CELL *ConstraintsBottom = NULL; CELL *ConstraintsBottom = NULL;
CELL *origH = H;
#endif #endif
loop: loop:
@ -932,6 +933,9 @@ static CELL *MkDBTerm(register CELL *pt0, register CELL *pt0_end,
/* we're done */ /* we're done */
*vars_foundp = vars_found; *vars_foundp = vars_found;
UNWIND_CUNIF(); UNWIND_CUNIF();
#ifdef COROUTINING
H = origH;
#endif
return(CodeMax); return(CodeMax);
error: error:
@ -947,6 +951,9 @@ static CELL *MkDBTerm(register CELL *pt0, register CELL *pt0_end,
} }
#endif #endif
UNWIND_CUNIF(); UNWIND_CUNIF();
#ifdef COROUTINING
H = origH;
#endif
return(NULL); return(NULL);
error2: error2:
@ -962,6 +969,9 @@ static CELL *MkDBTerm(register CELL *pt0, register CELL *pt0_end,
} }
#endif #endif
UNWIND_CUNIF(); UNWIND_CUNIF();
#ifdef COROUTINING
H = origH;
#endif
return(NULL); return(NULL);
#if !OS_HANDLES_TR_OVERFLOW #if !OS_HANDLES_TR_OVERFLOW
@ -978,6 +988,9 @@ static CELL *MkDBTerm(register CELL *pt0, register CELL *pt0_end,
} }
#endif #endif
UNWIND_CUNIF(); UNWIND_CUNIF();
#ifdef COROUTINING
H = origH;
#endif
return(NULL); return(NULL);
#endif #endif
} }

2
C/init.c
View File

@ -1036,7 +1036,7 @@ InitYaamRegs(void)
AuxSp = (CELL *)AuxTop; AuxSp = (CELL *)AuxTop;
TR = (tr_fr_ptr)TrailBase; TR = (tr_fr_ptr)TrailBase;
#ifdef COROUTINING #ifdef COROUTINING
H = H0 = ((CELL *) GlobalBase)+2048; H = H0 = ((CELL *) GlobalBase)+ 128*1024; //2048;
#else #else
H = H0 = (CELL *) GlobalBase; H = H0 = (CELL *) GlobalBase;
#endif #endif

10
pl/debug.yap
View File

@ -251,11 +251,7 @@ debugging :-
'$spy'([Mod|G]). '$spy'([Mod|G]).
'$spy'([Module|G]) :- '$spy'([Module|G]) :-
% '$format'(user_error,"$spym(~w,~w)~n",[Module,G]), % '$format'(user_error,"$spym(~w,~w)~n",[Module,G]),
( '$hidden'(G) '$hidden'(G),
;
'$parent_pred'(0,_,_),
'$system_predicate'(G)
),
!, !,
/* called from prolog module */ /* called from prolog module */
'$execute0'(G,Module), '$execute0'(G,Module),
@ -372,7 +368,9 @@ debugging :-
'$undefp'([M|G]) '$undefp'([M|G])
). ).
'$spycalls'(G,M,_) :- '$spycalls'(G,M,_) :-
'$flags'(G,M,F,_), F /\ 8'50000 =\= 0, % Standard and C pred '$system_predicate'(G),
'$flags'(G,M,F,_),
F /\ 0xc00000 =:= 0, % but not meta-predicate or cut transparent
!, !,
'$catch_spycall_stdpred'(G,M), '$catch_spycall_stdpred'(G,M),
(true; (true;