OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libfortran/61499 (Internal read of negative integer broken)

Browse Source 
2014-06-26  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/61499
	* io/list_read.c (eat_spaces): Use a 'for' loop instead of
	'while' loop to skip the loop if there are no bytes left in the
	string. Only seek if actual spaces can be skipped.

From-SVN: r212059
This commit is contained in:
Jerry DeLisle 2014-06-27 04:23:36 +00:00
parent 5450a05c5b
commit b896e6744e
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libgfortran/ChangeLog
View File

@ -1,3 +1,10 @@
2014-06-26 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/61499
* io/list_read.c (eat_spaces): Use a 'for' loop instead of
'while' loop to skip the loop if there are no bytes left in the
string. Only seek if actual spaces can be skipped.
2014-06-25 Tobias Burnus <burnus@net-b.de>
* caf/single.c (assign_char4_from_char1, assign_char1_from_char4,

47
libgfortran/io/list_read.c
View File

@ -387,50 +387,39 @@ eat_spaces (st_parameter_dt *dtp)
int c;
/* If internal character array IO, peak ahead and seek past spaces.
This is an optimazation to eliminate numerous calls to
next character unique to character arrays with large character
lengths (PR38199). */
if (is_array_io (dtp))
This is an optimization unique to character arrays with large
character lengths (PR38199). This code eliminates numerous calls
to next_character. */
if (is_array_io (dtp) && (dtp->u.p.last_char == EOF - 1))
{
gfc_offset offset = stell (dtp->u.p.current_unit->s);
gfc_offset limit = offset + dtp->u.p.current_unit->bytes_left;
gfc_offset i;
if (dtp->common.unit) /* kind=4 */
{
gfc_char4_t cc;
limit *= (sizeof (gfc_char4_t));
do
for (i = 0; i < dtp->u.p.current_unit->bytes_left; i++)
{
cc = dtp->internal_unit[offset];
offset += (sizeof (gfc_char4_t));
dtp->u.p.current_unit->bytes_left--;
if (dtp->internal_unit[offset + i * sizeof (gfc_char4_t)]
!= (gfc_char4_t)' ')
break;
}
while (offset < limit && cc == (gfc_char4_t)' ');
/* Back up, seek ahead, and fall through to complete the
process so that END conditions are handled correctly. */
dtp->u.p.current_unit->bytes_left++;
cc = dtp->internal_unit[offset];
if (cc != (gfc_char4_t)' ')
sseek (dtp->u.p.current_unit->s,
offset-(sizeof (gfc_char4_t)), SEEK_SET);
}
else
{
do
for (i = 0; i < dtp->u.p.current_unit->bytes_left; i++)
{
c = dtp->internal_unit[offset++];
dtp->u.p.current_unit->bytes_left--;
if (dtp->internal_unit[offset + i] != ' ')
break;
}
}
while (offset < limit && c == ' ');
/* Back up, seek ahead, and fall through to complete the
process so that END conditions are handled correctly. */
dtp->u.p.current_unit->bytes_left++;
if (dtp->internal_unit[offset] != ' ')
sseek (dtp->u.p.current_unit->s, offset - 1, SEEK_SET);
if (i != 0)
{
sseek (dtp->u.p.current_unit->s, offset + i, SEEK_SET);
dtp->u.p.current_unit->bytes_left -= i;
}
}
/* Now skip spaces, EOF and EOL are handled in next_char. */
do
c = next_char (dtp);