diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5912cd6d1db585fa1cd5ca9200f077504297b208..74bfa1a0ec15d34d4d794eeebcbf5d226d809126 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2005-04-09 Steven G. Kargl <kargls@comcast.net> + + * simplify.c (gfc_simplify_anint): Use mpfr_round() + (gfc_simplify_dnint): ditto. + (gfc_simplify_nint): ditto. + 2005-04-09 Andrew Pinski <pinskia@physics.uc.edu> PR fortran/13257 diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index add391f195e9c3b18e16769ee40542e9ec4ec494..e4b891697bbf2a31cde7af64e0ccf302dadc2332 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -409,9 +409,8 @@ gfc_simplify_dint (gfc_expr * e) gfc_expr * gfc_simplify_anint (gfc_expr * e, gfc_expr * k) { - gfc_expr *rtrunc, *result; - int kind, cmp; - mpfr_t half; + gfc_expr *result; + int kind; kind = get_kind (BT_REAL, k, "ANINT", e->ts.kind); if (kind == -1) @@ -422,29 +421,7 @@ gfc_simplify_anint (gfc_expr * e, gfc_expr * k) result = gfc_constant_result (e->ts.type, kind, &e->where); - rtrunc = gfc_copy_expr (e); - - cmp = mpfr_cmp_ui (e->value.real, 0); - - gfc_set_model_kind (kind); - mpfr_init (half); - mpfr_set_str (half, "0.5", 10, GFC_RND_MODE); - - if (cmp > 0) - { - mpfr_add (rtrunc->value.real, e->value.real, half, GFC_RND_MODE); - mpfr_trunc (result->value.real, rtrunc->value.real); - } - else if (cmp < 0) - { - mpfr_sub (rtrunc->value.real, e->value.real, half, GFC_RND_MODE); - mpfr_trunc (result->value.real, rtrunc->value.real); - } - else - mpfr_set_ui (result->value.real, 0, GFC_RND_MODE); - - gfc_free_expr (rtrunc); - mpfr_clear (half); + mpfr_round (result->value.real, e->value.real); return range_check (result, "ANINT"); } @@ -453,39 +430,14 @@ gfc_simplify_anint (gfc_expr * e, gfc_expr * k) gfc_expr * gfc_simplify_dnint (gfc_expr * e) { - gfc_expr *rtrunc, *result; - int cmp; - mpfr_t half; + gfc_expr *result; if (e->expr_type != EXPR_CONSTANT) return NULL; - result = - gfc_constant_result (BT_REAL, gfc_default_double_kind, &e->where); - - rtrunc = gfc_copy_expr (e); + result = gfc_constant_result (BT_REAL, gfc_default_double_kind, &e->where); - cmp = mpfr_cmp_ui (e->value.real, 0); - - gfc_set_model_kind (gfc_default_double_kind); - mpfr_init (half); - mpfr_set_str (half, "0.5", 10, GFC_RND_MODE); - - if (cmp > 0) - { - mpfr_add (rtrunc->value.real, e->value.real, half, GFC_RND_MODE); - mpfr_trunc (result->value.real, rtrunc->value.real); - } - else if (cmp < 0) - { - mpfr_sub (rtrunc->value.real, e->value.real, half, GFC_RND_MODE); - mpfr_trunc (result->value.real, rtrunc->value.real); - } - else - mpfr_set_ui (result->value.real, 0, GFC_RND_MODE); - - gfc_free_expr (rtrunc); - mpfr_clear (half); + mpfr_round (result->value.real, e->value.real); return range_check (result, "DNINT"); } @@ -2378,9 +2330,8 @@ gfc_simplify_nearest (gfc_expr * x, gfc_expr * s) static gfc_expr * simplify_nint (const char *name, gfc_expr * e, gfc_expr * k) { - gfc_expr *rtrunc, *itrunc, *result; - int kind, cmp; - mpfr_t half; + gfc_expr *itrunc, *result; + int kind; kind = get_kind (BT_INTEGER, k, name, gfc_default_integer_kind); if (kind == -1) @@ -2391,33 +2342,13 @@ simplify_nint (const char *name, gfc_expr * e, gfc_expr * k) result = gfc_constant_result (BT_INTEGER, kind, &e->where); - rtrunc = gfc_copy_expr (e); itrunc = gfc_copy_expr (e); - cmp = mpfr_cmp_ui (e->value.real, 0); - - gfc_set_model (e->value.real); - mpfr_init (half); - mpfr_set_str (half, "0.5", 10, GFC_RND_MODE); - - if (cmp > 0) - { - mpfr_add (rtrunc->value.real, e->value.real, half, GFC_RND_MODE); - mpfr_trunc (itrunc->value.real, rtrunc->value.real); - } - else if (cmp < 0) - { - mpfr_sub (rtrunc->value.real, e->value.real, half, GFC_RND_MODE); - mpfr_trunc (itrunc->value.real, rtrunc->value.real); - } - else - mpfr_set_ui (itrunc->value.real, 0, GFC_RND_MODE); + mpfr_round(itrunc->value.real, e->value.real); gfc_mpfr_to_mpz (result->value.integer, itrunc->value.real); gfc_free_expr (itrunc); - gfc_free_expr (rtrunc); - mpfr_clear (half); return range_check (result, name); }