diff options
Diffstat (limited to 'mpfr/agm.c')
| -rw-r--r-- | mpfr/agm.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/mpfr/agm.c b/mpfr/agm.c index 12638c500..5e0ade76a 100644 --- a/mpfr/agm.c +++ b/mpfr/agm.c @@ -1,6 +1,6 @@ /* mpfr_agm -- arithmetic-geometric mean of two floating-point numbers -Copyright (C) 1999-2002 Free Software Foundation. +Copyright 1999, 2000, 2001, 2002 Free Software Foundation. This file is part of the MPFR Library. @@ -15,7 +15,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License -along with the MPFR Library; see the file COPYING.LIB. If not, write to +along with the MPFR Library; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -32,9 +32,7 @@ mpfr_agm (mpfr_ptr r, mpfr_srcptr op2, mpfr_srcptr op1, mp_rnd_t rnd_mode) double uo, vo; mp_limb_t *up, *vp, *tmpp, *tmpup, *tmpvp, *ap, *bp; mpfr_t u, v, tmp, tmpu, tmpv, a, b; - TMP_DECL(marker1); - { - TMP_DECL(marker2); + TMP_DECL(marker); /* If a or b is NaN, the result is NaN */ if (MPFR_IS_NAN(op1) || MPFR_IS_NAN(op2)) @@ -78,11 +76,10 @@ mpfr_agm (mpfr_ptr r, mpfr_srcptr op2, mpfr_srcptr op1, mp_rnd_t rnd_mode) /* Initialisations */ go_on=1; - TMP_MARK(marker1); + TMP_MARK(marker); s=(p-1)/BITS_PER_MP_LIMB+1; MPFR_INIT(ap, a, p, s); MPFR_INIT(bp, b, p, s); - TMP_MARK(marker2); MPFR_INIT(up, u, p, s); MPFR_INIT(vp, v, p, s); MPFR_INIT(tmpup, tmpu, p, s); @@ -100,6 +97,7 @@ mpfr_agm (mpfr_ptr r, mpfr_srcptr op2, mpfr_srcptr op1, mp_rnd_t rnd_mode) else if (compare == 0) { mpfr_set (r, op1, rnd_mode); + TMP_FREE(marker); return; } else @@ -108,12 +106,11 @@ mpfr_agm (mpfr_ptr r, mpfr_srcptr op2, mpfr_srcptr op1, mp_rnd_t rnd_mode) mpfr_set (a,op1,GMP_RNDN); } - vo=mpfr_get_d(b); - uo=mpfr_get_d(a); + vo = mpfr_get_d1 (b); + uo = mpfr_get_d1 (a); mpfr_set(u,a,GMP_RNDN); mpfr_set(v,b,GMP_RNDN); - /* Main loop */ @@ -151,8 +148,6 @@ mpfr_agm (mpfr_ptr r, mpfr_srcptr op2, mpfr_srcptr op1, mp_rnd_t rnd_mode) else { go_on=1; p+=5; - TMP_FREE(marker2); - TMP_MARK(marker2); s=(p-1)/BITS_PER_MP_LIMB+1; MPFR_INIT(up, u, p, s); MPFR_INIT(vp, v, p, s); @@ -167,11 +162,10 @@ mpfr_agm (mpfr_ptr r, mpfr_srcptr op2, mpfr_srcptr op1, mp_rnd_t rnd_mode) /* Setting of the result */ - mpfr_set(r,v,rnd_mode); - } + mpfr_set(r,v,rnd_mode); /* Let's clean */ - TMP_FREE(marker1); - + TMP_FREE(marker); + return ; } |