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

debugging support

Browse Source
This commit is contained in:
Vitor Santos Costa 2017-09-17 07:51:59 +01:00
parent 65126b1b54
commit 35e12bd9c4
1 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
C/stack.c
View File

@ -1,22 +1,22 @@
/************************************************************************* /*************************************************************************
* * * *
* YAP Prolog * * YAP Prolog *
* * * *
* Yap Prolog was developed at NCCUP - Universidade do Porto * * Yap Prolog was developed at NCCUP - Universidade do Porto *
* * * *
* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997 * * Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997 *
* * * *
************************************************************************** **************************************************************************
* * * *
* File: stack.c * * File: stack.c *
* comments: Stack Introspection * * comments: Stack Introspection *
* * * *
* Last rev: $Date: 2008-07-22 23:34:44 $,$Author: vsc $ * * Last rev: $Date: 2008-07-22 23:34:44 $,$Author: vsc $ *
* $Log: not supported by cvs2svn $ * * $Log: not supported by cvs2svn $ *
* Revision 1.230 2008/06/02 17:20:28 vsc * * Revision 1.230 2008/06/02 17:20:28 vsc *
* * * *
* * * *
*************************************************************************/ *************************************************************************/
/** /**
* @file stack.c * @file stack.c
@ -29,8 +29,8 @@
*/ */
#include "Yap.h" #include "Yap.h"
#include "clause.h"
#include "YapEval.h" #include "YapEval.h"
#include "clause.h"
#include "iopreds.h" #include "iopreds.h"
#include "tracer.h" #include "tracer.h"
#include "yapio.h" #include "yapio.h"
@ -163,13 +163,7 @@ static PredEntry *PredForChoicePt(yamop *p_code, op_numbers *opn) {
/* compile error --> return ENV_ToP(gc_B->cp_cp); */ /* compile error --> return ENV_ToP(gc_B->cp_cp); */
#endif /* TABLING */ #endif /* TABLING */
case _or_else: case _or_else:
if (p_code == p_code->y_u.Osblp.l) { return p_code->y_u.Osblp.p0;
/* repeat */
Atom at = AtomRepeatSpace;
return RepPredProp(PredPropByAtom(at, PROLOG_MODULE));
} else {
return p_code->y_u.Osblp.p0;
}
break; break;
case _or_last: case _or_last:
#ifdef YAPOR #ifdef YAPOR
@ -779,7 +773,8 @@ static PredEntry *found_expand(yamop *pc, void **startp,
return pp; return pp;
} }
static PredEntry *found_ystop(yamop *pc, int clause_code, void **startp, void **endp, PredEntry *pp USES_REGS) { static PredEntry *found_ystop(yamop *pc, int clause_code, void **startp,
void **endp, PredEntry *pp USES_REGS) {
if (pc == YESCODE) { if (pc == YESCODE) {
pp = RepPredProp(Yap_GetPredPropByAtom(AtomTrue, CurrentModule)); pp = RepPredProp(Yap_GetPredPropByAtom(AtomTrue, CurrentModule));
if (startp) if (startp)
@ -787,17 +782,17 @@ static PredEntry *found_ystop(yamop *pc, int clause_code, void **startp, void **
if (endp) if (endp)
*endp = (CODEADDR)YESCODE + (CELL)(NEXTOP((yamop *)NULL, e)); *endp = (CODEADDR)YESCODE + (CELL)(NEXTOP((yamop *)NULL, e));
return pp; return pp;
}
if (!pp) {
yamop *o = PREVOP(pc,Osbpp);
if (o->opc ==Yap_opcode(_execute_cpred)) {
pp = o->y_u.Osbpp.p0;
} else {
/* must be an index */
PredEntry **pep = (PredEntry **)pc->y_u.l.l;
pp = pep[-1];
} }
} if (!pp) {
yamop *o = PREVOP(pc, Osbpp);
if (o->opc == Yap_opcode(_execute_cpred)) {
pp = o->y_u.Osbpp.p0;
} else {
/* must be an index */
PredEntry **pep = (PredEntry **)pc->y_u.l.l;
pp = pep[-1];
}
}
if (pp->PredFlags & LogUpdatePredFlag) { if (pp->PredFlags & LogUpdatePredFlag) {
if (clause_code) { if (clause_code) {
LogUpdClause *cl = ClauseCodeToLogUpdClause(pc->y_u.l.l); LogUpdClause *cl = ClauseCodeToLogUpdClause(pc->y_u.l.l);
@ -1159,7 +1154,7 @@ bool Yap_find_prolog_culprit(USES_REGS1) {
break; break;
} }
pe = EnvPreg(curCP); pe = EnvPreg(curCP);
if (pe==NULL) { if (pe == NULL) {
pe = PredMetaCall; pe = PredMetaCall;
} }
if (pe->ModuleOfPred) if (pe->ModuleOfPred)
@ -1634,7 +1629,7 @@ static Int p_choicepoint_info(USES_REGS1) {
} }
static Int /* $parent_pred(Module, Name, Arity) */ static Int /* $parent_pred(Module, Name, Arity) */
parent_pred(USES_REGS1) { parent_pred(USES_REGS1) {
/* This predicate is called from the debugger. /* This predicate is called from the debugger.
We assume a sequence of the form a -> b */ We assume a sequence of the form a -> b */
Atom at; Atom at;
@ -2045,7 +2040,7 @@ Term Yap_pc_location(yamop *pc, choiceptr b_ptr, CELL *env) {
if (pe != NULL if (pe != NULL
// pe->ModuleOfPred != PROLOG_MODULE && // pe->ModuleOfPred != PROLOG_MODULE &&
// &&!(pe->PredFlags & HiddenPredFlag) // &&!(pe->PredFlags & HiddenPredFlag)
) { ) {
return build_bug_location(codeptr, pe); return build_bug_location(codeptr, pe);
} }
return TermNil; return TermNil;
@ -2058,7 +2053,8 @@ Term Yap_env_location(yamop *cp, choiceptr b_ptr, CELL *env, Int ignore_first) {
PredEntry *pe = EnvPreg(cp); PredEntry *pe = EnvPreg(cp);
if (pe == PredTrue) if (pe == PredTrue)
return TermNil; return TermNil;
if (ignore_first <= 0 && pe if (ignore_first <= 0 &&
pe
// pe->ModuleOfPred != PROLOG_MODULE &&s // pe->ModuleOfPred != PROLOG_MODULE &&s
&& !(pe->PredFlags & HiddenPredFlag)) { && !(pe->PredFlags & HiddenPredFlag)) {
return build_bug_location(cp, pe); return build_bug_location(cp, pe);