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

wake up before cut_e. Still to do: wakeup before cut_t and cut.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@878 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2003-09-26 14:30:59 +00:00
parent 4e1899be78
commit f5931c5c0e
4 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
C/absmi.c
View File

@ -2159,18 +2159,9 @@ Yap_absmi(int inp)
/* also, this is unusual in that I have already done deallocate, /* also, this is unusual in that I have already done deallocate,
so I don't need to redo it. so I don't need to redo it.
*/ */
NoStackProceed: NoStackDeallocate:
if (CFREG == (CELL)(LCL0+2)) { if (CFREG == (CELL)(LCL0+2)) {
/* GONext();
we're not actually doing debugging here, just execute
instruction and go on.
*/
PREG = CPREG;
YREG = ENV;
#ifdef DEPTH_LIMIT
DEPTH = YREG[E_DEPTH];
#endif
JMPNext();
} }
ASP = YREG; ASP = YREG;
if (CFREG == (CELL)(LCL0+1)) { if (CFREG == (CELL)(LCL0+1)) {
@ -2178,7 +2169,13 @@ Yap_absmi(int inp)
} }
if (CFREG == Unsigned(LCL0)) { if (CFREG == Unsigned(LCL0)) {
if (Yap_ReadTimedVar(WokenGoals) != TermNil) { if (Yap_ReadTimedVar(WokenGoals) != TermNil) {
SREG = (CELL *)RepPredProp(Yap_GetPredPropByAtom(AtomTrue,0)); if (Yap_op_from_opcode(PREG->opc) == _cut_e) {
/* followed by a cut */
ARG1 = MkIntegerTerm(LCL0-(CELL *)SREG[E_CB]);
SREG = (CELL *)RepPredProp(Yap_GetPredPropByFunc(FunctorCutBy,1));
} else {
SREG = (CELL *)RepPredProp(Yap_GetPredPropByAtom(AtomTrue,0));
}
goto creep; goto creep;
} else { } else {
CFREG = CalculateStackGap(); CFREG = CalculateStackGap();
@ -2567,10 +2564,6 @@ Yap_absmi(int inp)
BOp(procceed, e); BOp(procceed, e);
CACHE_Y_AS_ENV(YREG); CACHE_Y_AS_ENV(YREG);
#ifndef NO_CHECKING
/* check stacks */
check_stack(NoStackProceed, H);
#endif
PREG = CPREG; PREG = CPREG;
E_YREG = ENV; E_YREG = ENV;
#ifdef DEPTH_LIMIT #ifdef DEPTH_LIMIT
@ -2622,6 +2615,10 @@ Yap_absmi(int inp)
E_YREG = (CELL *) ((CELL) E_YREG + ENV_Size(CPREG)); E_YREG = (CELL *) ((CELL) E_YREG + ENV_Size(CPREG));
#endif /* FROZEN_STACKS */ #endif /* FROZEN_STACKS */
WRITEBACK_Y_AS_ENV(); WRITEBACK_Y_AS_ENV();
#ifndef NO_CHECKING
/* check stacks */
check_stack(NoStackDeallocate, H);
#endif
ENDCACHE_Y_AS_ENV(); ENDCACHE_Y_AS_ENV();
GONext(); GONext();
ENDOp(); ENDOp();

28
C/cdmgr.c
View File

@ -577,20 +577,22 @@ retract_all(PredEntry *p, int in_use)
p->StatisticsForPred.NOfHeadSuccesses = 0; p->StatisticsForPred.NOfHeadSuccesses = 0;
p->StatisticsForPred.NOfRetries = 0; p->StatisticsForPred.NOfRetries = 0;
} else { } else {
yamop *cpt = (yamop *)fclause; if (!(p->PredFlags & LogUpdatePredFlag)) {
cpt->opc = Yap_opcode(TRYCODE(_try_me, _try_me0, PredArity(p))); yamop *cpt = (yamop *)fclause;
if (fclause == lclause) { cpt->opc = Yap_opcode(TRYCODE(_try_me, _try_me0, PredArity(p)));
p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = NEXTOP(cpt,ld); if (fclause == lclause) {
p->OpcodeOfPred = NEXTOP(cpt,ld)->opc; p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = NEXTOP(cpt,ld);
} else { p->OpcodeOfPred = NEXTOP(cpt,ld)->opc;
p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = fclause;
p->OpcodeOfPred = cpt->opc;
if (p->PredFlags & ProfiledPredFlag) {
((yamop *)lclause)->opc = Yap_opcode(_profiled_trust_me);
} else if (p->PredFlags & CountPredFlag) {
((yamop *)lclause)->opc = Yap_opcode(_count_trust_me);
} else { } else {
((yamop *)lclause)->opc = Yap_opcode(TRYCODE(_trust_me, _trust_me0, PredArity(p))); p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = fclause;
p->OpcodeOfPred = cpt->opc;
if (p->PredFlags & ProfiledPredFlag) {
((yamop *)lclause)->opc = Yap_opcode(_profiled_trust_me);
} else if (p->PredFlags & CountPredFlag) {
((yamop *)lclause)->opc = Yap_opcode(_count_trust_me);
} else {
((yamop *)lclause)->opc = Yap_opcode(TRYCODE(_trust_me, _trust_me0, PredArity(p)));
}
} }
} }
if (p->PredFlags & SpiedPredFlag) { if (p->PredFlags & SpiedPredFlag) {

2
C/index.c
View File

@ -4119,6 +4119,8 @@ ExpandIndex(PredEntry *ap) {
yamop **labp; yamop **labp;
int cb; int cb;
extern long long int vsc_count;
printf("vsc_count: %lld\n", vsc_count);
Yap_Error_Size = 0; Yap_Error_Size = 0;
if ((cb = setjmp(Yap_CompilerBotch)) == 3) { if ((cb = setjmp(Yap_CompilerBotch)) == 3) {
restore_machine_regs(); restore_machine_regs();

12
pl/boot.yap
View File

@ -461,14 +461,14 @@ repeat :- '$repeat'.
( (
'$start_creep', '$start_creep',
'$execute'(G), '$execute'(G),
'$stop_creep', '$do_stop_creep',
'$extract_goal_vars_for_dump'(V,LIV), '$extract_goal_vars_for_dump'(V,LIV),
'$show_frozen'(G,LIV,LGs), '$show_frozen'(G,LIV,LGs),
'$write_answer'(V, LGs, Written), '$write_answer'(V, LGs, Written),
'$write_query_answer_true'(Written), '$write_query_answer_true'(Written),
'$another', '$another',
!, fail ; !, fail ;
'$stop_creep', '$do_stop_creep',
'$present_answer'(_, no), '$present_answer'(_, no),
fail fail
). ).
@ -476,7 +476,7 @@ repeat :- '$repeat'.
'$yes_no'(G,C) :- '$yes_no'(G,C) :-
'$current_module'(M), '$current_module'(M),
'$do_yes_no'(G,M), '$do_yes_no'(G,M),
'$stop_creep', '$do_stop_creep',
'$show_frozen'(G, [], LGs), '$show_frozen'(G, [], LGs),
'$write_answer'([], LGs, Written), '$write_answer'([], LGs, Written),
( Written = [] -> ( Written = [] ->
@ -485,10 +485,14 @@ repeat :- '$repeat'.
), ),
fail. fail.
'$yes_no'(_,_) :- '$yes_no'(_,_) :-
'$stop_creep', '$do_stop_creep',
'$present_answer'(_, no), '$present_answer'(_, no),
fail. fail.
% make sure we have Prolog code to force running any delayed goals.
'$do_stop_creep' :-
'$stop_creep'.
'$start_creep' :- '$start_creep' :-
( get_value('$trace', 1) -> ( get_value('$trace', 1) ->