debugger

C/exec.c

@@ -37,12 +37,28 @@ static char SccsId[] = "@(#)cdmgr.c	1.1 05/02/98";
 #include "yapio.h"
 
 static bool CallPredicate(PredEntry *, choiceptr, yamop *CACHE_TYPE);
+
 // must hold thread worker comm lock at call.
 static bool EnterCreepMode(Term, Term CACHE_TYPE);
+
 static Int current_choice_point(USES_REGS1);
+
 static Int execute(USES_REGS1);
+
 static Int execute0(USES_REGS1);
 
+static bool should_creep() {
+    return
+    !(LOCAL_PrologMode & (AbortMode | InterruptMode | SystemMode|BootMode))
+    &&
+    LOCAL_debugger_state[DEBUG_DEBUGGER_MAY_BE_CALLED] == TermTrue
+    &&
+    (
+            (Yap_has_a_signal() && !LOCAL_InterruptsDisabled) ||
+            LOCAL_debugger_state[DEBUG_CREEP_LEAP_OR_ZIP] == TermUserCreep ||
+            LOCAL_debugger_state[DEBUG_CREEP_LEAP_OR_ZIP] == TermLeap);
+
+}
 static Term cp_as_integer(choiceptr cp USES_REGS) {
     return (MkIntegerTerm(LCL0 - (CELL *) cp));
 }
@@ -358,8 +374,7 @@ inline static bool do_execute(Term t, Term mod USES_REGS) {
     t = Yap_YapStripModule(t, &mod);
     /* first do predicate expansion, even before you process signals.
        This way you don't get to spy goal_expansion(). */
-  if (Yap_has_a_signal() && !LOCAL_InterruptsDisabled &&
+    if (   should_creep() ) {
-      !(LOCAL_PrologMode & (AbortMode | InterruptMode | SystemMode))) {
         return EnterCreepMode(t, mod PASS_REGS);
     }
     if (IsVarTerm(t) || IsVarTerm(mod)) {
@@ -375,9 +390,9 @@ inline static bool do_execute(Term t, Term mod USES_REGS) {
         if (f == FunctorComma && false) {
             Term t2 = ArgOfTerm(2, t);
             if (IsVarTerm(t2))
-        return CallMetaCall(t0, mod0 PASS_REGS);
+                return CallMetaCall(t, mod PASS_REGS);
             if (1 || !CommaCall(t2, mod))
-        return CallMetaCall(t0, mod0 PASS_REGS);
+                return CallMetaCall(t, mod PASS_REGS);
             Term t1 = ArgOfTerm(1, t);
 
             t = t1;
@@ -400,7 +415,7 @@ inline static bool do_execute(Term t, Term mod USES_REGS) {
            otherwise I would dereference the argument and
            might skip a svar */
         if (pen->PredFlags & (MetaPredFlag | UndefPredFlag | SpiedPredFlag)) {
-      return CallMetaCall(t0, mod0 PASS_REGS);
+            return CallMetaCall(t, mod PASS_REGS);
         }
         pt = RepAppl(t) + 1;
         for (i = 1; i <= arity; i++) {
@@ -431,7 +446,7 @@ inline static bool do_execute(Term t, Term mod USES_REGS) {
         pe = RepPredProp(PredPropByAtom(a, mod));
         return (CallPredicate(pe, B, pe->CodeOfPred PASS_REGS));
     }
-  return CallMetaCall(t0, mod0 PASS_REGS);
+    return CallMetaCall(t, mod PASS_REGS);
 }
 
 static Term copy_execn_to_heap(Functor f, CELL *pt, unsigned int n,
@@ -476,7 +491,7 @@ inline static bool do_execute_n(Term t, Term mod, unsigned int n USES_REGS) {
     unsigned int i, arity;
     int j = -n;
     Term t0 = t, mod0 = mod;
-
+t = Yap_YapStripModule(t, &mod);
     restart_exec:
     if (IsVarTerm(t)) {
         return CallError(INSTANTIATION_ERROR, t0, mod0 PASS_REGS);
@@ -555,8 +570,7 @@ static bool EnterCreepMode(Term t, Term mod USES_REGS) {
     PredEntry *PredCreep;
 
     if (Yap_get_signal(YAP_CDOVF_SIGNAL)) {
-    ARG1 = t;
+        if (!Yap_locked_growheap(false, 0, NULL)) {
-    if (!Yap_locked_growheap(FALSE, 0, NULL)) {
             Yap_ThrowError(RESOURCE_ERROR_HEAP, TermNil,
                            "YAP failed to grow heap at meta-call");
         }
@@ -564,17 +578,13 @@ static bool EnterCreepMode(Term t, Term mod USES_REGS) {
             return do_execute(ARG1, mod PASS_REGS);
         }
     }
-  PredCreep = RepPredProp(PredPropByFunc(FunctorCreep, 1));
+    PredCreep = RepPredProp(PredPropByFunc(FunctorCreep, 4));
     PP = PredCreep;
-  if (!IsVarTerm(t) && IsApplTerm(t) && FunctorOfTerm(t) == FunctorModule) {
+    if (IsVarTerm(t)) { return false; }
-    ARG1 = MkPairTerm(ArgOfTerm(1, t), ArgOfTerm(2, t));
+        ARG2 = mod;
-  } else {
+        ARG1 = t;
-    if (mod) {
+ARG3 = MkVarTerm();
-      ARG1 = MkPairTerm(mod, t);
+ARG4 = MkVarTerm();
-    } else {
-      ARG1 = MkPairTerm(TermProlog, t);
-    }
-  }
   CalculateStackGap(PASS_REGS1);
     P_before_spy = P;
     return CallPredicate(PredCreep, B, PredCreep->CodeOfPred PASS_REGS);
@@ -1199,7 +1209,7 @@ static Int execute0(USES_REGS1) { /* '$execute0'(Goal,Mod)	 */
     unsigned int arity;
     Prop pe;
 
-  if (Yap_has_a_signal() && !LOCAL_InterruptsDisabled) {
+    if (should_creep()) {
         return EnterCreepMode(t, mod PASS_REGS);
     }
     t = Yap_YapStripModule(t, &mod);
@@ -1322,7 +1332,7 @@ static Int creep_step(USES_REGS1) { /* '$execute_nonstop'(Goal,Mod)
     /*	N = arity; */
     /* call may not define new system predicates!! */
     if (RepPredProp(pe)->PredFlags & SpiedPredFlag) {
-    if (!LOCAL_InterruptsDisabled && Yap_get_signal(YAP_CREEP_SIGNAL)) {
+        if (should_creep()) {
             Yap_signal(YAP_CREEP_SIGNAL);
         }
 #if defined(YAPOR) || defined(THREADS)
@@ -1337,9 +1347,7 @@ static Int creep_step(USES_REGS1) { /* '$execute_nonstop'(Goal,Mod)
         rc = CallPredicate(RepPredProp(pe), B,
                            RepPredProp(pe)->CodeOfPred PASS_REGS);
     }
-  if (!LOCAL_InterruptsDisabled &&
+            if (should_creep()) {
-      (!(RepPredProp(pe)->PredFlags & (AsmPredFlag | CPredFlag)) ||
-       RepPredProp(pe)->OpcodeOfPred == Yap_opcode(_call_bfunc_xx))) {
         Yap_signal(YAP_CREEP_SIGNAL);
     }
     return rc;
@@ -1405,7 +1413,7 @@ static Int execute_nonstop(USES_REGS1) {
     /*	N = arity; */
     /* call may not define new system predicates!! */
     if (RepPredProp(pe)->PredFlags & SpiedPredFlag) {
-    if (!LOCAL_InterruptsDisabled && Yap_get_signal(YAP_CREEP_SIGNAL)) {
+        if (should_creep()) {
             Yap_signal(YAP_CREEP_SIGNAL);
         }
 #if defined(YAPOR) || defined(THREADS)
@@ -1417,9 +1425,7 @@ static Int execute_nonstop(USES_REGS1) {
         return CallPredicate(RepPredProp(pe), B,
                              RepPredProp(pe)->cs.p_code.TrueCodeOfPred PASS_REGS);
     } else {
-    if (Yap_get_signal(YAP_CREEP_SIGNAL) && !LOCAL_InterruptsDisabled &&
+        if (should_creep()) {
-        (!(RepPredProp(pe)->PredFlags & (AsmPredFlag | CPredFlag)) ||
-         RepPredProp(pe)->OpcodeOfPred == Yap_opcode(_call_bfunc_xx))) {
             Yap_signal(YAP_CREEP_SIGNAL);
         }
         return CallPredicate(RepPredProp(pe), B,
@@ -1499,6 +1505,7 @@ static Int execute_10(USES_REGS1) { /* '$execute_10'(Goal)	 */
 }
 
 #ifdef DEPTH_LIMIT
+
 static Int execute_depth_limit(USES_REGS1) {
     Term d = Deref(ARG2);
     if (IsVarTerm(d)) {
@@ -1516,6 +1523,7 @@ static Int execute_depth_limit(USES_REGS1) {
     }
     return execute(PASS_REGS1);
 }
+
 #endif
 
 static bool exec_absmi(bool top, yap_reset_t reset_mode USES_REGS) {
@@ -1551,7 +1559,8 @@ static bool exec_absmi(bool top, yap_reset_t reset_mode USES_REGS) {
                 LOCAL_PrologMode = UserMode;
                 Yap_CloseSlots(sls);
                 P = (yamop *) FAILCODE;
-    } break;
+            }
+                break;
             case 2: {
                 // LOCAL_ActiveError = err_info;
                 /* arithmetic exception */
@@ -1567,7 +1576,8 @@ static bool exec_absmi(bool top, yap_reset_t reset_mode USES_REGS) {
                 LOCAL_PrologMode = UserMode;
                 LOCAL_DoingUndefp = false;
                 Yap_CloseSlots(sls);
-    } break;
+            }
+                break;
             case 3: { /* saved state */
                 // LOCAL_ActiveError = err_info;
                 pop_text_stack(i + 1);
@@ -2240,6 +2250,7 @@ static Int generate_pred_info(USES_REGS1) {
     return TRUE;
 }
 
+
 void Yap_InitYaamRegs(int myworker_id, bool full_reset) {
     Term h0var;
     //  getchar();
@@ -2354,6 +2365,98 @@ int Yap_dogc(int extra_args, Term *tp USES_REGS) {
     return TRUE;
 }
 
+static Int get_debugger_state(USES_REGS1) {
+    const char *s = RepAtom(AtomOfTerm(Deref(ARG1)))->StrOfAE;
+    if (!strcmp(s, "creep")) {
+        return Yap_unify(ARG2, LOCAL_debugger_state[DEBUG_CREEP_LEAP_OR_ZIP]);
+    }
+    if (!strcmp(s, "goal_number")) {
+        return Yap_unify(ARG2, LOCAL_debugger_state[DEBUG_GOAL_NUMBER]);
+    }
+    if (!strcmp(s, "spy")) {
+        return Yap_unify(ARG2, LOCAL_debugger_state[DEBUG_SPY]);
+    }
+    if (!strcmp(s, "trace")) {
+        return Yap_unify(ARG2, LOCAL_debugger_state[DEBUG_TRACE_MODE]);
+    }
+    if (!strcmp(s, "debug")) {
+        return Yap_unify(ARG2, LOCAL_debugger_state[DEBUG_TRACE_MODE]);
+    }
+    return false;
+}
+
+static Int set_debugger_state(USES_REGS1) {
+    const char *s = RepAtom(AtomOfTerm(Deref(ARG1)))->StrOfAE;
+    if (!strcmp(s, "creep")) {
+        LOCAL_debugger_state[DEBUG_CREEP_LEAP_OR_ZIP] = Deref(ARG2);
+        return true;
+    }
+    if (!strcmp(s, "goal_number")) {
+        LOCAL_debugger_state[DEBUG_GOAL_NUMBER] = Deref(ARG2);
+        return true;
+    }
+    if (!strcmp(s, "spy")) {
+        LOCAL_debugger_state[DEBUG_SPY] = Deref(ARG2);
+        return true;
+    }
+    if (!strcmp(s, "trace")) {
+        LOCAL_debugger_state[DEBUG_TRACE_MODE] = Deref(ARG2);
+        return true;
+    }
+    if (!strcmp(s, "debug")) {
+        LOCAL_debugger_state[DEBUG_DEBUGGER_MAY_BE_CALLED] = Deref(ARG2);
+        return true;
+    }
+    return false;
+}
+
+
+static Int set_debugger_state4(USES_REGS1) {
+    Term t1 = Deref(ARG1);
+    if (!IsVarTerm(t1)) {
+        LOCAL_debugger_state[DEBUG_CREEP_LEAP_OR_ZIP] = t1;
+    }
+    t1 = Deref(ARG2);
+    if (!IsVarTerm(t1)) {
+        LOCAL_debugger_state[DEBUG_GOAL_NUMBER] = t1;
+    }
+    t1 = Deref(ARG3);
+    if (!IsVarTerm(t1)) {
+        LOCAL_debugger_state[DEBUG_SPY] = t1;
+    }
+    t1 = Deref(ARG4);
+    if (!IsVarTerm(t1)) {
+        LOCAL_debugger_state[DEBUG_TRACE_MODE] = t1;
+    }
+    return true;
+}
+
+
+static Int get_debugger_state4(USES_REGS1) {
+    Term t1 = Deref(ARG1);
+    if (!IsVarTerm(t1)) {
+        if (!Yap_unify(LOCAL_debugger_state[DEBUG_CREEP_LEAP_OR_ZIP], t1))
+            return false;
+    }
+    t1 = Deref(ARG2);
+    if (!IsVarTerm(t1)) {
+        if (!Yap_unify(LOCAL_debugger_state[DEBUG_GOAL_NUMBER], t1))
+            return false;
+    }
+    t1 = Deref(ARG3);
+    if (!IsVarTerm(t1)) {
+        if (!Yap_unify(LOCAL_debugger_state[DEBUG_SPY], t1))
+            return false;
+    }
+    t1 = Deref(ARG4);
+    if (!IsVarTerm(t1)) {
+        if (!Yap_unify(LOCAL_debugger_state[DEBUG_TRACE_MODE], t1))
+            return false;
+    }
+
+    return true;
+}
+
 void Yap_InitExecFs(void) {
     CACHE_REGS
     YAP_opaque_handler_t catcher_ops;
@@ -2423,4 +2526,9 @@ void Yap_InitExecFs(void) {
                   0);
     Yap_InitCPred("$cleanup_on_exit", 2, cleanup_on_exit, NoTracePredFlag);
     Yap_InitCPred("$tag_cleanup", 2, tag_cleanup, 0);
+    Yap_InitCPred("$get_debugger_state", 2, get_debugger_state, 0);
+    Yap_InitCPred("$get_debugger_state", 4, get_debugger_state4, 0);
+    Yap_InitCPred("$set_debugger_state", 2, set_debugger_state, 0);
+    Yap_InitCPred("$set_debugger_state", 4, set_debugger_state4, 0);
 }
+

H/ATOMS

@@ -91,6 +91,7 @@ A	Context			N	"context"
 A	Cputime			N	"cputime"
 A	Create			N	"create"
 A	Creep			F	"$creep"
+A	UserCreep		N	"creep"
 A	CryptAtoms		N	"crypt_atoms"
 A	Curly			N	"{}"
 A	Csult			F	"$csult"
@@ -222,6 +223,7 @@ A	LOOP			N	"_LOOP_"
 A	LoopStream		N	"loop_stream"
 A	LT			N	"<"
 A	LastExecuteWithin	F	"$last_execute_within"
+A	Leap            N   "leap"
 A	Leash			F	"$leash"
 A	Least			N	"least"
 A	Length			F	"length"
@@ -454,6 +456,7 @@ A	WriteTerm		N	"write_term"
 A	Xml			N	"xml"
 A	YapHacks		N	"yap_hacks"
 A	ZeroDivisor		N	"zero_divisor"
+A	Zip		N	"zip"
 F	AfInet			AfInet		2
 F	AfLocal			AfLocal		1
 F	AfUnix			AfUnix		1
@@ -486,7 +489,7 @@ F	Comma			Comma		2
 F	CommentHook		CommentHook	3
 F	Context2		Context		2
 F	ConsistencyError	ConsistencyError	1
-F	Creep			Creep		1
+F	Creep			Creep		4
 F	Csult			Csult		2
 F	CurrentModule		CurrentModule	1
 F	CutBy			CutBy		1

H/amidefs.h

@@ -1043,4 +1043,16 @@ extern void **Yap_ABSMI_OPCODES;
 
 #endif
 
+/// Debugging Support
+
+typedef enum {
+DEBUG_CREEP_LEAP_OR_ZIP = 0,
+DEBUG_GOAL_NUMBER = 1,
+DEBUG_SPY = 2,
+DEBUG_TRACE_MODE =  3,
+DEBUG_GOAL_QUEUE =  4,
+    DEBUG_DEBUGGER_MAY_BE_CALLED = 5,
+    DEBUG_NUMBER_OF_OPTS =6
+} debug_key_t ;
+
 #endif

H/generated/iatoms.h

@@ -86,6 +86,7 @@
   AtomCputime = Yap_LookupAtom("cputime"); TermCputime = MkAtomTerm(AtomCputime);
   AtomCreate = Yap_LookupAtom("create"); TermCreate = MkAtomTerm(AtomCreate);
   AtomCreep = Yap_FullLookupAtom("$creep"); TermCreep = MkAtomTerm(AtomCreep);
+  AtomUserCreep = Yap_LookupAtom("creep"); TermUserCreep = MkAtomTerm(AtomUserCreep);
   AtomCryptAtoms = Yap_LookupAtom("crypt_atoms"); TermCryptAtoms = MkAtomTerm(AtomCryptAtoms);
   AtomCurly = Yap_LookupAtom("{}"); TermCurly = MkAtomTerm(AtomCurly);
   AtomCsult = Yap_FullLookupAtom("$csult"); TermCsult = MkAtomTerm(AtomCsult);
@@ -216,6 +217,7 @@
   AtomLoopStream = Yap_LookupAtom("loop_stream"); TermLoopStream = MkAtomTerm(AtomLoopStream);
   AtomLT = Yap_LookupAtom("<"); TermLT = MkAtomTerm(AtomLT);
   AtomLastExecuteWithin = Yap_FullLookupAtom("$last_execute_within"); TermLastExecuteWithin = MkAtomTerm(AtomLastExecuteWithin);
+  AtomLeap = Yap_LookupAtom("leap"); TermLeap = MkAtomTerm(AtomLeap);
   AtomLeash = Yap_FullLookupAtom("$leash"); TermLeash = MkAtomTerm(AtomLeash);
   AtomLeast = Yap_LookupAtom("least"); TermLeast = MkAtomTerm(AtomLeast);
   AtomLength = Yap_FullLookupAtom("length"); TermLength = MkAtomTerm(AtomLength);
@@ -448,6 +450,7 @@
   AtomXml = Yap_LookupAtom("xml"); TermXml = MkAtomTerm(AtomXml);
   AtomYapHacks = Yap_LookupAtom("yap_hacks"); TermYapHacks = MkAtomTerm(AtomYapHacks);
   AtomZeroDivisor = Yap_LookupAtom("zero_divisor"); TermZeroDivisor = MkAtomTerm(AtomZeroDivisor);
+  AtomZip = Yap_LookupAtom("zip"); TermZip = MkAtomTerm(AtomZip);
   FunctorAfInet = Yap_MkFunctor(AtomAfInet,2);
   FunctorAfLocal = Yap_MkFunctor(AtomAfLocal,1);
   FunctorAfUnix = Yap_MkFunctor(AtomAfUnix,1);
@@ -480,7 +483,7 @@
   FunctorCommentHook = Yap_MkFunctor(AtomCommentHook,3);
   FunctorContext2 = Yap_MkFunctor(AtomContext,2);
   FunctorConsistencyError = Yap_MkFunctor(AtomConsistencyError,1);
-  FunctorCreep = Yap_MkFunctor(AtomCreep,1);
+  FunctorCreep = Yap_MkFunctor(AtomCreep,4);
   FunctorCsult = Yap_MkFunctor(AtomCsult,2);
   FunctorCurrentModule = Yap_MkFunctor(AtomCurrentModule,1);
   FunctorCutBy = Yap_MkFunctor(AtomCutBy,1);

H/generated/ratoms.h

@@ -86,6 +86,7 @@
   AtomCputime = AtomAdjust(AtomCputime); TermCputime = MkAtomTerm(AtomCputime);
   AtomCreate = AtomAdjust(AtomCreate); TermCreate = MkAtomTerm(AtomCreate);
   AtomCreep = AtomAdjust(AtomCreep); TermCreep = MkAtomTerm(AtomCreep);
+  AtomUserCreep = AtomAdjust(AtomUserCreep); TermUserCreep = MkAtomTerm(AtomUserCreep);
   AtomCryptAtoms = AtomAdjust(AtomCryptAtoms); TermCryptAtoms = MkAtomTerm(AtomCryptAtoms);
   AtomCurly = AtomAdjust(AtomCurly); TermCurly = MkAtomTerm(AtomCurly);
   AtomCsult = AtomAdjust(AtomCsult); TermCsult = MkAtomTerm(AtomCsult);
@@ -216,6 +217,7 @@
   AtomLoopStream = AtomAdjust(AtomLoopStream); TermLoopStream = MkAtomTerm(AtomLoopStream);
   AtomLT = AtomAdjust(AtomLT); TermLT = MkAtomTerm(AtomLT);
   AtomLastExecuteWithin = AtomAdjust(AtomLastExecuteWithin); TermLastExecuteWithin = MkAtomTerm(AtomLastExecuteWithin);
+  AtomLeap = AtomAdjust(AtomLeap); TermLeap = MkAtomTerm(AtomLeap);
   AtomLeash = AtomAdjust(AtomLeash); TermLeash = MkAtomTerm(AtomLeash);
   AtomLeast = AtomAdjust(AtomLeast); TermLeast = MkAtomTerm(AtomLeast);
   AtomLength = AtomAdjust(AtomLength); TermLength = MkAtomTerm(AtomLength);
@@ -447,6 +449,7 @@
   AtomWriteTerm = AtomAdjust(AtomWriteTerm); TermWriteTerm = MkAtomTerm(AtomWriteTerm);
   AtomXml = AtomAdjust(AtomXml); TermXml = MkAtomTerm(AtomXml);
   AtomYapHacks = AtomAdjust(AtomYapHacks); TermYapHacks = MkAtomTerm(AtomYapHacks);
+  AtomZip = AtomAdjust(AtomZip); TermZip = MkAtomTerm(AtomZip);
   AtomZeroDivisor = AtomAdjust(AtomZeroDivisor); TermZeroDivisor = MkAtomTerm(AtomZeroDivisor);
   FunctorAfInet = FuncAdjust(FunctorAfInet);
   FunctorAfLocal = FuncAdjust(FunctorAfLocal);

H/generated/tatoms.h

@@ -86,6 +86,7 @@ X_API EXTERNAL Atom AtomContext; X_API EXTERNAL Term TermContext;
 X_API EXTERNAL Atom AtomCputime; X_API EXTERNAL Term TermCputime;
 X_API EXTERNAL Atom AtomCreate; X_API EXTERNAL Term TermCreate;
   X_API EXTERNAL Atom AtomCreep; X_API EXTERNAL Term TermCreep;
+  X_API EXTERNAL Atom AtomUserCreep; X_API EXTERNAL Term TermUserCreep;
 X_API EXTERNAL Atom AtomCryptAtoms; X_API EXTERNAL Term TermCryptAtoms;
 X_API EXTERNAL Atom AtomCurly; X_API EXTERNAL Term TermCurly;
 X_API EXTERNAL Atom AtomCsult; X_API EXTERNAL Term TermCsult;
@@ -217,6 +218,7 @@ X_API EXTERNAL Atom AtomLoopStream; X_API EXTERNAL Term TermLoopStream;
 X_API EXTERNAL Atom AtomLT; X_API EXTERNAL Term TermLT;
 X_API EXTERNAL Atom AtomLastExecuteWithin; X_API EXTERNAL Term TermLastExecuteWithin;
   X_API EXTERNAL Atom AtomLeash; X_API EXTERNAL Term TermLeash;
+  X_API EXTERNAL Atom AtomLeap; X_API EXTERNAL Term TermLeap;
 X_API EXTERNAL Atom AtomLeast; X_API EXTERNAL Term TermLeast;
 X_API EXTERNAL Atom AtomLength; X_API EXTERNAL Term TermLength;
 X_API EXTERNAL Atom AtomList; X_API EXTERNAL Term TermList;
@@ -448,6 +450,8 @@ X_API EXTERNAL Atom AtomWriteTerm; X_API EXTERNAL Term TermWriteTerm;
 X_API EXTERNAL Atom AtomXml; X_API EXTERNAL Term TermXml;
 X_API EXTERNAL Atom AtomYapHacks; X_API EXTERNAL Term TermYapHacks;
 X_API EXTERNAL Atom AtomZeroDivisor; X_API EXTERNAL Term TermZeroDivisor;
+X_API EXTERNAL Atom AtomZip; X_API EXTERNAL Term TermZip;
+
 X_API EXTERNAL  Functor FunctorAfInet;
 
 X_API EXTERNAL  Functor FunctorAfLocal;

H/locals.h

@@ -33,6 +33,8 @@ LOCAL_INIT(bool, newline, true);
 LOCAL_INIT(Atom, AtPrompt, AtomNil);
 LOCAL_ARRAY(char, Prompt, MAX_PROMPT + 1);
 
+LOCAL_ARRAY(Term, debugger_state, DEBUG_NUMBER_OF_OPTS);
+
 LOCAL_INITF(encoding_t, encoding, Yap_DefaultEncoding());
 LOCAL_INIT(bool, quasi_quotations, false);
 LOCAL_INIT(UInt, default_priority, 1200);

pl/control.yap

@@ -473,7 +473,7 @@ b_getval(GlobalVariable, Val) :-
 
 
 '$debug_stop' :-
-	nb_setval('$debug_state', state(creep,0,stop)),
+'$set_debugger_state'( zip,0,stop,off ),
 	b_setval('$trace',off),
 	set_prolog_flag(debug, false),
 	b_setval('$spy_glist',[]),

pl/debug.yap

@@ -16,7 +16,7 @@
 *************************************************************************/
 :- system_module('$_debug',
                  [],
-                 ['$trace_query'/4, '$init_debugger'/0, '$skipeol'/1]).
+                 ['$trace_goal'/4, '$init_debugger'/0, '$skipeol'/1]).
 
 
 
@@ -252,7 +252,7 @@ be lost.
    *
    * The debugger is an interpreter. with main predicates:
    * - $trace: this is the API
-   * - $trace_query: reduce a query to a goal
+   * - $trace_goal: reduce a query to a goal
    * - $trace_goal: execute:
    *    + using the source, Luke
    *    + hooking into the WAM procedure call mechanism
@@ -299,7 +299,7 @@ be lost.
 %%! The first case matches system_predicates or zip
 '$trace'(Mod:G) :-
     '$$save_by'(CP),
-    '$trace_query'(G, Mod, CP, _G).
+    '$trace_goal'(G, Mod, CP, _G).
 
 
 '$trace'(Mod:G, A1) :-
@@ -394,64 +394,57 @@ be lost.
 
 
 '$trace_meta_call'( G, M, CP ) :-
-    '$trace_query'(G, M, CP, _G ).
+    '$trace_goal'(G, M, CP, _G ).
 
-%% @pred '$trace_query'( +G, +M, +CP, +Expanded)
+
+'$creep'([M|Q]) :-
+'$yap_strip_module'(G,M,Q),
+'$current_choicepoint'(CP),
+'$trace_goal'(Q, M, CP, _G ).
+
+
+'$creep'(G0, M0, _CP, H) :-
+'$yap_strip_module'(M0:G0, M, G),    % spy a literal
+    '$id_goal'(L),
+   '$current_choicepoint'(CP),
+     '$trace_goal'(G, M, CP,L).
+
+
+%% @pred '$trace_goal'( +G, +M, +CP, +Expanded)
 %
 % debug a complex query
 %
-'$trace_query'(V, M, _CP, _) :-
+'$trace_goal'(V, M, _,_) :-
     var(V),
     !,
     call(M:V).
-'$trace_query'(!, _, CP, _) :-
+'$trace_goal'(!, _, _,CP) :-
     !,
     '$$cut_by'(CP).
-'$trace_query'('$cut_by'(M), _, _, _) :-
+'$trace_goal'('$cut_by'(M), _, _, _) :-
     !,
     '$$cut_by'(M).
-'$trace_query'('$$cut_by'(M), _, _, _) :-
+'$trace_goal'('$$cut_by'(M), _, _, _) :-
     !,
     '$$cut_by'(M).
-'$trace_query'(M:G, _, CP,S) :-
+'$trace_goal'(M:G, _, S, CP) :-
     !,
     '$yap_strip_module'(M:G, M0, G0),
-    '$trace_query'(G0, M0, CP,S ).
+    '$trace_goal'(G0, M0, S, CP ).
-'$trace_query'((A,B), M, CP, S) :- !,
+'$trace_goal'((A,B), M, S, CP) :- !,
-    '$trace_query'(A, M, CP, S),
+    '$trace_goal'(A, M, S, CP),
-    '$trace_query'(B, M, CP, S).
+    '$trace_goal'(B, M, S, CP).
-'$trace_query'((A->B), M, CP, S) :- !,
+'$trace_goal'((A->B), M, S, CP) :- !,
-    '$trace_query'(A, M, CP, S) ->
+    '$trace_goal'(A, M, S, CP) ->
-    '$trace_query'(B, M, CP, S).
+    '$trace_goal'(B, M, S, CP).
-'$trace_query'((A;B), M, CP, S) :- !,
+'$trace_goal'((A;B), M, S, CP) :- !,
-    '$trace_query'(A, M, CP, S);
+    '$trace_goal'(A, M, S, CP);
-	'$trace_query'(B, M, CP, S).
+	'$trace_goal'(B, M, S, CP).
-'$trace_query'((A|B), M, CP, S) :- !,
+'$trace_goal'((A|B), M, S, CP) :- !,
-    '$trace_query'(A, M, CP, S);
+    '$trace_goal'(A, M, S, CP);
-	'$trace_query'(B, M, CP, S).
+	'$trace_goal'(B, M, S, CP).
-'$trace_query'((\+ A), M, CP, S) :- !,
+'$trace_goal'((\+ A), M, S, CP) :- !,
-    '$trace_query'(A, M, CP, S).
+    '$trace_goal'(A, M, S, CP).
-'$trace_query'(G, M,_CP,S) :-
-    '$is_metapredicate'(G, prolog),
-    !,
-    '$debugger_expand_meta_call'(M:G, [], G1),
-    strip_module(M:G1, MF, NG),
-    % spy a literal
-    '$id_goal'(L),
-    catch(
-        '$trace_goal'(NG, MF, L, S),
-        E,
-        '$TraceError'(E, G, M, L, S)
-    ).
-'$trace_query'(G, M, _CP, H) :-
-    % spy a literal
-    '$id_goal'(L),
-    catch(
-        '$trace_goal'(G, M, L, H),
-        E,
-        '$TraceError'(E, G, M, L, H)
-    ).
-
 
 %% @pred $trace_goal( +Goal, +Module, +CallId, +CallInfo)
 %%
@@ -465,8 +458,8 @@ be lost.
     ),
     !,
      gated_call(
-	 '$start_user_code',
+    '$set_debugger_state'(debug, false),
-	 '$execute'(G,M),
+	 '$execute_nonstop'(G,M),
 	 Port,
 	 '$reenter_debugger'(Port)
      ).
@@ -475,8 +468,7 @@ be lost.
     '$creep_is_off'(M:G, GoalNumber),
     !,
      gated_call(
-	 '$start_user_code',
+    '$set_debugger_state'(debug, false),
-	 % try creeping
 	 '$execute_nonstop'(G,M),
 	 Port,
 	 '$trace_port_'( Port, GoalNumber, G, M, H)
@@ -617,7 +609,7 @@ be lost.
 
 
 %%% - abort: forward throw while the call is newer than goal
-%% @pred '$re_trace_query'( Exception, +Goal, +Mod, +GoalID )
+%% @pred '$re_trace_goal'( Exception, +Goal, +Mod, +GoalID )
 %
 % debugger code for exceptions. Recognised cases are:
 %   - abort always forwarded
@@ -678,7 +670,7 @@ be lost.
     Goal.
 
 '$port'(_P, _G, _M,GoalNumber,_Determinic, _Info ) :-   %%> leap
-        '__NB_getval__'('$debug_state',state(leap,Border,_,_), fail),
+'$get_debugger_state'( leap,Border,_,_), fail ,
 	GoalNumber < Border,
 	!.
 '$port'(P,G,Module,L,Deterministic, Info) :-
@@ -720,7 +712,7 @@ be lost.
 '$unleashed'(redo) :- get_value('$leash',L), L /\ 2'0010 =:= 0. %'
 '$unleashed'(fail) :- get_value('$leash',L), L /\ 2'0001 =:= 0. %'
 % the same as fail.
-'$unleashed'(exception(_)) :- get_value('$leash',L), L /\ 2'10000 =:= 0.  %'
+'$unleashed'(exception(_)) :- get_value('$leash',L), L /\ 2'10000 =:= 0.  %
 
 '$debugger_write'(Stream, G) :-
 	current_prolog_flag( debugger_print_options, OUT ), !,
@@ -733,7 +725,7 @@ be lost.
 	'$action'(C,P,CallNumber,G,Module,H).
 '$action'('\n',_,_,_,_,_) :- !,			% newline 	creep
     '__NB_getval__'('$trace',Trace,fail),
-    '__NB_setval__'('$debug_state', state(creep, 0, stop, Trace)).
+'$set_debugger_state'( creep, 0, stop, Trace ).
 '$action'(!,_,_,_,_,_) :- !,			% ! 'g		execute
     read(debugger_input, G),
 	% don't allow yourself to be caught by creep.
@@ -750,7 +742,7 @@ be lost.
 	!,			% <'Depth
 	skip( debugger_input, 10),
 	'__NB_getval__'('$trace',Trace,fail),
-        '__NB_setval__'('$debug_state', state(creep, 0, stop,Trace)).
+'$set_debugger_state'( creep, 0, stop,Trace).
 '$action'(^,_,_,G,_,_) :- !,			% '
 	'$print_deb_sterm'(G),
 	skip( debugger_input, 10),
@@ -771,7 +763,7 @@ be lost.
 '$action'(c,_,_,_,_,_) :- !,			% 'c		creep
 	skip( debugger_input, 10),
 	'__NB_getval__'('$trace',Trace,fail),
-	'__NB_setval__'('$debug_state',status(creep,0,stop,Trace)).
+'$set_debugger_state'( creep,0,stop,Trace ).
 '$action'(e,_,_,_,_,_) :- !,			% 'e		exit
 	halt.
 '$action'(f,_,CallNumber,_,_,_) :- !,		% 'f		fail
@@ -806,22 +798,22 @@ be lost.
     '$scan_number'(ScanNumber),		
     ( ScanNumber == 0 -> Goal = CallNumber ; Goal = ScanNumber ),
    '__NB_getval__'('$trace',Trace,fail),
-    '__NB_setval__'('$debug_state', state(leap, Goal, stop,Trace)).
+'$set_debugger_state'( leap, Goal, stop,Trace ).
 '$action'(z,_,_allNumber,_,_,_H) :- !,		% 'z		zip, fast leap
    '__NB_getval__'('$trace',Trace,fail),
-    '__NB_setval__'('$debug_state', state(zip, 0, stop, Trace)).
+'$set_debugger_state'( zip, 0, stop, Trace).
         % skip first call (for current goal),
 	% stop next time.
 '$action'(k,_,_CallNumber,_,_,_) :- !,		% 'k		zip, fast leap
    '__NB_getval__'('$trace',Trace,fail),
-         '__NB_setval__'('$debug_state', state(zip, 0, stop, Trace)).
+'$set_debugger_state'( zip, 0, stop, Trace).
         % skip first call (for current goal),
 	% stop next time.
 '$action'(n,_,_,_,_,_) :- !,			% 'n		nodebug
 	skip( debugger_input, 10),				% '
 	% tell debugger never to stop.
    '__NB_getval__'('$trace',Trace,fail),
-        '__NB_setval__'('$debug_state', state(zip, 0, ignore, Trace)),
+'$set_debugger_state'( zip, 0, ignore, Trace),
  	nodebug.
 '$action'(r,_,CallNumber,_,_,_) :- !,	        % r		retry
     '$scan_number'(ScanNumber),		
@@ -832,7 +824,7 @@ be lost.
      ( ScanNumber == 0 -> Goal = CallNumber ; Goal = ScanNumber ),
 	( (P==call; P==redo) ->
     '__NB_getval__'('$trace',Trace,fail),
-            '__NB_setval__'('$debug_state', state(leap, Goal, ignore,Trace) ) ;
+'$set_debugger_state'( leap, Goal, ignore,Trace),
 	    '$ilgl'(s)				% '
 	).
 '$action'(t,P,CallNumber,_,_,_) :- !,		% 't		fast skip
@@ -840,7 +832,7 @@ be lost.
      ( ScanNumber == 0 -> Goal = CallNumber ; Goal = ScanNumber ),
      ( (P=call; P=redo) ->
           '__NB_getval__'('$trace',Trace,fail),
-            '__NB_setval__'('$debug_state', state(zip, Goal, ignore,Trace))	;
+'$set_debugger_state'( zip, Goal, ignore,Trace),
 	    '$ilgl'(t)				% '
 	).
 '$action'(q,P,CallNumber,_,_,_) :- !,		% 'qst skip
@@ -848,7 +840,7 @@ be lost.
      ( ScanNumber == 0 -> Goal = CallNumber ; Goal = ScanNumber ),
 	( (P=call; P=redo) ->
             '__NB_getval__'('$trace',Trace,fail),
-	    '__NB_setval__'('$debug_state', state(leap, Goal, stop, Trace))	;
+'$set_debugger_state'( leap, Goal, stop, Trace),
 	    '$ilgl'(t)				% '
 	).
 '$action'(+,_,_,G,M,_) :- !,			%%		spy this
@@ -1019,11 +1011,11 @@ be lost.
 '$cps'([]).
 
 
-'$debugger_skip_trace_query'([CP|CPs],CPs1) :-
+'$debugger_skip_trace_goal'([CP|CPs],CPs1) :-
-    yap_hacks:choicepoint(CP,_,prolog,'$trace_query',4,(_;_),_),
+    yap_hacks:choicepoint(CP,_,prolog,'$trace_goal',4,(_;_),_),
     !,
-    '$debugger_skip_trace_query'(CPs,CPs1).
+    '$debugger_skip_trace_goal'(CPs,CPs1).
-'$debugger_skip_trace_query'(CPs,CPs).
+'$debugger_skip_trace_goal'(CPs,CPs).
 
 '$debugger_skip_traces'([CP|CPs],CPs1) :-
     yap_hacks:choicepoint(CP,_,prolog,'$port',4,(_;_),_),
@@ -1069,10 +1061,5 @@ be lost.
 '$ldebugger_process_meta_args'([G|BGs], M, [_|BMs], [G|BG1s]) :-
     '$ldebugger_process_meta_args'(BGs, M, BMs, BG1s).
 
-
-'$creep'(creep) :- '$creep'.
-'$creep'(leap) :- '$creep'.
-'$creep'(zip).
-
 %% @}
 %% @}

pl/init.yap

@@ -248,7 +248,7 @@ top_query(G)  :-
 	nb_setval('$debug_run',off),
 	nb_setval('$debug_jump',off),
 	'__NB_setval__'('$trace',off),
-	nb_setval('$debug_state', state(zip, 0, stop,off)),
+'$set_debugger_state'( zip, 0, stop,off),
 	set_prolog_flag(break_level, 0),
 	catch(user:G,  Error, '$Error'(Error)).
 

pl/protect.yap

@@ -46,11 +46,15 @@ prolog:'$protect' :-
     '$is_system_module'(M),
     functor(P,Name,Arity),
     '$new_system_predicate'(Name,Arity,M),
-    sub_atom(Name,0,1,_, '$'),
-    functor(P,Name,Arity),
-    '$stash_predicate'(P,M),
 %    '$hide_predicate'(P,M),
     fail.
+prolog:'$protect' :-
+   '$current_predicate'(Name,M,P,_),
+    '$is_system_module'(M),
+    functor(P,Name,Arity),
+    \+ '$visible'(Name), 
+'$set_private'(P,M),
+    fail.
 prolog:'$protect' :-
     current_atom(Name),
 	sub_atom(Name,0,1,_, '$'),

pl/spy.yap

@@ -206,11 +206,10 @@ debug :-
 
 '$start_user_code' :-
     yap_flag(debug, Can),
-    '__NB_setval__'(debug, Can),
+    '$set_debugger_state'(debug, Can),
     '__NB_getval__'('$trace',Trace, fail),
     ( Trace == on -> Creep = creep; Creep = zip ),
-    '__NB_setval__'('$debug_state',state(Creep,0,stop,Trace) ).
+    '$set_debugger_state'( Creep, 0, stop, Trace ).
-
 nodebug :-
 	 set_prolog_flag(debug, false),
 	 '$init_debugger',
@@ -378,13 +377,13 @@ notrace(G) :-
     ).
 
 '$creep_at_port'(retry) :-
-    '__NB_getval__'(debug, true, fail),
+    '$get_debugger_state'(debug, true),
     '__NB_getval__'('$trace',Trace,fail),
     Trace = on,
     !,
     '$enable_debugging'.
 '$creep_at_port'(fail) :-
-    '__NB_getval__'(debug, true, fail),
+    '$get_debugger_state'(debug, true),
    '__NB_getval__'('$trace',Trace,fail),
     Trace = on,
     !,
@@ -400,10 +399,10 @@ notrace(G) :-
 '$init_debugger_trace' :-
 	'__NB_getval__'('$trace',on,fail),
 	!,
-	nb_setval('$debug_state', state(creep, 0, stop, on)).  
+	'$set_debugger_state'( creep,  0, stop, on ).
 '$init_debugger_trace' :-
 	'__NB_setval__'('$trace',off),
-	nb_setval('$debug_state', state(zip, 0, stop, off)). 
+	'$set_debugger_state'( zip, 0, stop, off ).
 
 %% @pred $enter_debugging(G,Mod,CP,G0,NG)
 %%
@@ -448,7 +447,7 @@ notrace(G) :-
 '$reenter_debugger'(fail) :-
     '$re_enter_creep_mode'.
 '$reenter_debugger'(_) :-
-    '__NB_setval__'(debug, false).
+    '$set_debugger_state'(debug, false).
 
 % what to do when you exit the debugger.
 '$continue_debugging'(exit) :-
@@ -486,29 +485,29 @@ notrace(G) :-
 	 current_prolog_flag( debug, false )
      -> true
     ;
-	 '$is_opaque_zpredicate'(G,Module)
+	 '$is_opaque_predicate'(G,Module)
      -> true
     ;
 	 '$is_private'(G,Module)
      -> true
     ;
-    '__NB_getval__'('$debug_state',state(zip, GN, Spy,_), fail)
+ 	'$get_debugger_state'( creep, zip )  ->
-    ->
     true
     ;
     '$pred_being_spied'(G,Module)
     ->
-    Spy == ignore
+	'$get_debugger_state'( spy,  ignore )
     ;
     var(GN)
     ->
     false
     ;
-    GN > GoalNo
+	'$get_debugger_state'( goal_number, GoalNo ) ,
+	    GN < GoalNo
      ).
 '$creep_is_on_at_entry'(G,M,_GoalNo) :-
     \+ '$is_system_predicate'(G,M),
-    '__NB_getval__'('$debug_state',state(Step, _GN, Spy,_), fail),
+    '$get_debugger_state'(Step, _GN, Spy,_),
     (
 	Step \= zip
     ;
@@ -518,13 +517,14 @@ notrace(G) :-
 
    
 '$trace_on' :-
-    '__NB_getval__'('$debug_state', state(_Creep, GN, Spy,Trace), fail),
+    '$get_debugger_state'(_Creep, GN, Spy,Trace),
     nb_setval('$trace',on),
-    nb_setval('$debug_state', state(creep, GN, Spy, Trace)).
+'$set_debugger_state'( creep, GN, Spy, Trace).
 
 '$trace_off' :-
-'__NB_getval__'('$debug_state', state(_Creep, GN, Spy, Trace),fail),
+'$get_debugger_state'( _Creep, GN, Spy, Trace),
-nb_setval('$debug_state', state(zip, GN, Spy,Trace)).
+    nb_setval('$trace',off),
+'$set_debugger_state'( creep, GN, Spy, Trace).
 
 /*
 

pl/top.yap

@@ -577,18 +577,9 @@ write_query_answer( Bindings ) :-
 	'$current_choice_point'(CP),
 	'$call'(G, CP, G, M).
 
-'$user_call'(G, CP, G0, M) :-
-    catch('$trace_query'(G, M, CP, G0), E, '$Error'(E)).
-
 '$user_call'(G, M) :-
-    (
+	'$current_choice_point'(CP),
-	'$creep_is_off'(Module:G, GoalNo)
+    gated_call('$start_user_code',M:G,Port,'$reenter_debugger'(Port)).
-    ->
-    gated_call('$start_user_code',call(M:G),Port,'$reenter_debugger'(Port))
-    ;
-    
-    '$trace'(M:G)
-    ).
 
 '$cut_by'(CP) :- '$$cut_by'(CP).
 
@@ -1017,7 +1008,7 @@ log_event( String, Args ) :-
 	DBON = true
 	->
 	(
-	    '__NB_getval__'('$debug_state',state( _, _, _,on), fail),
+'$get_debugger_state'(  trace,on),
 	    (
 		var(LF)
 	    ->