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

fix call to debugger with wrong module

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@231 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2001-12-14 19:03:29 +00:00
parent e5bd31a385
commit 47b1ef2b63
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
C/exec.c
View File

@ -191,9 +191,9 @@ p_save_cp(void)
} }
inline static Int inline static Int
EnterCreepMode(void) { EnterCreepMode(SMALLUNSGN mod) {
PredEntry *PredSpy = RepPredProp(PredPropByFunc(FunctorSpy,0)); PredEntry *PredSpy = RepPredProp(PredPropByFunc(FunctorSpy,0));
ARG1 = MkPairTerm(ModuleName[CurrentModule],ARG1); ARG1 = MkPairTerm(ModuleName[mod],ARG1);
CreepFlag = CalculateStackGap(); CreepFlag = CalculateStackGap();
P_before_spy = P; P_before_spy = P;
return (CallPredicate(PredSpy, B)); return (CallPredicate(PredSpy, B));
@ -203,7 +203,7 @@ inline static Int
do_execute(Term t, int mod) do_execute(Term t, int mod)
{ {
if (yap_flags[SPY_CREEP_FLAG]) { if (yap_flags[SPY_CREEP_FLAG]) {
return(EnterCreepMode()); return(EnterCreepMode(mod));
} else if (PredGoalExpansion->OpcodeOfPred != UNDEF_OPCODE) { } else if (PredGoalExpansion->OpcodeOfPred != UNDEF_OPCODE) {
return(CallMetaCall(mod)); return(CallMetaCall(mod));
} }
@ -304,7 +304,7 @@ p_execute_within(void)
restart_exec: restart_exec:
if (yap_flags[SPY_CREEP_FLAG]) { if (yap_flags[SPY_CREEP_FLAG]) {
return(EnterCreepMode()); return(EnterCreepMode(mod));
} else if (PredGoalExpansion->OpcodeOfPred != UNDEF_OPCODE) { } else if (PredGoalExpansion->OpcodeOfPred != UNDEF_OPCODE) {
return(CallMetaCallWithin()); return(CallMetaCallWithin());
/* at this point check if we should enter creep mode */ /* at this point check if we should enter creep mode */
@ -408,7 +408,7 @@ p_execute_within2(void)
Prop pe; Prop pe;
if (yap_flags[SPY_CREEP_FLAG]) { if (yap_flags[SPY_CREEP_FLAG]) {
return(EnterCreepMode()); return(EnterCreepMode(CurrentModule));
} else if (PredGoalExpansion->OpcodeOfPred != UNDEF_OPCODE) { } else if (PredGoalExpansion->OpcodeOfPred != UNDEF_OPCODE) {
return(CallMetaCallWithin()); return(CallMetaCallWithin());
} else if (IsVarTerm(t)) { } else if (IsVarTerm(t)) {
@ -1262,6 +1262,19 @@ p_clean_ifcp(void) {
return(TRUE); return(TRUE);
} }
static Int
p_jump_env(void) {
CELL *env = LCL0-IntegerOfTerm(Deref(ARG1)), *prev = NULL, *cur = ENV;
while (cur != env) {
prev = cur;
cur = (CELL *)cur[E_E];
}
ENV[E_CP] = prev[E_CP];
ENV[E_E] = prev[E_E];
return(TRUE);
}
void void
InitExecFs(void) InitExecFs(void)
@ -1292,5 +1305,6 @@ InitExecFs(void)
InitCPred("$restore_regs", 1, p_restore_regs, SafePredFlag); InitCPred("$restore_regs", 1, p_restore_regs, SafePredFlag);
InitCPred("$restore_regs", 2, p_restore_regs2, SafePredFlag); InitCPred("$restore_regs", 2, p_restore_regs2, SafePredFlag);
InitCPred("$clean_ifcp", 1, p_clean_ifcp, SafePredFlag); InitCPred("$clean_ifcp", 1, p_clean_ifcp, SafePredFlag);
InitCPred("$jump_env", 1, p_jump_env, SafePredFlag);
} }