fix debugging
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@157 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
parent
e0ff12da36
commit
8f72bc3c91
|
|
@ -6028,6 +6028,7 @@ absmi(int inp)
|
|||
H += 2;
|
||||
BEGP(pt0);
|
||||
pt0 = (CELL *) (Unsigned(SpyCode) - sizeof(SMALLUNSGN));
|
||||
P_before_spy = PREG;
|
||||
PREG = (yamop *) PredCode(pt0);
|
||||
CACHE_A1();
|
||||
#ifdef LOW_LEVEL_TRACER
|
||||
|
|
|
|||
|
|
@ -2057,7 +2057,6 @@ PredForCode(CODEADDR codeptr, Atom *pat, Int *parity, SMALLUNSGN *pmodule) {
|
|||
}
|
||||
chain = RepAtom(chain->NextOfAE);
|
||||
}
|
||||
/* we didn't find it, must be one of the hidden predicates */
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
|
@ -2164,10 +2163,12 @@ p_clean_up_dead_clauses(void)
|
|||
static Int /* $parent_pred(Module, Name, Arity) */
|
||||
p_parent_pred(void)
|
||||
{
|
||||
/* This predicate is called from the debugger.
|
||||
We assume a sequence of the form a -> b */
|
||||
Atom at;
|
||||
Int arity;
|
||||
SMALLUNSGN module;
|
||||
if (!PredForCode((CODEADDR)CP, &at, &arity, &module)) {
|
||||
if (!PredForCode((CODEADDR)P_before_spy, &at, &arity, &module)) {
|
||||
return(unify(ARG1, MkIntTerm(0)) &&
|
||||
unify(ARG2, MkAtomTerm(AtomMetaCall)) &&
|
||||
unify(ARG3, MkIntTerm(0)));
|
||||
|
|
|
|||
1
C/exec.c
1
C/exec.c
|
|
@ -206,6 +206,7 @@ EnterCreepMode(PredEntry *pen) {
|
|||
PredEntry *PredSpy = RepPredProp(PredProp(a,1));
|
||||
ARG1 = MkPairTerm(Module_Name((CODEADDR)(pen)),ARG1);
|
||||
CreepFlag = CalculateStackGap();
|
||||
P_before_spy = P;
|
||||
WRITE_LOCK(PredSpy->PRWLock);
|
||||
return (FastCallProlog(PredSpy));
|
||||
}
|
||||
|
|
|
|||
6
C/init.c
6
C/init.c
|
|
@ -152,6 +152,12 @@ ext_op attas[attvars_ext+1];
|
|||
|
||||
/************** Debugger support ***************************************/
|
||||
|
||||
/*
|
||||
PREG just before we enter $spy. We use that to find out the clause which
|
||||
was calling the debugged goal.
|
||||
*/
|
||||
yamop *P_before_spy;
|
||||
|
||||
#ifdef DEBUG
|
||||
int output_msg = FALSE;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -119,6 +119,9 @@ extern PredEntry *pred_p;
|
|||
|
||||
extern PredEntry *CurrentPred;
|
||||
|
||||
/* debugger info */
|
||||
extern yamop *P_before_spy;
|
||||
|
||||
/* cdmgr.c */
|
||||
void STD_PROTO(RemoveLogUpdIndex,(Clause *));
|
||||
void STD_PROTO(IPred,(CODEADDR sp));
|
||||
|
|
|
|||
1
TO_DO
1
TO_DO
|
|
@ -6,6 +6,7 @@ BEFORE 4.4:
|
|||
- document new interface functions.
|
||||
- mask when installing.
|
||||
- Yap core dumps under simple configure/make in WIN32
|
||||
- check leash(full). [-user]. a(X) :- call(setof(Z,call(c(Z)),X)). a(X) :- b(X). b(X) :- c(X). c(1). c(2). end_of_file. spy a/1. a(X).
|
||||
|
||||
TO CHECK:
|
||||
- bad register allocation for a(X,Y) :- X is Y+2.3 ?
|
||||
|
|
|
|||
142
pl/debug.yap
142
pl/debug.yap
|
|
@ -242,7 +242,9 @@ debugging :-
|
|||
%'$spy'(G) :- write(user_error,'$spy'(G)), nl, fail.
|
||||
%
|
||||
% handle suspended goals
|
||||
% take care with hidden goals.
|
||||
%
|
||||
% $spy may be called from user code, so be careful.
|
||||
'$spy'(G) :-
|
||||
'$awoken_goals'(LG), !,
|
||||
'$creep',
|
||||
|
|
@ -251,20 +253,38 @@ debugging :-
|
|||
% '$format'(user_error,"$spym(~w,~w)~n",[Module,G]),
|
||||
( '$hidden'(G)
|
||||
;
|
||||
'$system_predicate'(G),
|
||||
'$parent_pred'(0,_,_)
|
||||
'$parent_pred'(O,A1,A2),
|
||||
'$system_predicate'(G)
|
||||
),
|
||||
!,
|
||||
/* called from prolog module */
|
||||
'$creep',
|
||||
'$execute0'(G).
|
||||
'$spy'([Module|G]) :- !,
|
||||
( Module=prolog -> '$spy'(G);
|
||||
'$mod_switch'(Module, '$spy'(G))
|
||||
).
|
||||
'$spy'(true) :- !, '$creep'.
|
||||
'$spy'('$cut_by'(M)) :- !, '$cut_by'(M).
|
||||
'$execute0'(G),
|
||||
'$creep'.
|
||||
'$spy'(G) :-
|
||||
'$do_spy'(G).
|
||||
|
||||
|
||||
'$direct_spy'(G) :-
|
||||
'$awoken_goals'(LG), !,
|
||||
'$creep',
|
||||
'$wake_up_goal'(G, LG).
|
||||
'$direct_spy'([Module|G]) :-
|
||||
'$hidden'(G),
|
||||
!,
|
||||
/* called from prolog module */
|
||||
'$execute0'(G),
|
||||
'$creep'.
|
||||
'$direct_spy'(G) :-
|
||||
'$do_spy'(G).
|
||||
|
||||
|
||||
'$do_spy'([Module|G]) :- !,
|
||||
( Module=prolog -> '$do_spy'(G);
|
||||
'$mod_switch'(Module, '$do_spy'(G))
|
||||
).
|
||||
'$do_spy'(true) :- !, '$creep'.
|
||||
'$do_spy'('$cut_by'(M)) :- !, '$cut_by'(M).
|
||||
'$do_spy'(G) :-
|
||||
% write(user_error,$spy(G)), nl,
|
||||
'$get_value'(debug,1), /* ditto if debug off */
|
||||
'$get_value'(spy_fs,0), /* ditto if fast skipping */
|
||||
|
|
@ -312,7 +332,7 @@ debugging :-
|
|||
'$trace'(redo,G,L), /* inform user_error */
|
||||
fail /* to backtrack to spycalls */
|
||||
).
|
||||
'$spy'(G) :- '$execute0'(G). /* this clause applies when we do not want
|
||||
'do_spy'(G) :- '$execute0'(G). /* this clause applies when we do not want
|
||||
to spy the goal */
|
||||
|
||||
'$cont_creep' :- '$get_value'('$trace',1), '$set_yap_flags'(10,1), fail.
|
||||
|
|
@ -325,25 +345,23 @@ debugging :-
|
|||
%'$spycalls'(G,_) :- write(user_error,'$spycalls'(G)), nl(user_error), fail.
|
||||
'$spycalls'([_|_],_) :- !, fail.
|
||||
'$spycalls'('!'(CP),_) :-
|
||||
'$spycalls'('$call'(!, CP, !),Res).
|
||||
'$call'(!, CP, !).
|
||||
'$spycalls'(Mod:G,Res) :-
|
||||
!,
|
||||
'$mod_switch'(Mod,'$spycalls'(G,Res)).
|
||||
'$spycalls'(repeat,Res) :-
|
||||
!,
|
||||
'$spycalls'('$call'(repeat, _, repeat),Res).
|
||||
repeat.
|
||||
'$spycalls'(fail,Res) :-
|
||||
!,
|
||||
'$spycalls'('$call'(fail, _, fail),Res).
|
||||
fail.
|
||||
'$spycalls'(false,Res) :-
|
||||
!,
|
||||
'$spycalls'('$call'(false, _, false),Res).
|
||||
false.
|
||||
'$spycalls'(true,Res) :-
|
||||
!,
|
||||
'$spycalls'('$call'(true, _, true),Res).
|
||||
!.
|
||||
'$spycalls'(otherwise,Res) :-
|
||||
!,
|
||||
'$spycalls'('$call'(otherwise, _, otherwise),Res).
|
||||
!.
|
||||
'$spycalls'(\+ G,Res) :-
|
||||
!,
|
||||
CP is '$last_choice_pt',
|
||||
|
|
@ -352,10 +370,6 @@ debugging :-
|
|||
!,
|
||||
CP is '$last_choice_pt',
|
||||
'$spycalls'('$call'(not(G), CP, not(G)),Res).
|
||||
'$spycalls'(not(G),Res) :-
|
||||
!,
|
||||
CP is '$last_choice_pt',
|
||||
'$spycalls'('$call'(not(G), CP, not(G)),Res).
|
||||
'$spycalls'(G,Res) :- % undefined predicate
|
||||
'$undefined'(G), !,
|
||||
functor(G,F,N), '$current_module'(M),
|
||||
|
|
@ -638,19 +652,19 @@ debugging :-
|
|||
'$creep_call'(M:G,CP) :- !,
|
||||
'$mod_switch'(M, '$creep_call'(G,CP)),
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|fail]).
|
||||
'$direct_spy'([Module|fail]).
|
||||
'$creep_call'(fail,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|fail]).
|
||||
'$direct_spy'([Module|fail]).
|
||||
'$creep_call'(false,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|false]).
|
||||
'$direct_spy'([Module|false]).
|
||||
'$creep_call'(true,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|true]).
|
||||
'$direct_spy'([Module|true]).
|
||||
'$creep_call'(otherwise,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|otherwise]).
|
||||
'$direct_spy'([Module|otherwise]).
|
||||
'$creep_call'((A,B),CP) :- !,
|
||||
'$creep_call'(A,CP), '$creep_call'(B,CP).
|
||||
'$creep_call'((X->Y; Z),CP) :- !,
|
||||
|
|
@ -661,73 +675,73 @@ debugging :-
|
|||
('$creep_call'(A,CP) ; '$creep_call'(B,CP)).
|
||||
'$creep_call'(atom(A),_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|atom(A)]).
|
||||
'$direct_spy'([Module|atom(A)]).
|
||||
'$creep_call'(atomic(A),_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|atomic(A)]).
|
||||
'$direct_spy'([Module|atomic(A)]).
|
||||
'$creep_call'(integer(A),_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|integer(A)]).
|
||||
'$direct_spy'([Module|integer(A)]).
|
||||
'$creep_call'(nonvar(A),_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|nonvar(A)]).
|
||||
'$direct_spy'([Module|nonvar(A)]).
|
||||
'$creep_call'(var(A),_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|var(A)]).
|
||||
'$direct_spy'([Module|var(A)]).
|
||||
'$creep_call'(number(A),_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|number(A)]).
|
||||
'$direct_spy'([Module|number(A)]).
|
||||
'$creep_call'(prismitive(A),_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|primitive(A)]).
|
||||
'$direct_spy'([Module|primitive(A)]).
|
||||
'$creep_call'(compound(A),_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|compound(A)]).
|
||||
'$direct_spy'([Module|compound(A)]).
|
||||
'$creep_call'(float(A),_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|float(A)]).
|
||||
'$direct_spy'([Module|float(A)]).
|
||||
'$creep_call'(db_reference(A),_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|db_reference(A)]).
|
||||
'$direct_spy'([Module|db_reference(A)]).
|
||||
'$creep_call'(\+ X,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|(\+ X)]).
|
||||
'$direct_spy'([Module|(\+ X)]).
|
||||
'$creep_call'(not X,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|not(X)]).
|
||||
'$direct_spy'([Module|not(X)]).
|
||||
'$creep_call'(X=Y,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|X=Y]).
|
||||
'$direct_spy'([Module|X=Y]).
|
||||
'$creep_call'(X\=Y,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|X\=Y]).
|
||||
'$direct_spy'([Module|X\=Y]).
|
||||
'$creep_call'(X==Y,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|X==Y]).
|
||||
'$direct_spy'([Module|X==Y]).
|
||||
'$creep_call'(X>Y,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|X>Y]).
|
||||
'$direct_spy'([Module|X>Y]).
|
||||
'$creep_call'(X>=Y,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|X>=Y]).
|
||||
'$direct_spy'([Module|X>=Y]).
|
||||
'$creep_call'(X<Y,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|X<Y]).
|
||||
'$direct_spy'([Module|X<Y]).
|
||||
'$creep_call'(X=<Y,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|X=<Y]).
|
||||
'$direct_spy'([Module|X=<Y]).
|
||||
'$creep_call'(X=:=Y,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|X=:=Y]).
|
||||
'$direct_spy'([Module|X=:=Y]).
|
||||
'$creep_call'(X=\=Y,_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|X=\=Y]).
|
||||
'$direct_spy'([Module|X=\=Y]).
|
||||
'$creep_call'(arg(X,Y,Z),_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|arg(X,Y,Z)]).
|
||||
'$direct_spy'([Module|arg(X,Y,Z)]).
|
||||
'$creep_call'(functor(X,Y,Z),_) :- !,
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|functor(X,Y,Z)]).
|
||||
'$direct_spy'([Module|functor(X,Y,Z)]).
|
||||
'$creep_call'((X->Y),CP) :- !,
|
||||
CP1 is '$last_choice_pt',
|
||||
'$creep_call'(X,CP),
|
||||
|
|
@ -735,25 +749,30 @@ debugging :-
|
|||
'$creep_call'(Y,CP).
|
||||
'$creep_call'(!,CP) :- !,
|
||||
'$current_module'(M),
|
||||
'$spy'([M|'!'(CP)]),
|
||||
'$direct_spy'([M|'!'(CP)]),
|
||||
% clean up any garbage left here by the debugger.
|
||||
'$$cut_by'(CP).
|
||||
'$creep_call'('$cut_by'(X),CP) :- !,
|
||||
'$$cut_by'(X).
|
||||
'$creep_call'(repeat,_) :- !,
|
||||
'$current_module'(M),
|
||||
'$spy'([Module|repeat]).
|
||||
'$direct_spy'([Module|repeat]).
|
||||
'$creep_call'([A|B],_) :- !,
|
||||
'$current_module'(M),
|
||||
'$spy'([Module|[A|B]]).
|
||||
'$direct_spy'([Module|[A|B]]).
|
||||
'$creep_call'(A,CP) :-
|
||||
'$undefined'(A),
|
||||
'$undefined'(A), !,
|
||||
'$creep_call_undefined'(A,CP).
|
||||
'$creep_call'(A,CP) :-
|
||||
'$current_module'(Module),
|
||||
'$direct_spy'([Module|A]).
|
||||
|
||||
'$creep_call_undefined'(A,CP) :-
|
||||
functor(A,F,N),
|
||||
'$current_module'(M),
|
||||
'$recorded'($import,$import(S,M,F,N),_), !,
|
||||
'$creep_call'(S:A,CP).
|
||||
'$creep_call'(G,_) :-
|
||||
'$undefined'(G), !,
|
||||
'$creep_call_undefined'(G, _) :-
|
||||
( \+ '$undefined'(user:unknown_predicate_handler(_,_,_)),
|
||||
user:unknown_predicate_handler(G,M,NG) ->
|
||||
'$creep_call'(M:NG) ;
|
||||
|
|
@ -762,11 +781,6 @@ debugging :-
|
|||
'$creep_call'(user:US,_)
|
||||
).
|
||||
|
||||
'$creep_call'(A,CP) :-
|
||||
'$current_module'(Module),
|
||||
'$spy'([Module|A]).
|
||||
|
||||
|
||||
%'$creep'(G) :- $current_module(M),write(user_error,[creep,M,G]),nl(user_error),fail.
|
||||
'$creep'(G) :-
|
||||
'$get_value'('$alarm', true), !,
|
||||
|
|
@ -788,10 +802,10 @@ debugging :-
|
|||
).
|
||||
'$creep'([Module|'$creep_call'(G,CP)]) :- !,
|
||||
( Module=prolog -> '$creep_call'(G,CP);
|
||||
'$mod_switch'(Module, '$creep_call'(G,P) )
|
||||
'$mod_switch'(Module, '$creep_call'(G,CP) )
|
||||
).
|
||||
'$creep'([_|'$leave_creep']) :- !.
|
||||
'$creep'(G) :- '$spy'(G).
|
||||
'$creep'(G) :- '$direct_spy'(G).
|
||||
|
||||
'$trace'(P,'!'(_),L) :- !,
|
||||
'$trace'(P,!,L).
|
||||
|
|
|
|||
Reference in New Issue