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

avoid unnecessary slot ops

Browse Source 
drop repeated code
This commit is contained in:
Vitor Santos Costa 2016-07-30 23:23:06 -05:00
parent 1da507902c
commit 5606410a64
1 changed files with 51 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
C/exec.c
View File

@ -143,7 +143,7 @@ Term Yap_PredicateIndicator(Term t, Term mod) {
CACHE_REGS CACHE_REGS
// generate predicate indicator in this case // generate predicate indicator in this case
Term ti[2]; Term ti[2];
t = Yap_StripModule(t, &mod); t = Yap_YapStripModule(t, &mod);
if (IsApplTerm(t) && !IsExtensionFunctor(FunctorOfTerm(t))) { if (IsApplTerm(t) && !IsExtensionFunctor(FunctorOfTerm(t))) {
ti[0] = MkAtomTerm(NameOfFunctor(FunctorOfTerm(t))); ti[0] = MkAtomTerm(NameOfFunctor(FunctorOfTerm(t)));
ti[1] = MkIntegerTerm(ArityOfFunctor(FunctorOfTerm(t))); ti[1] = MkIntegerTerm(ArityOfFunctor(FunctorOfTerm(t)));
@ -168,7 +168,7 @@ static bool CallError(yap_error_number err, Term t, Term mod USES_REGS) {
return (CallMetaCall(t, mod PASS_REGS)); return (CallMetaCall(t, mod PASS_REGS));
} else { } else {
if (err == TYPE_ERROR_CALLABLE) { if (err == TYPE_ERROR_CALLABLE) {
t = Yap_StripModule(t, &mod); t = Yap_YapStripModule(t, &mod);
} }
Yap_Error(err, t, "call/1"); Yap_Error(err, t, "call/1");
return false; return false;
@ -209,7 +209,6 @@ static Int save_env_b(USES_REGS1) {
return true; return true;
} }
inline static bool do_execute(Term t, Term mod USES_REGS) { inline static bool do_execute(Term t, Term mod USES_REGS) {
Term t0 = t; Term t0 = t;
t = Yap_YapStripModule(t, &mod); t = Yap_YapStripModule(t, &mod);
@ -964,22 +963,26 @@ static Int setup_call_catcher_cleanup(USES_REGS1) {
yhandle_t h4 = Yap_InitHandle(ARG4); yhandle_t h4 = Yap_InitHandle(ARG4);
yamop *oCP = CP, *oP = P; yamop *oCP = CP, *oP = P;
bool rc; bool rc;
execution_port port;
Yap_DisableInterrupts(worker_id); Yap_DisableInterrupts(worker_id);
rc = Yap_RunTopGoal(Setup, false); rc = Yap_RunTopGoal(Setup, false);
Yap_EnableInterrupts(worker_id); Yap_EnableInterrupts(worker_id);
if (Yap_RaiseException()) { if (Yap_RaiseException()) {
return false; return false;
} }
if (!rc) { if (!rc) {
complete_inner_computation(B0); complete_inner_computation(B0);
// We'll pass it through // We'll pass it through
return false; return false;
} else { } else {
prune_inner_computation(B0); prune_inner_computation(B0);
} }
// at this point starts actual goal execution.... // at this point starts actual goal execution....
cmod = CurrentModule; cmod = CurrentModule;
rc = Yap_RunTopGoal(Yap_GetFromSlot(h2), false); rc = Yap_RunTopGoal(Yap_GetFromSlot(h2), false);
complete_inner_computation(B); complete_inner_computation(B);
t4 = Yap_GetFromSlot(h4); t4 = Yap_GetFromSlot(h4);
@ -987,7 +990,6 @@ static Int setup_call_catcher_cleanup(USES_REGS1) {
// make sure that t3 point to our nice cell. // make sure that t3 point to our nice cell.
Yap_CloseSlots(hl); Yap_CloseSlots(hl);
execution_port port;
if (rc) { if (rc) {
// ignore empty choice // ignore empty choice
while (B->cp_ap->opc == FAIL_OPCODE) while (B->cp_ap->opc == FAIL_OPCODE)
@ -1014,8 +1016,9 @@ static Int setup_call_catcher_cleanup(USES_REGS1) {
CP = oCP; CP = oCP;
ENV = LCL0 - oENV; ENV = LCL0 - oENV;
} }
if (Yap_RaiseException()) if (Yap_RaiseException()) {
return false; return false;
}
return rc; return rc;
} }
@ -1094,7 +1097,8 @@ static Int do_term_expansion(USES_REGS1) {
/* user:term_expansion(A,B) */ /* user:term_expansion(A,B) */
ARG1 = g; ARG1 = g;
if ((pe = RepPredProp(Yap_GetPredPropByFunc(FunctorTermExpansion, USER_MODULE))) && if ((pe = RepPredProp(
Yap_GetPredPropByFunc(FunctorTermExpansion, USER_MODULE))) &&
pe->OpcodeOfPred != FAIL_OPCODE && pe->OpcodeOfPred != UNDEF_OPCODE && pe->OpcodeOfPred != FAIL_OPCODE && pe->OpcodeOfPred != UNDEF_OPCODE &&
Yap_execute_pred(pe, NULL, false PASS_REGS)) { Yap_execute_pred(pe, NULL, false PASS_REGS)) {
return complete_ge(true, omod, sl, creeping); return complete_ge(true, omod, sl, creeping);
@ -1266,39 +1270,9 @@ restart_exec:
} }
} }
static Term slice_module_for_call_with_args(Term tin, Term *modp, int arity) {
if (IsVarTerm(tin)) {
Yap_Error(INSTANTIATION_ERROR, tin, "call_with_args/%d", arity);
return 0L;
}
while (IsApplTerm(tin)) {
Functor f = FunctorOfTerm(tin);
Term newmod;
if (f != FunctorModule) {
Yap_Error(TYPE_ERROR_ATOM, tin, "call_with_args/%d", arity);
return 0L;
}
newmod = ArgOfTerm(1, tin);
if (IsVarTerm(newmod)) {
Yap_Error(INSTANTIATION_ERROR, tin, "call_with_args/%d", arity);
return 0L;
} else if (!IsAtomTerm(newmod)) {
Yap_Error(TYPE_ERROR_ATOM, newmod, "call_with_args/%d", arity);
return 0L;
}
*modp = newmod;
tin = ArgOfTerm(2, tin);
}
if (!IsAtomTerm(tin)) {
Yap_Error(TYPE_ERROR_ATOM, tin, "call_with_args/%d", arity);
return 0L;
}
return tin;
}
static Int execute_0(USES_REGS1) { /* '$execute_0'(Goal) */ static Int execute_0(USES_REGS1) { /* '$execute_0'(Goal) */
Term mod = CurrentModule; Term mod = CurrentModule;
Term t = slice_module_for_call_with_args(Deref(ARG1), &mod, 0); Term t = Yap_YapStripModule(Deref(ARG1), &mod);
if (t == 0) if (t == 0)
return false; return false;
return do_execute(t, mod PASS_REGS); return do_execute(t, mod PASS_REGS);
@ -1308,7 +1282,7 @@ static bool call_with_args(int i USES_REGS) {
Term mod = CurrentModule, t; Term mod = CurrentModule, t;
int j; int j;
t = slice_module_for_call_with_args(Deref(ARG1), &mod, i); t = Yap_YapStripModule(Deref(ARG1), &mod);
if (t == 0) if (t == 0)
return false; return false;
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
@ -1702,10 +1676,11 @@ Term Yap_RunTopGoal(Term t, bool handle_errors) {
PredEntry *ppe; PredEntry *ppe;
CELL *pt; CELL *pt;
UInt arity; UInt arity;
Term mod = CurrentModule; Term tmod = CurrentModule;
Term goal_out = 0; Term goal_out = 0;
LOCAL_PrologMode |= TopGoalMode; LOCAL_PrologMode |= TopGoalMode;
t = Yap_YapStripModule(t, &tmod);
restart_runtopgoal: restart_runtopgoal:
if (IsVarTerm(t)) { if (IsVarTerm(t)) {
Yap_Error(INSTANTIATION_ERROR, t, "call/1"); Yap_Error(INSTANTIATION_ERROR, t, "call/1");
@ -1714,7 +1689,7 @@ restart_runtopgoal:
} else if (IsAtomTerm(t)) { } else if (IsAtomTerm(t)) {
Atom a = AtomOfTerm(t); Atom a = AtomOfTerm(t);
pt = NULL; pt = NULL;
pe = PredPropByAtom(a, CurrentModule); pe = Yap_GetPredPropByAtom(a, tmod);
arity = 0; arity = 0;
} else if (IsApplTerm(t)) { } else if (IsApplTerm(t)) {
Functor f = FunctorOfTerm(t); Functor f = FunctorOfTerm(t);
@ -1724,38 +1699,37 @@ restart_runtopgoal:
LOCAL_PrologMode &= ~TopGoalMode; LOCAL_PrologMode &= ~TopGoalMode;
return (FALSE); return (FALSE);
} }
if (f == FunctorModule) {
Term tmod = ArgOfTerm(1, t);
if (!IsVarTerm(tmod) && IsAtomTerm(tmod)) {
mod = tmod;
t = ArgOfTerm(2, t);
goto restart_runtopgoal;
} else {
if (IsVarTerm(tmod)) {
Yap_Error(INSTANTIATION_ERROR, t, "call/1");
} else {
Yap_Error(TYPE_ERROR_ATOM, t, "call/1");
}
LOCAL_PrologMode &= ~TopGoalMode;
return FALSE;
}
}
/* I cannot use the standard macro here because /* I cannot use the standard macro here because
otherwise I would dereference the argument and otherwise I would dereference the argument and
might skip a svar */ might skip a svar */
pe = PredPropByFunc(f, mod); pe = Yap_GetPredPropByFunc(f, tmod);
pt = RepAppl(t) + 1; pt = RepAppl(t) + 1;
arity = ArityOfFunctor(f); arity = ArityOfFunctor(f);
} else { } else {
Yap_Error(TYPE_ERROR_CALLABLE, Yap_PredicateIndicator(t, mod), "call/1"); Yap_Error(TYPE_ERROR_CALLABLE, Yap_PredicateIndicator(t, tmod), "call/1");
LOCAL_PrologMode &= ~TopGoalMode; LOCAL_PrologMode &= ~TopGoalMode;
return (FALSE); return (FALSE);
} }
ppe = RepPredProp(pe); ppe = RepPredProp(pe);
if (pe == NIL) { if (pe == NIL || ppe->cs.p_code.TrueCodeOfPred->opc == UNDEF_OPCODE) {
/* we must always start the emulator with Prolog code */ pe = AbsPredProp(ppe = UndefCode);
LOCAL_PrologMode &= ~TopGoalMode; pt = HR;
return FALSE; HR[0] = MkPairTerm(tmod, t);
HR[1] = MkAtomTerm(Yap_LookupAtom("top"));
arity = 2;
HR += 2;
} else if (ppe->PredFlags & MetaPredFlag) {
// we're in a meta-call, rake care about modules
//
Term ts[2];
ts[0] = tmod;
ts[1] = t;
Functor f = Yap_MkFunctor(Yap_LookupAtom("call"), 1);
pt = &t;
t = Yap_MkApplTerm(FunctorModule, 2, ts);
pe = Yap_GetPredPropByFunc(f, tmod);
arity = 1;
} }
PELOCK(82, ppe); PELOCK(82, ppe);
CodeAdr = ppe->CodeOfPred; CodeAdr = ppe->CodeOfPred;
@ -2003,8 +1977,9 @@ static Int JumpToEnv() {
Term t = Yap_GetException(); Term t = Yap_GetException();
if (t == 0) { if (t == 0) {
return false; return false;
} else if (IsVarTerm(t)) {
t = Yap_MkApplTerm(FunctorGVar, 1, &t);
} }
t = Yap_MkApplTerm(FunctorThrow, 1, &t);
B->cp_h = HR; B->cp_h = HR;
HB = HR; HB = HR;
Yap_unify(t, B->cp_a2); Yap_unify(t, B->cp_a2);
@ -2085,7 +2060,6 @@ void Yap_InitYaamRegs(int myworker_id) {
HR = RepAppl(REMOTE_GlobalArena(myworker_id)); HR = RepAppl(REMOTE_GlobalArena(myworker_id));
} }
REMOTE_GlobalArena(myworker_id) = TermNil; REMOTE_GlobalArena(myworker_id) = TermNil;
Yap_AllocateDefaultArena(128 * 1024, 2, myworker_id);
Yap_InitPreAllocCodeSpace(myworker_id); Yap_InitPreAllocCodeSpace(myworker_id);
#ifdef FROZEN_STACKS #ifdef FROZEN_STACKS
H_FZ = HR; H_FZ = HR;
@ -2117,8 +2091,18 @@ void Yap_InitYaamRegs(int myworker_id) {
PP = NULL; PP = NULL;
PREG_ADDR = NULL; PREG_ADDR = NULL;
#endif #endif
Yap_AllocateDefaultArena(128 * 1024, 2, myworker_id);
cut_c_initialize(myworker_id); cut_c_initialize(myworker_id);
Yap_PrepGoal(0, NULL, NULL PASS_REGS); Yap_PrepGoal(0, NULL, NULL PASS_REGS);
#ifdef FROZEN_STACKS
H_FZ = HR;
#ifdef YAPOR_SBA
BSEG =
#endif /* YAPOR_SBA */
BBREG = B_FZ = (choiceptr)REMOTE_LocalBase(myworker_id);
TR = TR_FZ = (tr_fr_ptr)REMOTE_TrailBase(myworker_id);
#endif /* FROZEN_STACKS */
CalculateStackGap(PASS_REGS1);
#ifdef TABLING #ifdef TABLING
/* ensure that LOCAL_top_dep_fr is always valid */ /* ensure that LOCAL_top_dep_fr is always valid */
if (REMOTE_top_dep_fr(myworker_id)) if (REMOTE_top_dep_fr(myworker_id))