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

Debugging meta-predicates

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-04-14 18:06:52 +01:00
parent 1aa20e24b7
commit 05a76a2b3f
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
C/stack.c
View File

@ -1004,6 +1004,12 @@ static Term all_cps(choiceptr b_ptr USES_REGS) {
bp[1] = AbsPair(HR); bp[1] = AbsPair(HR);
} }
b_ptr = b_ptr->cp_b; b_ptr = b_ptr->cp_b;
if (!IsVarTerm((CELL)b_ptr) ||
(CELL*)b_ptr < HR ||
(CELL*)b_ptr > LCL0) {
//Yap_Error(SYSTEM_ERROR_INTERNAL, TermNil, "choice-point chain corrupted at %p!!!\n", b_ptr);
break;
}
} }
bp[1] = TermNil; bp[1] = TermNil;
return tf; return tf;

22
pl/debug.yap
View File

@ -314,6 +314,8 @@ be lost.
!, '$$cut_by'(CP). !, '$$cut_by'(CP).
'$do_spy'('$cut_by'(M), _, _, _) :- '$do_spy'('$cut_by'(M), _, _, _) :-
!, '$$cut_by'(M). !, '$$cut_by'(M).
'$do_spy'('$$cut_by'(M), _, _, _) :-
!, '$$cut_by'(M).
'$do_spy'(true, _, _, _) :- !. '$do_spy'(true, _, _, _) :- !.
%'$do_spy'(fail, _, _, _) :- !, fail. %'$do_spy'(fail, _, _, _) :- !, fail.
'$do_spy'(M:G, _, CP, CalledFromDebugger) :- !, '$do_spy'(M:G, _, CP, CalledFromDebugger) :- !,
@ -521,10 +523,6 @@ be lost.
current_prolog_flag( debug, false), current_prolog_flag( debug, false),
!, !,
'$execute_nonstop'(G,M). '$execute_nonstop'(G,M).
'$spycall'(once(G), M, _, _) :-
CP is '$last_choice_pt',
'$debugger_input',
once('$do_spy'(G, M, CP, spy)).
'$spycall'(G, M, _, _) :- '$spycall'(G, M, _, _) :-
'__NB_getval__'('$debug_jump',true, fail), '__NB_getval__'('$debug_jump',true, fail),
!, !,
@ -535,19 +533,22 @@ be lost.
G = G1 G = G1
), ),
'$execute_nonstop'(G1,M). '$execute_nonstop'(G1,M).
'$spycall'(G, M, _, _) :- '$spycall'(G, M, CalledFromDebugger, InRedo) :-
'$is_metapredicate'(G, M), '$is_metapredicate'(G, M),
'$debugger_expand_meta_call'(M:G, [], G10), '$debugger_expand_meta_call'(M:G, [], G10),
G10 \== M:G, G10 \== M:G,
CP is '$last_choice_pt', !,
'$debugger_input', '$debugger_input',
G10 = NM:NG, G10 = NM:NG,
'$do_spy'(NG, NM, CP, spy). '$spycall_f'(NG, NM, CalledFromDebugger, InRedo).
'$spycall'(G, M, _, _) :- '$spycall'(G, M, CalledFromDebugger, InRedo) :-
'$spycall_f'(G, M, CalledFromDebugger, InRedo).
'$spycall_f'(G, M, _, _) :-
( '$is_system_predicate'(G,M) ; '$tabled_predicate'(G,M) ), ( '$is_system_predicate'(G,M) ; '$tabled_predicate'(G,M) ),
!, !,
'$continue_debugging_goal'(yes, '$execute_nonstop'(G,M)). '$continue_debugging_goal'(yes, '$execute_nonstop'(G,M)).
'$spycall'(G, M, CalledFromDebugger, InRedo) :- '$spycall_f'(G, M, CalledFromDebugger, InRedo) :-
'$spycall_expanded'(G, M, CalledFromDebugger, InRedo). '$spycall_expanded'(G, M, CalledFromDebugger, InRedo).
'$spycall_expanded'(G, M, CalledFromDebugger, InRedo) :- '$spycall_expanded'(G, M, CalledFromDebugger, InRedo) :-
@ -1037,13 +1038,12 @@ be lost.
'$debugger_skip_loop_spy2'(CPs,CPs1). '$debugger_skip_loop_spy2'(CPs,CPs1).
'$debugger_skip_loop_spy2'(CPs,CPs). '$debugger_skip_loop_spy2'(CPs,CPs).
'$debugger_expand_meta_call'( G, VL, G2 ) :- '$debugger_expand_meta_call'( G, VL, M:G2 ) :-
'$expand_meta_call'( G, VL, G0 ), '$expand_meta_call'( G, VL, G0 ),
'$yap_strip_module'( G0, M, G1 ), '$yap_strip_module'( G0, M, G1 ),
( (
'$is_system_predicate'(G0,M) -> '$is_system_predicate'(G0,M) ->
'$debugger_process_meta_arguments'(G1, M, G2) '$debugger_process_meta_arguments'(G1, M, G2)
,writeln(d:G2)
; ;
G1 = G2 G1 = G2
). ).

5
pl/signals.yap
View File

@ -215,6 +215,11 @@ order of dispatch.
'$execute0'((Goal,M:G),M0). '$execute0'((Goal,M:G),M0).
% we may be creeping outside and coming back to system mode. % we may be creeping outside and coming back to system mode.
'$start_creep'([_M|G], _) :-
nonvar(G),
G = '$$cut_by'(CP),
!,
'$$cut_by'(CP).
'$start_creep'([M|G], _) :- '$start_creep'([M|G], _) :-
'$is_no_trace'(G, M), !, '$is_no_trace'(G, M), !,
( (