From 4646f388cb3aa3d3435a08c7bdacab16e9530137 Mon Sep 17 00:00:00 2001 From: enge Date: Thu, 5 Jul 2012 08:35:35 +0000 Subject: rename RNDC to MPC_RND in mpc.h git-svn-id: svn://scm.gforge.inria.fr/svn/mpc/trunk@1223 211d60ee-9f03-0410-a15a-8952a2c7a4e4 --- src/acos.c | 4 ++-- src/acosh.c | 6 +++--- src/asinh.c | 4 ++-- src/atanh.c | 4 ++-- src/log10.c | 4 ++-- src/mpc.h | 40 ++++++++++++++++++++-------------------- src/sinh.c | 4 ++-- src/tanh.c | 4 ++-- tests/read_data.c | 4 ++-- tests/tfma.c | 2 +- tests/tgeneric.c | 24 ++++++++++++------------ tests/tmul.c | 2 +- 12 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/acos.c b/src/acos.c index 2832125..ca3d19f 100644 --- a/src/acos.c +++ b/src/acos.c @@ -1,6 +1,6 @@ /* mpc_acos -- arccosine of a complex number. -Copyright (C) 2009, 2010, 2011 INRIA +Copyright (C) 2009, 2010, 2011, 2012 INRIA This file is part of GNU MPC. @@ -186,7 +186,7 @@ mpc_acos (mpc_ptr rop, mpc_srcptr op, mpc_rnd_t rnd) rnd_im = rnd_im == GMP_RNDU ? GMP_RNDD : rnd_im == GMP_RNDD ? GMP_RNDU : rnd_im; /* both RNDZ and RNDA map to themselves for -asin(z) */ - rnd1 = RNDC(GMP_RNDN, rnd_im); + rnd1 = MPC_RND (GMP_RNDN, rnd_im); mpfr_init2 (pi_over_2, p); for (;;) { diff --git a/src/acosh.c b/src/acosh.c index a4eef4c..782f555 100644 --- a/src/acosh.c +++ b/src/acosh.c @@ -1,6 +1,6 @@ /* mpc_acosh -- inverse hyperbolic cosine of a complex number. -Copyright (C) 2009, 2011 INRIA +Copyright (C) 2009, 2011, 2012 INRIA This file is part of GNU MPC. @@ -46,7 +46,7 @@ mpc_acosh (mpc_ptr rop, mpc_srcptr op, mpc_rnd_t rnd) if (mpfr_signbit (mpc_imagref (op))) { inex = mpc_acos (a, op, - RNDC (INV_RND (MPC_RND_IM (rnd)), MPC_RND_RE (rnd))); + MPC_RND (INV_RND (MPC_RND_IM (rnd)), MPC_RND_RE (rnd))); /* change a to -i*a, i.e., -y+i*x to x+i*y */ tmp[0] = mpc_realref (a)[0]; @@ -58,7 +58,7 @@ mpc_acosh (mpc_ptr rop, mpc_srcptr op, mpc_rnd_t rnd) else { inex = mpc_acos (a, op, - RNDC (MPC_RND_IM (rnd), INV_RND(MPC_RND_RE (rnd)))); + MPC_RND (MPC_RND_IM (rnd), INV_RND(MPC_RND_RE (rnd)))); /* change a to i*a, i.e., y-i*x to x+i*y */ tmp[0] = mpc_realref (a)[0]; diff --git a/src/asinh.c b/src/asinh.c index 89477a6..2807a8b 100644 --- a/src/asinh.c +++ b/src/asinh.c @@ -1,6 +1,6 @@ /* mpc_asinh -- inverse hyperbolic sine of a complex number. -Copyright (C) 2009, 2011 INRIA +Copyright (C) 2009, 2011, 2012 INRIA This file is part of GNU MPC. @@ -37,7 +37,7 @@ mpc_asinh (mpc_ptr rop, mpc_srcptr op, mpc_rnd_t rnd) mpc_init3 (a, MPC_PREC_IM(rop), MPC_PREC_RE(rop)); inex = mpc_asin (a, z, - RNDC (INV_RND (MPC_RND_IM (rnd)), MPC_RND_RE (rnd))); + MPC_RND (INV_RND (MPC_RND_IM (rnd)), MPC_RND_RE (rnd))); /* if a = asin(i*op) = x+i*y, and we want y-i*x */ diff --git a/src/atanh.c b/src/atanh.c index 3e1c448..e5716cc 100644 --- a/src/atanh.c +++ b/src/atanh.c @@ -1,6 +1,6 @@ /* mpc_atanh -- inverse hyperbolic tangent of a complex number. -Copyright (C) 2009, 2011 INRIA +Copyright (C) 2009, 2011, 2012 INRIA This file is part of GNU MPC. @@ -36,7 +36,7 @@ mpc_atanh (mpc_ptr rop, mpc_srcptr op, mpc_rnd_t rnd) mpc_init3 (a, MPC_PREC_IM(rop), MPC_PREC_RE(rop)); inex = mpc_atan (a, z, - RNDC (INV_RND (MPC_RND_IM (rnd)), MPC_RND_RE (rnd))); + MPC_RND (INV_RND (MPC_RND_IM (rnd)), MPC_RND_RE (rnd))); /* change a to -i*a, i.e., x+i*y to y-i*x */ tmp[0] = mpc_realref (a)[0]; diff --git a/src/log10.c b/src/log10.c index 10a2566..a6fc86c 100644 --- a/src/log10.c +++ b/src/log10.c @@ -184,7 +184,7 @@ mpc_log10 (mpc_ptr rop, mpc_srcptr op, mpc_rnd_t rnd) inex_re = mpfr_set_ui (mpc_realref (rop), 0, MPC_RND_RE (rnd)); else inex_re = mpc_log10_aux (rop, ww, rnd, 0, 1); - inex_im = mpc_log10_aux (rop, op, RNDC(0,rnd_im), 1, 2); + inex_im = mpc_log10_aux (rop, op, MPC_RND (0,rnd_im), 1, 2); if (negative_zero) { mpc_conj (rop, rop, MPC_RNDNN); @@ -208,7 +208,7 @@ mpc_log10 (mpc_ptr rop, mpc_srcptr op, mpc_rnd_t rnd) ww->im[0] = *mpc_imagref (op); MPFR_CHANGE_SIGN (ww->im); inex_re = mpc_log10_aux (rop, ww, rnd, 0, 3); - invrnd = RNDC(0, INV_RND (MPC_RND_IM (rnd))); + invrnd = MPC_RND (0, INV_RND (MPC_RND_IM (rnd))); inex_im = mpc_log10_aux (rop, op, invrnd, 1, 2); /* division by 2 does not change the ternary flag */ mpfr_div_2ui (mpc_imagref (rop), mpc_imagref (rop), 1, GMP_RNDN); diff --git a/src/mpc.h b/src/mpc.h index c98c3fb..ddce41e 100644 --- a/src/mpc.h +++ b/src/mpc.h @@ -74,29 +74,29 @@ along with this program. If not, see http://www.gnu.org/licenses/ . we reserve four bits for a real rounding mode. */ typedef int mpc_rnd_t; -#define RNDC(r1,r2) (((int)(r1)) + ((int)(r2) << 4)) +#define MPC_RND(r1,r2) (((int)(r1)) + ((int)(r2) << 4)) #define MPC_RND_RE(x) ((mpfr_rnd_t)((x) & 0x0F)) #define MPC_RND_IM(x) ((mpfr_rnd_t)((x) >> 4)) -#define MPC_RNDNN RNDC(GMP_RNDN,GMP_RNDN) -#define MPC_RNDNZ RNDC(GMP_RNDN,GMP_RNDZ) -#define MPC_RNDNU RNDC(GMP_RNDN,GMP_RNDU) -#define MPC_RNDND RNDC(GMP_RNDN,GMP_RNDD) - -#define MPC_RNDZN RNDC(GMP_RNDZ,GMP_RNDN) -#define MPC_RNDZZ RNDC(GMP_RNDZ,GMP_RNDZ) -#define MPC_RNDZU RNDC(GMP_RNDZ,GMP_RNDU) -#define MPC_RNDZD RNDC(GMP_RNDZ,GMP_RNDD) - -#define MPC_RNDUN RNDC(GMP_RNDU,GMP_RNDN) -#define MPC_RNDUZ RNDC(GMP_RNDU,GMP_RNDZ) -#define MPC_RNDUU RNDC(GMP_RNDU,GMP_RNDU) -#define MPC_RNDUD RNDC(GMP_RNDU,GMP_RNDD) - -#define MPC_RNDDN RNDC(GMP_RNDD,GMP_RNDN) -#define MPC_RNDDZ RNDC(GMP_RNDD,GMP_RNDZ) -#define MPC_RNDDU RNDC(GMP_RNDD,GMP_RNDU) -#define MPC_RNDDD RNDC(GMP_RNDD,GMP_RNDD) +#define MPC_RNDNN MPC_RND (GMP_RNDN,GMP_RNDN) +#define MPC_RNDNZ MPC_RND (GMP_RNDN,GMP_RNDZ) +#define MPC_RNDNU MPC_RND (GMP_RNDN,GMP_RNDU) +#define MPC_RNDND MPC_RND (GMP_RNDN,GMP_RNDD) + +#define MPC_RNDZN MPC_RND (GMP_RNDZ,GMP_RNDN) +#define MPC_RNDZZ MPC_RND (GMP_RNDZ,GMP_RNDZ) +#define MPC_RNDZU MPC_RND (GMP_RNDZ,GMP_RNDU) +#define MPC_RNDZD MPC_RND (GMP_RNDZ,GMP_RNDD) + +#define MPC_RNDUN MPC_RND (GMP_RNDU,GMP_RNDN) +#define MPC_RNDUZ MPC_RND (GMP_RNDU,GMP_RNDZ) +#define MPC_RNDUU MPC_RND (GMP_RNDU,GMP_RNDU) +#define MPC_RNDUD MPC_RND (GMP_RNDU,GMP_RNDD) + +#define MPC_RNDDN MPC_RND (GMP_RNDD,GMP_RNDN) +#define MPC_RNDDZ MPC_RND (GMP_RNDD,GMP_RNDZ) +#define MPC_RNDDU MPC_RND (GMP_RNDD,GMP_RNDU) +#define MPC_RNDDD MPC_RND (GMP_RNDD,GMP_RNDD) /* Definitions of types and their semantics */ diff --git a/src/sinh.c b/src/sinh.c index ac5fdd9..509cc57 100644 --- a/src/sinh.c +++ b/src/sinh.c @@ -1,6 +1,6 @@ /* mpc_sinh -- hyperbolic sine of a complex number. -Copyright (C)2008, 2009, 2011 INRIA +Copyright (C)2008, 2009, 2011, 2012 INRIA This file is part of GNU MPC. @@ -36,7 +36,7 @@ mpc_sinh (mpc_ptr rop, mpc_srcptr op, mpc_rnd_t rnd) mpc_realref (sin_z)[0] = mpc_imagref (rop)[0]; mpc_imagref (sin_z)[0] = mpc_realref (rop)[0]; - inex = mpc_sin (sin_z, z, RNDC (MPC_RND_IM (rnd), MPC_RND_RE (rnd))); + inex = mpc_sin (sin_z, z, MPC_RND (MPC_RND_IM (rnd), MPC_RND_RE (rnd))); /* sin_z and rop parts share the same significands, copy the rest now. */ mpc_realref (rop)[0] = mpc_imagref (sin_z)[0]; diff --git a/src/tanh.c b/src/tanh.c index cb4162b..78f2103 100644 --- a/src/tanh.c +++ b/src/tanh.c @@ -1,6 +1,6 @@ /* mpc_tanh -- hyperbolic tangent of a complex number. -Copyright (C) 2008, 2009, 2011 INRIA +Copyright (C) 2008, 2009, 2011, 2012 INRIA This file is part of GNU MPC. @@ -36,7 +36,7 @@ mpc_tanh (mpc_ptr rop, mpc_srcptr op, mpc_rnd_t rnd) mpc_realref (tan_z)[0] = mpc_imagref (rop)[0]; mpc_imagref (tan_z)[0] = mpc_realref (rop)[0]; - inex = mpc_tan (tan_z, z, RNDC (MPC_RND_IM (rnd), MPC_RND_RE (rnd))); + inex = mpc_tan (tan_z, z, MPC_RND (MPC_RND_IM (rnd), MPC_RND_RE (rnd))); /* tan_z and rop parts share the same significands, copy the rest now. */ mpc_realref (rop)[0] = mpc_imagref (tan_z)[0]; diff --git a/tests/read_data.c b/tests/read_data.c index 147919e..7f3d91f 100644 --- a/tests/read_data.c +++ b/tests/read_data.c @@ -1,6 +1,6 @@ /* read_data,c -- Read data file and check function. -Copyright (C) 2008, 2009, 2010, 2011 INRIA +Copyright (C) 2008, 2009, 2010, 2011, 2012 INRIA This file is part of GNU MPC. @@ -271,7 +271,7 @@ read_mpc_rounding_mode (FILE *fp, mpc_rnd_t* rnd) mpfr_rnd_t re, im; read_mpfr_rounding_mode (fp, &re); read_mpfr_rounding_mode (fp, &im); - *rnd = RNDC (re, im); + *rnd = MPC_RND (re, im); } void diff --git a/tests/tfma.c b/tests/tfma.c index bef457b..81bc167 100644 --- a/tests/tfma.c +++ b/tests/tfma.c @@ -80,7 +80,7 @@ check_random (void) for (rnd_re = 0; rnd_re < 4; rnd_re ++) for (rnd_im = 0; rnd_im < 4; rnd_im ++) - cmpfma (a, b, c, RNDC(rnd_re, rnd_im)); + cmpfma (a, b, c, MPC_RND (rnd_re, rnd_im)); } mpc_clear (a); diff --git a/tests/tgeneric.c b/tests/tgeneric.c index 1ead958..a2bb460 100644 --- a/tests/tgeneric.c +++ b/tests/tgeneric.c @@ -1,6 +1,6 @@ /* tgeneric.c -- File for generic tests. -Copyright (C) 2008, 2009, 2010, 2011 INRIA +Copyright (C) 2008, 2009, 2010, 2011, 2012 INRIA This file is part of GNU MPC. @@ -1288,13 +1288,13 @@ tgeneric (mpc_function function, mpfr_prec_t prec_min, case C_CC: for (rnd_im = first_rnd_mode (); is_valid_rnd_mode (rnd_im); rnd_im = next_rnd_mode (rnd_im)) tgeneric_c_cc (&function, z1, z2, z3, zzzz, z4, - RNDC (rnd_re, rnd_im)); + MPC_RND (rnd_re, rnd_im)); reuse_c_cc (&function, z1, z2, z3, z4); break; case CCCC: for (rnd_im = first_rnd_mode (); is_valid_rnd_mode (rnd_im); rnd_im = next_rnd_mode (rnd_im)) tgeneric_cccc (&function, z1, z2, z3, z4, zzzz, z5, - RNDC (rnd_re, rnd_im)); + MPC_RND (rnd_re, rnd_im)); reuse_cccc (&function, z1, z2, z3, z4, z5); break; case FC: @@ -1304,7 +1304,7 @@ tgeneric (mpc_function function, mpfr_prec_t prec_min, case CC: for (rnd_im = first_rnd_mode (); is_valid_rnd_mode (rnd_im); rnd_im = next_rnd_mode (rnd_im)) tgeneric_cc (&function, z1, z2, zzzz, z3, - RNDC (rnd_re, rnd_im)); + MPC_RND (rnd_re, rnd_im)); reuse_cc (&function, z1, z2, z3); break; case CC_C: @@ -1312,49 +1312,49 @@ tgeneric (mpc_function function, mpfr_prec_t prec_min, for (rnd2_re = first_rnd_mode (); is_valid_rnd_mode (rnd2_re); rnd2_re = next_rnd_mode (rnd2_re)) for (rnd2_im = first_rnd_mode (); is_valid_rnd_mode (rnd2_im); rnd2_im = next_rnd_mode (rnd2_im)) tgeneric_cc_c (&function, z1, z2, z3, zzzz, zzzz2, z4, z5, - RNDC (rnd_re, rnd_im), RNDC (rnd2_re, rnd2_im)); + MPC_RND (rnd_re, rnd_im), MPC_RND (rnd2_re, rnd2_im)); reuse_cc_c (&function, z1, z2, z3, z4, z5); break; case CFC: for (rnd_im = first_rnd_mode (); is_valid_rnd_mode (rnd_im); rnd_im = next_rnd_mode (rnd_im)) tgeneric_cfc (&function, x1, z1, z2, zzzz, z3, - RNDC (rnd_re, rnd_im)); + MPC_RND (rnd_re, rnd_im)); reuse_cfc (&function, z1, x1, z2, z3); break; case CCF: for (rnd_im = first_rnd_mode (); is_valid_rnd_mode (rnd_im); rnd_im = next_rnd_mode (rnd_im)) tgeneric_ccf (&function, z1, x1, z2, zzzz, z3, - RNDC (rnd_re, rnd_im)); + MPC_RND (rnd_re, rnd_im)); reuse_ccf (&function, z1, x1, z2, z3); break; case CCU: for (rnd_im = first_rnd_mode (); is_valid_rnd_mode (rnd_im); rnd_im = next_rnd_mode (rnd_im)) tgeneric_ccu (&function, z1, ul1, z2, zzzz, z3, - RNDC (rnd_re, rnd_im)); + MPC_RND (rnd_re, rnd_im)); reuse_ccu (&function, z1, ul1, z2, z3); break; case CUC: for (rnd_im = first_rnd_mode (); is_valid_rnd_mode (rnd_im); rnd_im = next_rnd_mode (rnd_im)) tgeneric_cuc (&function, ul1, z1, z2, zzzz, z3, - RNDC (rnd_re, rnd_im)); + MPC_RND (rnd_re, rnd_im)); reuse_cuc (&function, ul1, z1, z2, z3); break; case CCS: for (rnd_im = first_rnd_mode (); is_valid_rnd_mode (rnd_im); rnd_im = next_rnd_mode (rnd_im)) tgeneric_ccs (&function, z1, lo, z2, zzzz, z3, - RNDC (rnd_re, rnd_im)); + MPC_RND (rnd_re, rnd_im)); reuse_ccs (&function, z1, lo, z2, z3); break; case CCI: for (rnd_im = first_rnd_mode (); is_valid_rnd_mode (rnd_im); rnd_im = next_rnd_mode (rnd_im)) tgeneric_cci (&function, z1, i, z2, zzzz, z3, - RNDC (rnd_re, rnd_im)); + MPC_RND (rnd_re, rnd_im)); reuse_cci (&function, z1, i, z2, z3); break; case CUUC: for (rnd_im = first_rnd_mode (); is_valid_rnd_mode (rnd_im); rnd_im = next_rnd_mode (rnd_im)) tgeneric_cuuc (&function, ul1, ul2, z1, z2, zzzz, z3, - RNDC (rnd_re, rnd_im)); + MPC_RND (rnd_re, rnd_im)); reuse_cuuc (&function, ul1, ul2, z1, z2, z3); break; default: diff --git a/tests/tmul.c b/tests/tmul.c index 1c2cee7..46d3bb3 100644 --- a/tests/tmul.c +++ b/tests/tmul.c @@ -123,7 +123,7 @@ check_regular (void) for (rnd_re = 0; rnd_re < 4; rnd_re ++) for (rnd_im = 0; rnd_im < 4; rnd_im ++) - cmpmul (x, y, RNDC(rnd_re, rnd_im)); + cmpmul (x, y, MPC_RND (rnd_re, rnd_im)); } mpc_clear (x); -- cgit v1.2.1