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

fix meta-call

Browse Source 
optimise deterministic (a,b,c).
This commit is contained in:
Vitor Santos Costa 2012-08-22 09:41:09 -05:00
parent a76f4f34d5
commit 9353d28c2e
2 changed files with 24 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
C/absmi.c
View File

@ -12912,8 +12912,6 @@ Yap_absmi(int inp)
BOp(p_execute_tail, Osbmp); BOp(p_execute_tail, Osbmp);
FETCH_Y_FROM_ENV(YREG); FETCH_Y_FROM_ENV(YREG);
/* recover CP, as the meta-call is not as a clause */
CPREG = (yamop *)ENV_YREG[E_CP];
/* place to cut to */ /* place to cut to */
b_ptr = (choiceptr)ENV_YREG[E_CB]; b_ptr = (choiceptr)ENV_YREG[E_CB];
/* original goal */ /* original goal */
@ -12922,29 +12920,32 @@ Yap_absmi(int inp)
pen = RepPredProp((Prop)IntegerOfTerm(ENV_YREG[-EnvSizeInCells-2])); pen = RepPredProp((Prop)IntegerOfTerm(ENV_YREG[-EnvSizeInCells-2]));
/* current module at the time */ /* current module at the time */
mod = ENV_YREG[-EnvSizeInCells-3]; mod = ENV_YREG[-EnvSizeInCells-3];
/* go back to parent */ /* set YREG */
ENV_YREG = ENV = (CELL *) ENV_YREG[E_E]; /* Try to preserve the environment */
ENV_YREG = (CELL *) (((char *) YREG) + PREG->u.Osbmp.s);
#ifdef FROZEN_STACKS #ifdef FROZEN_STACKS
{ {
choiceptr top_b = PROTECT_FROZEN_B(B); choiceptr top_b = PROTECT_FROZEN_B(B);
#ifdef YAPOR_SBA #ifdef YAPOR_SBA
if (ENV_YREG > (CELL *) top_b || ENV_YREG < H) ENV_YREG = (CELL *) top_b; if (ENV_YREG > (CELL *) top_b || ENV_YREG < H) ENV_YREG = (CELL *) top_b;
#else #else
if (ENV_YREG > (CELL *) top_b) ENV_YREG = (CELL *) top_b; if (ENV_YREG > (CELL *) top_b) ENV_YREG = (CELL *) top_b;
#endif /* YAPOR_SBA */ #endif /* YAPOR_SBA */
else ENV_YREG = (CELL *)((CELL)ENV_YREG + ENV_Size(CPREG));
} }
#else #else
if (ENV_YREG > (CELL *)B) { if (ENV_YREG > (CELL *) B) {
ENV_YREG = (CELL *)B; ENV_YREG = (CELL *) B;
} else {
ENV_YREG = (CELL *) ((CELL) ENV_YREG+ ENV_Size(CPREG));
} }
#endif /* FROZEN_STACKS */ #endif /* FROZEN_STACKS */
/* now, jump to actual execution */ /* now, jump to actual execution */
if (pen->ArityOfPE) { if (pen->ArityOfPE) {
f = pen->FunctorOfPred; f = pen->FunctorOfPred;
/* reuse environment if we are continuining a comma, ie, (g1,g2,g3) */
/* can only do it deterministically */
if (f == FunctorComma && B >= ENV) {
ENV_YREG = ENV;
ENV = (CELL *)ENV[E_E];
}
goto execute_pred_f; goto execute_pred_f;
} else } else
goto execute_pred_a; goto execute_pred_a;
@ -13035,7 +13036,6 @@ Yap_absmi(int inp)
if (IsAtomTerm(d1)) { if (IsAtomTerm(d1)) {
/* atomic goal is simpler */ /* atomic goal is simpler */
ENV_YREG[-EnvSizeInCells-2] = MkIntegerTerm((Int)PredPropByAtom(AtomOfTerm(d1),nmod)); ENV_YREG[-EnvSizeInCells-2] = MkIntegerTerm((Int)PredPropByAtom(AtomOfTerm(d1),nmod));
ENV_YREG[-EnvSizeInCells-3] = nmod;
} else if (IsApplTerm(d1)) { } else if (IsApplTerm(d1)) {
Functor f1 = FunctorOfTerm(d1); Functor f1 = FunctorOfTerm(d1);
if (IsExtensionFunctor(f1)) { if (IsExtensionFunctor(f1)) {
@ -13053,12 +13053,13 @@ Yap_absmi(int inp)
goto execute_metacall; goto execute_metacall;
} }
ENV_YREG[-EnvSizeInCells-2] = MkIntegerTerm((Int)PredPropByFunc(f1,nmod)); ENV_YREG[-EnvSizeInCells-2] = MkIntegerTerm((Int)PredPropByFunc(f1,nmod));
ENV_YREG[-EnvSizeInCells-3] = nmod;
} }
} else { } else {
goto execute_metacall; goto execute_metacall;
} }
ENV_YREG[-EnvSizeInCells-3] = mod;
/* now, we can create the new environment for the meta-call */ /* now, we can create the new environment for the meta-call */
/* notice that we are at a call, so we should ignore CP */
ENV_YREG[E_CP] = (CELL)NEXTOP(PREG,Osbmp); ENV_YREG[E_CP] = (CELL)NEXTOP(PREG,Osbmp);
ENV_YREG[E_CB] = (CELL)b_ptr; ENV_YREG[E_CB] = (CELL)b_ptr;
ENV_YREG[E_E] = (CELL)ENV; ENV_YREG[E_E] = (CELL)ENV;
@ -13068,7 +13069,7 @@ Yap_absmi(int inp)
ENV_YREG[-EnvSizeInCells-1] = d1; ENV_YREG[-EnvSizeInCells-1] = d1;
ENV = ENV_YREG; ENV = ENV_YREG;
ENV_YREG -= EnvSizeInCells+3; ENV_YREG -= EnvSizeInCells+3;
CPREG = NEXTOP(COMMA_CODE,Osbpp); CPREG = NEXTOP(PREG, Osbmp);
PREG = COMMA_CODE; PREG = COMMA_CODE;
/* for profiler */ /* for profiler */
save_pc(); save_pc();
@ -13147,7 +13148,7 @@ Yap_absmi(int inp)
#endif /* LOW_LEVEL_TRACER */ #endif /* LOW_LEVEL_TRACER */
WRITEBACK_Y_AS_ENV(); WRITEBACK_Y_AS_ENV();
/* setup GB */ /* setup GB */
ENV_YREG[E_CB] = (CELL) B; ENV_YREG[E_CB] = (CELL) b_ptr;
#ifdef YAPOR #ifdef YAPOR
SCH_check_requests(); SCH_check_requests();
#endif /* YAPOR */ #endif /* YAPOR */
@ -13183,6 +13184,7 @@ Yap_absmi(int inp)
} }
PP = NULL; PP = NULL;
SREG = (CELL *) pen; SREG = (CELL *) pen;
fprintf(stderr,"Here I was\n");
ASP = ENV_YREG; ASP = ENV_YREG;
if (ASP > (CELL *)PROTECT_FROZEN_B(B)) if (ASP > (CELL *)PROTECT_FROZEN_B(B))
ASP = (CELL *)PROTECT_FROZEN_B(B); ASP = (CELL *)PROTECT_FROZEN_B(B);

20
C/amasm.c
View File

@ -3976,32 +3976,14 @@ Yap_InitComma(void)
RepPredProp(PredPropByFunc(FunctorComma,0)); RepPredProp(PredPropByFunc(FunctorComma,0));
code_p->u.Osbpp.bmap = NULL; code_p->u.Osbpp.bmap = NULL;
GONEXT(Osbpp); GONEXT(Osbpp);
if (PRED_GOAL_EXPANSION_ON) {
Functor fp = FunctorGeneratePredInfo;
code_p->opc = emit_op(_call_cpred);
code_p->u.Osbpp.s = emit_count(-Signed(RealEnvSize));
code_p->u.Osbpp.p =
code_p->u.Osbpp.p0 =
RepPredProp(Yap_GetPredPropByFunc(fp,0));
code_p->u.Osbpp.bmap = NULL;
GONEXT(Osbpp);
code_p->opc = emit_op(_call);
code_p->u.Osbpp.s = emit_count(-Signed(RealEnvSize));
code_p->u.Osbpp.p =
code_p->u.Osbpp.p0 =
PredMetaCall;
code_p->u.Osbpp.bmap = NULL;
GONEXT(Osbpp);
} else {
code_p->opc = opcode(_p_execute_tail); code_p->opc = opcode(_p_execute_tail);
code_p->u.Osbmp.s = emit_count(-Signed(RealEnvSize)-3*sizeof(CELL)); code_p->u.Osbmp.s = emit_count(-Signed(RealEnvSize)-3*sizeof(CELL));
code_p->u.Osbmp.bmap = NULL; code_p->u.Osbmp.bmap = NULL;
code_p->u.Osbmp.mod = code_p->u.Osbmp.mod =
MkAtomTerm(AtomUser); MkAtomTerm(AtomUser);
code_p->u.Osbpp.p0 = code_p->u.Osbmp.p0 =
RepPredProp(PredPropByFunc(FunctorComma,0)); RepPredProp(PredPropByFunc(FunctorComma,0));
GONEXT(Osbmp); GONEXT(Osbmp);
}
code_p->opc = emit_op(_deallocate); code_p->opc = emit_op(_deallocate);
code_p->u.p.p = PredMetaCall; code_p->u.p.p = PredMetaCall;
GONEXT(p); GONEXT(p);