FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libfortran/48787 (Invalid UP/DOWN rounding with F editing)

Browse source 
2011-05-04  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/48787
	* io/write_float.def (output_float): Adjust up and down rounding for
	cases where 'd' = 0. Gather common code to one location.

From-SVN: r173408
This commit is contained in:
Jerry DeLisle 2011-05-05 01:19:30 +00:00
parent c5c04a8fd8
commit d6b872ad5e
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libgfortran/ChangeLog
View file

@ -1,3 +1,9 @@
2011-05-04 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/48787
* io/write_float.def (output_float): Adjust up and down rounding for
cases where 'd' = 0. Gather common code to one location.
2011-05-01 Jerry DeLisle <jvdelisle@gcc.gnu.org> 2011-05-01 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/48787 PR libgfortran/48787

30
libgfortran/io/write_float.def
View file

@ -221,6 +221,7 @@ output_float (st_parameter_dt *dtp, const fnode *f, char *buffer, size_t size,
if (zero_flag) if (zero_flag)
goto skip; goto skip;
/* Round the value. The value being rounded is an unsigned magnitude. /* Round the value. The value being rounded is an unsigned magnitude.
The ROUND_COMPATIBLE is rounding away from zero when there is a tie. */ The ROUND_COMPATIBLE is rounding away from zero when there is a tie. */
switch (dtp->u.p.current_unit->round_status) switch (dtp->u.p.current_unit->round_status)
@ -230,19 +231,11 @@ output_float (st_parameter_dt *dtp, const fnode *f, char *buffer, size_t size,
case ROUND_UP: case ROUND_UP:
if (sign_bit) if (sign_bit)
goto skip; goto skip;
rchar = '0'; goto updown;
/* Scan for trailing zeros to see if we really need to round it. */
for(i = nbefore + nafter; i < ndigits; i++)
{
if (digits[i] != '0')
goto do_rnd;
}
goto skip;
case ROUND_DOWN: case ROUND_DOWN:
if (!sign_bit) if (!sign_bit)
goto skip; goto skip;
rchar = '0'; goto updown;
break;
case ROUND_NEAREST: case ROUND_NEAREST:
/* Round compatible unless there is a tie. A tie is a 5 with /* Round compatible unless there is a tie. A tie is a 5 with
all trailing zero's. */ all trailing zero's. */
@ -254,7 +247,7 @@ output_float (st_parameter_dt *dtp, const fnode *f, char *buffer, size_t size,
if (digits[i] != '0') if (digits[i] != '0')
goto do_rnd; goto do_rnd;
} }
/* It is a tie so round to even. */ /* It is a tie so round to even. */
switch (digits[nafter + nbefore - 1]) switch (digits[nafter + nbefore - 1])
{ {
case '1': case '1':
@ -274,8 +267,21 @@ output_float (st_parameter_dt *dtp, const fnode *f, char *buffer, size_t size,
case ROUND_UNSPECIFIED: case ROUND_UNSPECIFIED:
case ROUND_COMPATIBLE: case ROUND_COMPATIBLE:
rchar = '5'; rchar = '5';
/* Just fall through and do the actual rounding. */ goto do_rnd;
} }
updown:
rchar = '0';
if (w > 0 && d == 0 && p == 0)
nbefore = 1;
/* Scan for trailing zeros to see if we really need to round it. */
for(i = nbefore + nafter; i < ndigits; i++)
{
if (digits[i] != '0')
goto do_rnd;
}
goto skip;
do_rnd: do_rnd: