From 4ff7defd046ca231a35c93b4000962b37ccad31c Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Fri, 30 Oct 2015 13:44:01 +0000 Subject: [PATCH] Fix real_2expN mode arguments in fixed-value.c fixed-value.c was passing a fixed-point mode to the floating-point real_2expN routine. That didn't cause a problem in practice because all real_2expN did was check for decimal float modes, but it triggered a failure with an upcoming patch. Tested on x86_64-linux-gnu, arm-linux-gnueabi and aarch64-linux-gnu. gcc/ * fixed-value.c (check_real_for_fixed_mode, fixed_from_string) (fixed_to_decimal, fixed_convert_from_real) (real_convert_from_fixed): Fix mode arguments to real_2expN. From-SVN: r229580 --- gcc/ChangeLog | 6 ++++++ gcc/fixed-value.c | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 26f9a375257..a38b9f18a09 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-10-30 Richard Sandiford + + * fixed-value.c (check_real_for_fixed_mode, fixed_from_string) + (fixed_to_decimal, fixed_convert_from_real) + (real_convert_from_fixed): Fix mode arguments to real_2expN. + 2015-10-30 Richard Sandiford * real.h (REAL_MODE_FORMAT): Abort if the mode isn't a diff --git a/gcc/fixed-value.c b/gcc/fixed-value.c index cfb1ad7f7b1..0e8fe8f5fdd 100644 --- a/gcc/fixed-value.c +++ b/gcc/fixed-value.c @@ -64,8 +64,8 @@ check_real_for_fixed_mode (REAL_VALUE_TYPE *real_value, machine_mode mode) { REAL_VALUE_TYPE max_value, min_value, epsilon_value; - real_2expN (&max_value, GET_MODE_IBIT (mode), mode); - real_2expN (&epsilon_value, -GET_MODE_FBIT (mode), mode); + real_2expN (&max_value, GET_MODE_IBIT (mode), VOIDmode); + real_2expN (&epsilon_value, -GET_MODE_FBIT (mode), VOIDmode); if (SIGNED_FIXED_POINT_MODE_P (mode)) min_value = real_value_negate (&max_value); @@ -127,7 +127,7 @@ fixed_from_string (FIXED_VALUE_TYPE *f, const char *str, machine_mode mode) || (temp == FIXED_MAX_EPS && ALL_ACCUM_MODE_P (f->mode))) warning (OPT_Woverflow, "large fixed-point constant implicitly truncated to fixed-point type"); - real_2expN (&base_value, fbit, mode); + real_2expN (&base_value, fbit, VOIDmode); real_arithmetic (&fixed_value, MULT_EXPR, &real_value, &base_value); wide_int w = real_to_integer (&fixed_value, &fail, GET_MODE_PRECISION (mode)); @@ -158,7 +158,7 @@ fixed_to_decimal (char *str, const FIXED_VALUE_TYPE *f_orig, REAL_VALUE_TYPE real_value, base_value, fixed_value; signop sgn = UNSIGNED_FIXED_POINT_MODE_P (f_orig->mode) ? UNSIGNED : SIGNED; - real_2expN (&base_value, GET_MODE_FBIT (f_orig->mode), f_orig->mode); + real_2expN (&base_value, GET_MODE_FBIT (f_orig->mode), VOIDmode); real_from_integer (&real_value, VOIDmode, wide_int::from (f_orig->data, GET_MODE_PRECISION (f_orig->mode), sgn), @@ -1052,7 +1052,7 @@ fixed_convert_from_real (FIXED_VALUE_TYPE *f, machine_mode mode, real_value = *a; f->mode = mode; - real_2expN (&base_value, fbit, mode); + real_2expN (&base_value, fbit, VOIDmode); real_arithmetic (&fixed_value, MULT_EXPR, &real_value, &base_value); wide_int w = real_to_integer (&fixed_value, &fail, @@ -1104,7 +1104,7 @@ real_convert_from_fixed (REAL_VALUE_TYPE *r, machine_mode mode, REAL_VALUE_TYPE base_value, fixed_value, real_value; signop sgn = UNSIGNED_FIXED_POINT_MODE_P (f->mode) ? UNSIGNED : SIGNED; - real_2expN (&base_value, GET_MODE_FBIT (f->mode), f->mode); + real_2expN (&base_value, GET_MODE_FBIT (f->mode), VOIDmode); real_from_integer (&fixed_value, VOIDmode, wide_int::from (f->data, GET_MODE_PRECISION (f->mode), sgn), sgn); -- 2.30.2