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

Change to simpler Eval mechanism

Browse Source 
- avoid duplicate code
- implement different optimised code.
This commit is contained in:
Vítor Santos Costa
2008-12-04 23:33:32 +00:00
parent 13dd600f88
commit e737599dc4
14 changed files with 2563 additions and 5521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
C/gmp_support.c
View File

@@ -22,214 +22,250 @@
#if USE_GMP
/* add i + j using temporary bigint new */
MP_INT *
Yap_gmp_add_ints(Int i, Int j, MP_INT *new)
Term
Yap_gmp_add_ints(Int i, Int j)
{
mpz_init_set_si(new,i);
MP_INT new;
mpz_init_set_si(&new,i);
if (j > 0) {
mpz_add_ui(new, new, j);
mpz_add_ui(&new, &new, j);
} else {
if (j-1 > 0) { /* negative overflow */
mpz_sub_ui(new, new, -(j+1));
mpz_sub_ui(new, new, 1);
mpz_sub_ui(&new, &new, -(j+1));
mpz_sub_ui(&new, &new, 1);
} else {
mpz_sub_ui(new, new, -j);
mpz_sub_ui(&new, &new, -j);
}
}
return new;
return Yap_MkBigIntTerm(&new);
}
MP_INT *
Yap_gmp_sub_ints(Int i, Int j, MP_INT *new)
Term
Yap_gmp_sub_ints(Int i, Int j)
{
mpz_init_set_si(new,i);
MP_INT new;
mpz_init_set_si(&new,i);
if (j > 0) {
mpz_sub_ui(new, new, j);
mpz_sub_ui(&new, &new, j);
} else {
if (j-1 > 0) { /* negative overflow */
mpz_add_ui(new, new, -(j+1));
mpz_add_ui(new, new, 1);
mpz_add_ui(&new, &new, -(j+1));
mpz_add_ui(&new, &new, 1);
} else {
mpz_add_ui(new, new, -j);
mpz_add_ui(&new, &new, -j);
}
}
return new;
return Yap_MkBigIntTerm(&new);
}
MP_INT *
Yap_gmp_mul_ints(Int i, Int j, MP_INT *new)
Term
Yap_gmp_mul_ints(Int i, Int j)
{
mpz_init_set_si(new,i);
mpz_mul_si(new, new, j);
return new;
MP_INT new;
mpz_init_set_si(&new,i);
mpz_mul_si(&new, &new, j);
return Yap_MkBigIntTerm(&new);
}
MP_INT *
Yap_gmp_sll_ints(Int i, Int j, MP_INT *new)
Term
Yap_gmp_sll_ints(Int i, Int j)
{
mpz_init_set_si(new,i);
mpz_mul_2exp(new, new, j);
return new;
MP_INT new;
mpz_init_set_si(&new,i);
mpz_mul_2exp(&new, &new, j);
return Yap_MkBigIntTerm(&new);
}
/* add i + b using temporary bigint new */
MP_INT *
Yap_gmp_add_int_big(Int i, MP_INT *b, MP_INT *new)
Term
Yap_gmp_add_int_big(Int i, MP_INT *b)
{
mpz_init_set_si(new, i);
mpz_add(new, new, b);
return new;
MP_INT new;
mpz_init_set_si(&new, i);
mpz_add(&new, &new, b);
return Yap_MkBigIntTerm(&new);
}
/* sub i - b using temporary bigint new */
MP_INT *
Yap_gmp_sub_int_big(Int i, MP_INT *b, MP_INT *new)
Term
Yap_gmp_sub_int_big(Int i, MP_INT *b)
{
mpz_init_set_si(new, i);
mpz_sub(new, new, b);
return new;
MP_INT new;
mpz_init_set_si(&new, i);
mpz_sub(&new, &new, b);
return Yap_MkBigIntTerm(&new);
}
/* add i + b using temporary bigint new */
MP_INT *
Yap_gmp_mul_int_big(Int i, MP_INT *b, MP_INT *new)
Term
Yap_gmp_mul_int_big(Int i, MP_INT *b)
{
mpz_init_set_si(new, i);
mpz_mul(new, new, b);
return new;
MP_INT new;
mpz_init_set_si(&new, i);
mpz_mul(&new, &new, b);
return Yap_MkBigIntTerm(&new);
}
/* sub i - b using temporary bigint new */
MP_INT *
Yap_gmp_sub_big_int(MP_INT *b, Int i, MP_INT *new)
Term
Yap_gmp_sub_big_int(MP_INT *b, Int i)
{
mpz_init_set_si(new, i);
mpz_neg(new, new);
mpz_add(new, new, b);
return new;
MP_INT new;
mpz_init_set_si(&new, i);
mpz_neg(&new, &new);
mpz_add(&new, &new, b);
return Yap_MkBigIntTerm(&new);
}
/* div i / b using temporary bigint new */
MP_INT *
Yap_gmp_div_big_int(MP_INT *b, Int i, MP_INT *new)
Term
Yap_gmp_div_big_int(MP_INT *b, Int i)
{
MP_INT new;
mpz_init_set(new, b);
mpz_init_set(&new, b);
if (yap_flags[INTEGER_ROUNDING_FLAG] == 0) {
if (i > 0) {
mpz_fdiv_q_ui(new, new, i);
mpz_fdiv_q_ui(&new, &new, i);
} else if (i == 0) {
Yap_Error(EVALUATION_ERROR_ZERO_DIVISOR, MkIntTerm(0), "// /2");
return NULL;
return 0L;
} else {
/* we do not handle MIN_INT */
mpz_fdiv_q_ui(new, new, -i);
mpz_neg(new, new);
mpz_fdiv_q_ui(&new, &new, -i);
mpz_neg(&new, &new);
}
} else {
if (i > 0) {
mpz_tdiv_q_ui(new, new, i);
mpz_tdiv_q_ui(&new, &new, i);
} else if (i == 0) {
Yap_Error(EVALUATION_ERROR_ZERO_DIVISOR, MkIntTerm(0), "// /2");
return NULL;
return 0L;
} else {
/* we do not handle MIN_INT */
mpz_tdiv_q_ui(new, new, -i);
mpz_neg(new, new);
mpz_tdiv_q_ui(&new, &new, -i);
mpz_neg(&new, &new);
}
}
return new;
return Yap_MkBigIntTerm(&new);
}
/* sub i - b using temporary bigint new */
MP_INT *
Yap_gmp_and_int_big(Int i, MP_INT *b, MP_INT *new)
Term
Yap_gmp_and_int_big(Int i, MP_INT *b)
{
mpz_init_set_si(new, i);
mpz_and(new, new, b);
return new;
MP_INT new;
mpz_init_set_si(&new, i);
mpz_and(&new, &new, b);
return Yap_MkBigIntTerm(&new);
}
/* sub i - b using temporary bigint new */
MP_INT *
Yap_gmp_ior_int_big(Int i, MP_INT *b, MP_INT *new)
Term
Yap_gmp_ior_int_big(Int i, MP_INT *b)
{
mpz_init_set_si(new, i);
mpz_ior(new, new, b);
return new;
MP_INT new;
mpz_init_set_si(&new, i);
mpz_ior(&new, &new, b);
return Yap_MkBigIntTerm(&new);
}
/* add i + b using temporary bigint new */
MP_INT *
Yap_gmp_sll_big_int(MP_INT *b, Int i, MP_INT *new)
Term
Yap_gmp_sll_big_int(MP_INT *b, Int i)
{
MP_INT new;
if (i > 0) {
mpz_init_set(new, b);
mpz_mul_2exp(new, new, i);
mpz_init_set(&new, b);
mpz_mul_2exp(&new, &new, i);
} else if (i == 0) {
mpz_init_set(new, b);
mpz_init_set(&new, b);
} else {
mpz_init_set(new, b);
mpz_init_set(&new, b);
if (i == Int_MIN) {
return NULL;
return 0L;
}
mpz_tdiv_q_2exp(new, new, -i);
mpz_tdiv_q_2exp(&new, &new, -i);
}
return new;
return Yap_MkBigIntTerm(&new);
}
MP_INT *
Yap_gmp_add_big_big(MP_INT *b1, MP_INT *b2, MP_INT *new)
Term
Yap_gmp_add_big_big(MP_INT *b1, MP_INT *b2)
{
mpz_init_set(new, b1);
mpz_add(new, new, b2);
return new;
MP_INT new;
mpz_init_set(&new, b1);
mpz_add(&new, &new, b2);
return Yap_MkBigIntTerm(&new);
}
MP_INT *
Yap_gmp_sub_big_big(MP_INT *b1, MP_INT *b2, MP_INT *new)
Term
Yap_gmp_sub_big_big(MP_INT *b1, MP_INT *b2)
{
mpz_init_set(new, b1);
mpz_sub(new, new, b2);
return new;
MP_INT new;
mpz_init_set(&new, b1);
mpz_sub(&new, &new, b2);
return Yap_MkBigIntTerm(&new);
}
MP_INT *
Yap_gmp_mul_big_big(MP_INT *b1, MP_INT *b2, MP_INT *new)
Term
Yap_gmp_mul_big_big(MP_INT *b1, MP_INT *b2)
{
mpz_init_set(new, b1);
mpz_mul(new, new, b2);
return new;
MP_INT new;
mpz_init_set(&new, b1);
mpz_mul(&new, &new, b2);
return Yap_MkBigIntTerm(&new);
}
/* div i / b using temporary bigint new */
MP_INT *
Yap_gmp_div_big_big(MP_INT *b1, MP_INT *b2, MP_INT *new)
Term
Yap_gmp_div_big_big(MP_INT *b1, MP_INT *b2)
{
MP_INT new;
mpz_init_set(new, b1);
mpz_init_set(&new, b1);
if (yap_flags[INTEGER_ROUNDING_FLAG] == 0) {
mpz_fdiv_q(new, new, b2);
mpz_fdiv_q(&new, &new, b2);
} else {
mpz_tdiv_q(new, new, b2);
mpz_tdiv_q(&new, &new, b2);
}
return new;
return Yap_MkBigIntTerm(&new);
}
MP_INT *
Yap_gmp_and_big_big(MP_INT *b1, MP_INT *b2, MP_INT *new)
Term
Yap_gmp_and_big_big(MP_INT *b1, MP_INT *b2)
{
mpz_init_set(new, b1);
mpz_and(new, new, b2);
return new;
MP_INT new;
mpz_init_set(&new, b1);
mpz_and(&new, &new, b2);
return Yap_MkBigIntTerm(&new);
}
MP_INT *
Yap_gmp_ior_big_big(MP_INT *b1, MP_INT *b2, MP_INT *new)
Term
Yap_gmp_ior_big_big(MP_INT *b1, MP_INT *b2)
{
mpz_init_set(new, b1);
mpz_ior(new, new, b2);
return new;
MP_INT new;
mpz_init_set(&new, b1);
mpz_ior(&new, &new, b2);
return Yap_MkBigIntTerm(&new);
}
Float