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

make Yap_Eval only on entry.

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-05-16 22:41:44 -07:00
parent 1058a350c6
commit 8e7695a42c
2 changed files with 39 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
C/absmi.c
View File

@ -9638,7 +9638,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_plus(d0, d1); d0 = p_plus(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -9679,7 +9679,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_plus(d0, MkIntegerTerm(d1)); d0 = p_plus(Yap_Eval(d0), MkIntegerTerm(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -9716,7 +9716,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_plus(d0, d1); d0 = p_plus(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -9764,7 +9764,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_plus(d0, MkIntegerTerm(d1)); d0 = p_plus(Yap_Eval(d0), MkIntegerTerm(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -9808,7 +9808,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_minus(d0, d1); d0 = p_minus(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -9849,7 +9849,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_minus(MkIntegerTerm(d1),d0); d0 = p_minus(MkIntegerTerm(d1),Yap_Eval(d0));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -9886,7 +9886,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_minus(d0, d1); d0 = p_minus(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -9934,7 +9934,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_minus(MkIntegerTerm(d1), d0); d0 = p_minus(MkIntegerTerm(d1), Yap_Eval(d0));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -9978,7 +9978,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_times(d0, d1); d0 = p_times(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10019,7 +10019,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_times(d0, MkIntegerTerm(d1)); d0 = p_times(Yap_Eval(d0), MkIntegerTerm(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10056,7 +10056,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_times(d0, d1); d0 = p_times(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10104,7 +10104,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_times(d0, MkIntegerTerm(d1)); d0 = p_times(Yap_Eval(d0), MkIntegerTerm(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10155,7 +10155,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_div(d0, d1); d0 = p_div(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10196,7 +10196,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_div(d0,MkIntegerTerm(d1)); d0 = p_div(Yap_Eval(d0),MkIntegerTerm(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10236,7 +10236,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_div(MkIntegerTerm(d1),d0); d0 = p_div(MkIntegerTerm(d1),Yap_Eval(d0));
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
} }
@ -10279,7 +10279,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_div(d0, d1); d0 = p_div(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10327,7 +10327,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_div(d0,MkIntegerTerm(d1)); d0 = p_div(Yap_Eval(d0),MkIntegerTerm(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10374,7 +10374,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_div(MkIntegerTerm(d1), d0); d0 = p_div(MkIntegerTerm(d1), Yap_Eval(d0));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10419,7 +10419,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_and(d0, d1); d0 = p_and(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10460,7 +10460,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_and(d0, MkIntegerTerm(d1)); d0 = p_and(Yap_Eval(d0), MkIntegerTerm(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10497,7 +10497,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_and(d0, d1); d0 = p_and(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10545,7 +10545,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_and(d0, MkIntegerTerm(d1)); d0 = p_and(Yap_Eval(d0), MkIntegerTerm(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10590,7 +10590,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_or(d0, d1); d0 = p_or(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10631,7 +10631,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_or(d0, MkIntegerTerm(d1)); d0 = p_or(Yap_Eval(d0), MkIntegerTerm(d1));
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
} }
@ -10667,7 +10667,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_or(d0, d1); d0 = p_or(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10715,7 +10715,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_or(d0, MkIntegerTerm(d1)); d0 = p_or(Yap_Eval(d0), MkIntegerTerm(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -10763,7 +10763,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_sll(d0, d1); d0 = p_sll(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
} }
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
@ -10804,7 +10804,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_sll(d0, MkIntegerTerm(d1)); d0 = p_sll(Yap_Eval(d0), MkIntegerTerm(d1));
setregs(); setregs();
} }
} }
@ -10841,7 +10841,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_sll(MkIntegerTerm(d1), d0); d0 = p_sll(MkIntegerTerm(d1), Yap_Eval(d0));
setregs(); setregs();
} }
} }
@ -10882,7 +10882,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_sll(d0, d1); d0 = p_sll(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
} }
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
@ -10926,11 +10926,11 @@ Yap_absmi(int inp)
{ {
Int d1 = PREG->u.yxn.c; Int d1 = PREG->u.yxn.c;
if (IsIntTerm(d0)) { if (IsIntTerm(d0)) {
d0 = do_sll(IntOfTerm(d0), d1); d0 = do_sll(IntOfTerm(d0), Yap_Eval(d1));
} }
else { else {
saveregs(); saveregs();
d0 = p_sll(d0, MkIntegerTerm(d1)); d0 = p_sll(Yap_Eval(d0), MkIntegerTerm(d1));
setregs(); setregs();
} }
} }
@ -10975,7 +10975,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_sll(MkIntegerTerm(d1), d0); d0 = p_sll(MkIntegerTerm(d1), Yap_Eval(0));
setregs(); setregs();
} }
} }
@ -11023,7 +11023,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_slr(d0, d1); d0 = p_slr(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
} }
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
@ -11064,7 +11064,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_slr(d0, MkIntegerTerm(d1)); d0 = p_slr(Yap_Eval(d0), MkIntegerTerm(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -11101,7 +11101,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_slr(MkIntegerTerm(d1), d0); d0 = p_slr(MkIntegerTerm(d1), Yap_Eval(d0));
setregs(); setregs();
} }
} }
@ -11142,7 +11142,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_slr(d0, d1); d0 = p_slr(Yap_Eval(d0), Yap_Eval(d1));
setregs(); setregs();
} }
BEGP(pt0); BEGP(pt0);
@ -11190,7 +11190,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_slr(d0, MkIntegerTerm(d1)); d0 = p_slr(Yap_Eval(d0), MkIntegerTerm(d1));
setregs(); setregs();
if (PREG == (yamop *)FAILCODE) if (PREG == (yamop *)FAILCODE)
FAIL(); FAIL();
@ -11233,7 +11233,7 @@ Yap_absmi(int inp)
} }
else { else {
saveregs(); saveregs();
d0 = p_slr(MkIntegerTerm(d1), d0); d0 = p_slr(MkIntegerTerm(d1), Yap_Eval(d0));
setregs(); setregs();
} }
} }

16
H/arith2.h
View File

@ -141,8 +141,6 @@ do_sll(Int i, Int j)
static inline Term static inline Term
p_plus(Term t1, Term t2) { p_plus(Term t1, Term t2) {
t1 = Yap_Eval(t1);
t2 = Yap_Eval(t2);
switch (ETypeOfTerm(t1)) { switch (ETypeOfTerm(t1)) {
case long_int_e: case long_int_e:
switch (ETypeOfTerm(t2)) { switch (ETypeOfTerm(t2)) {
@ -199,8 +197,6 @@ p_plus(Term t1, Term t2) {
static Term static Term
p_minus(Term t1, Term t2) { p_minus(Term t1, Term t2) {
t1 = Yap_Eval(t1);
t2 = Yap_Eval(t2);
switch (ETypeOfTerm(t1)) { switch (ETypeOfTerm(t1)) {
case long_int_e: case long_int_e:
switch (ETypeOfTerm(t2)) { switch (ETypeOfTerm(t2)) {
@ -261,8 +257,6 @@ p_minus(Term t1, Term t2) {
static Term static Term
p_times(Term t1, Term t2) { p_times(Term t1, Term t2) {
t1 = Yap_Eval(t1);
t2 = Yap_Eval(t2);
switch (ETypeOfTerm(t1)) { switch (ETypeOfTerm(t1)) {
case long_int_e: case long_int_e:
switch (ETypeOfTerm(t2)) { switch (ETypeOfTerm(t2)) {
@ -321,8 +315,6 @@ p_times(Term t1, Term t2) {
static Term static Term
p_div(Term t1, Term t2) { p_div(Term t1, Term t2) {
t1 = Yap_Eval(t1);
t2 = Yap_Eval(t2);
switch (ETypeOfTerm(t1)) { switch (ETypeOfTerm(t1)) {
case long_int_e: case long_int_e:
switch (ETypeOfTerm(t2)) { switch (ETypeOfTerm(t2)) {
@ -411,8 +403,6 @@ p_div(Term t1, Term t2) {
static Term static Term
p_and(Term t1, Term t2) { p_and(Term t1, Term t2) {
t1 = Yap_Eval(t1);
t2 = Yap_Eval(t2);
switch (ETypeOfTerm(t1)) { switch (ETypeOfTerm(t1)) {
case long_int_e: case long_int_e:
switch (ETypeOfTerm(t2)) { switch (ETypeOfTerm(t2)) {
@ -461,8 +451,6 @@ p_and(Term t1, Term t2) {
static Term static Term
p_or(Term t1, Term t2) { p_or(Term t1, Term t2) {
t1 = Yap_Eval(t1);
t2 = Yap_Eval(t2);
switch(ETypeOfTerm(t1)) { switch(ETypeOfTerm(t1)) {
case long_int_e: case long_int_e:
switch (ETypeOfTerm(t2)) { switch (ETypeOfTerm(t2)) {
@ -511,8 +499,6 @@ p_or(Term t1, Term t2) {
static Term static Term
p_sll(Term t1, Term t2) { p_sll(Term t1, Term t2) {
t1 = Yap_Eval(t1);
t2 = Yap_Eval(t2);
switch (ETypeOfTerm(t1)) { switch (ETypeOfTerm(t1)) {
case long_int_e: case long_int_e:
switch (ETypeOfTerm(t2)) { switch (ETypeOfTerm(t2)) {
@ -580,8 +566,6 @@ p_sll(Term t1, Term t2) {
static Term static Term
p_slr(Term t1, Term t2) { p_slr(Term t1, Term t2) {
t1 = Yap_Eval(t1);
t2 = Yap_Eval(t2);
switch (ETypeOfTerm(t1)) { switch (ETypeOfTerm(t1)) {
case long_int_e: case long_int_e:
switch (ETypeOfTerm(t2)) { switch (ETypeOfTerm(t2)) {