darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* som.c (som_write_symbol_strings): Do not used fixed buffers,

Browse source 
use size_t as a counter.
        (som_write_space_strings): Similarly.
This commit is contained in:
Jeff Law 2000-09-14 01:33:46 +00:00
parent d3e8500506
commit 8681fbcd21
2 changed files with 68 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bfd/ChangeLog
View file

@ -1,3 +1,9 @@
Wed Sep 13 19:31:39 2000 Marco Franzen <marcof@thyron.com>
* som.c (som_write_symbol_strings): Do not used fixed buffers,
use size_t as a counter.
(som_write_space_strings): Similarly.
2000-09-12 Jason Eckhardt <jle@cygnus.com> 2000-09-12 Jason Eckhardt <jle@cygnus.com>
* elf32-i860.c (elf32_i860_relocate_pc26): New function * elf32-i860.c (elf32_i860_relocate_pc26): New function

87
bfd/som.c
View file

@ -1,9 +1,9 @@
/* bfd back-end for HP PA-RISC SOM objects. /* bfd back-end for HP PA-RISC SOM objects.
Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998 Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998, 2000
Free Software Foundation, Inc. Free Software Foundation, Inc.
Contributed by the Center for Software Science at the Contributed by the Center for Software Science at the
University of Utah (pa-gdb-bugs@cs.utah.edu). University of Utah.
This file is part of BFD, the Binary File Descriptor library. This file is part of BFD, the Binary File Descriptor library.
@ -3046,14 +3046,12 @@ som_write_space_strings (abfd, current_offset, string_sizep)
{ {
/* Chunk of memory that we can use as buffer space, then throw /* Chunk of memory that we can use as buffer space, then throw
away. */ away. */
unsigned char tmp_space[SOM_TMP_BUFSIZE]; size_t tmp_space_size = SOM_TMP_BUFSIZE;
unsigned char *p; unsigned char *tmp_space = alloca (tmp_space_size);
unsigned char *p = tmp_space;
unsigned int strings_size = 0; unsigned int strings_size = 0;
asection *section; asection *section;
memset (tmp_space, 0, SOM_TMP_BUFSIZE);
p = tmp_space;
/* Seek to the start of the space strings in preparation for writing /* Seek to the start of the space strings in preparation for writing
them out. */ them out. */
if (bfd_seek (abfd, current_offset, SEEK_SET) < 0) if (bfd_seek (abfd, current_offset, SEEK_SET) < 0)
@ -3063,7 +3061,7 @@ som_write_space_strings (abfd, current_offset, string_sizep)
building up and writing string table entries for their names. */ building up and writing string table entries for their names. */
for (section = abfd->sections; section != NULL; section = section->next) for (section = abfd->sections; section != NULL; section = section->next)
{ {
int length; size_t length;
/* Only work with space/subspaces; avoid any other sections /* Only work with space/subspaces; avoid any other sections
which might have been made (.text for example). */ which might have been made (.text for example). */
@ -3074,14 +3072,32 @@ som_write_space_strings (abfd, current_offset, string_sizep)
length = strlen (section->name); length = strlen (section->name);
/* If there is not enough room for the next entry, then dump the /* If there is not enough room for the next entry, then dump the
current buffer contents now. Each entry will take 4 bytes to current buffer contents now and maybe allocate a larger
hold the string length + the string itself + null terminator. */ buffer. Each entry will take 4 bytes to hold the string
if (p - tmp_space + 5 + length > SOM_TMP_BUFSIZE) length + the string itself + null terminator. */
if (p - tmp_space + 5 + length > tmp_space_size)
{ {
/* Flush buffer before refilling or reallocating. */
if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd) if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd)
!= p - tmp_space) != p - tmp_space)
return false; return false;
/* Reset to beginning of the buffer space. */
/* Reallocate if now empty buffer still too small. */
if (5 + length > tmp_space_size)
{
/* Ensure a minimum growth factor to avoid O(n**2) space
consumption for n strings. The optimal minimum
factor seems to be 2, as no other value can guarantee
wasting less then 50% space. (Note that we cannot
deallocate space allocated by `alloca' without
returning from this function.) The same technique is
used a few more times below when a buffer is
reallocated. */
tmp_space_size = MAX (2 * tmp_space_size, 5 + length);
tmp_space = alloca (tmp_space_size);
}
/* Reset to beginning of the (possibly new) buffer space. */
p = tmp_space; p = tmp_space;
} }
@ -3135,8 +3151,10 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
/* Chunk of memory that we can use as buffer space, then throw /* Chunk of memory that we can use as buffer space, then throw
away. */ away. */
unsigned char tmp_space[SOM_TMP_BUFSIZE]; size_t tmp_space_size = SOM_TMP_BUFSIZE;
unsigned char *p; unsigned char *tmp_space = alloca (tmp_space_size);
unsigned char *p = tmp_space;
unsigned int strings_size = 0; unsigned int strings_size = 0;
unsigned char *comp[4]; unsigned char *comp[4];
@ -3154,9 +3172,6 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
comp[3] = compilation_unit->version_id.n_name; comp[3] = compilation_unit->version_id.n_name;
} }
memset (tmp_space, 0, SOM_TMP_BUFSIZE);
p = tmp_space;
/* Seek to the start of the space strings in preparation for writing /* Seek to the start of the space strings in preparation for writing
them out. */ them out. */
if (bfd_seek (abfd, current_offset, SEEK_SET) < 0) if (bfd_seek (abfd, current_offset, SEEK_SET) < 0)
@ -3166,16 +3181,28 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
{ {
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
int length = strlen (comp[i]); size_t length = strlen (comp[i]);
/* If there is not enough room for the next entry, then dump /* If there is not enough room for the next entry, then dump
the current buffer contents now. */ the current buffer contents now and maybe allocate a
if (p - tmp_space + 5 + length > SOM_TMP_BUFSIZE) larger buffer. */
if (p - tmp_space + 5 + length > tmp_space_size)
{ {
/* Flush buffer before refilling or reallocating. */
if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd) if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd)
!= p - tmp_space) != p - tmp_space)
return false; return false;
/* Reset to beginning of the buffer space. */
/* Reallocate if now empty buffer still too small. */
if (5 + length > tmp_space_size)
{
/* See alloca above for discussion of new size. */
tmp_space_size = MAX (2 * tmp_space_size, 5 + length);
tmp_space = alloca (tmp_space_size);
}
/* Reset to beginning of the (possibly new) buffer
space. */
p = tmp_space; p = tmp_space;
} }
@ -3224,16 +3251,26 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
for (i = 0; i < num_syms; i++) for (i = 0; i < num_syms; i++)
{ {
int length = strlen (syms[i]->name); size_t length = strlen (syms[i]->name);
/* If there is not enough room for the next entry, then dump the /* If there is not enough room for the next entry, then dump the
current buffer contents now. */ current buffer contents now and maybe allocate a larger buffer. */
if (p - tmp_space + 5 + length > SOM_TMP_BUFSIZE) if (p - tmp_space + 5 + length > tmp_space_size)
{ {
/* Flush buffer before refilling or reallocating. */
if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd) if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd)
!= p - tmp_space) != p - tmp_space)
return false; return false;
/* Reset to beginning of the buffer space. */
/* Reallocate if now empty buffer still too small. */
if (5 + length > tmp_space_size)
{
/* See alloca above for discussion of new size. */
tmp_space_size = MAX (2 * tmp_space_size, 5 + length);
tmp_space = alloca (tmp_space_size);
}
/* Reset to beginning of the (possibly new) buffer space. */
p = tmp_space; p = tmp_space;
} }