espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-23 11:39:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor speedup to Output_merge_string::do_add_input_section.

Browse Source
This commit is contained in:
Ian Lance Taylor
2007-12-15 01:01:48 +00:00
parent 46da5588d0
commit 281b8327ae
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gold/merge.cc
View File

@ -466,6 +466,7 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
const unsigned char* pdata = object->section_contents(shndx, &len, false); const unsigned char* pdata = object->section_contents(shndx, &len, false);
const Char_type* p = reinterpret_cast<const Char_type*>(pdata); const Char_type* p = reinterpret_cast<const Char_type*>(pdata);
const Char_type* pend = p + len;
if (len % sizeof(Char_type) != 0) if (len % sizeof(Char_type) != 0)
{ {
@ -478,12 +479,10 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
off_t i = 0; off_t i = 0;
while (i < len) while (i < len)
{ {
off_t plen = 0; const Char_type* pl;
for (const Char_type* pl = p; *pl != 0; ++pl) for (pl = p; *pl != 0; ++pl)
{ {
// The length PLEN is in characters, not bytes. if (pl >= pend)
++plen;
if (i + plen * static_cast<off_t>(sizeof(Char_type)) >= len)
{ {
object->error(_("entry in mergeable string section " object->error(_("entry in mergeable string section "
"not null terminated")); "not null terminated"));
@ -491,13 +490,13 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
} }
} }
const Char_type* str = this->stringpool_.add(p, true, NULL); const Char_type* str = this->stringpool_.add_prefix(p, pl - p, NULL);
off_t bytelen_with_null = (plen + 1) * sizeof(Char_type); size_t bytelen_with_null = ((pl - p) + 1) * sizeof(Char_type);
this->merged_strings_.push_back(Merged_string(object, shndx, i, str, this->merged_strings_.push_back(Merged_string(object, shndx, i, str,
bytelen_with_null)); bytelen_with_null));
p += plen + 1; p = pl + 1;
i += bytelen_with_null; i += bytelen_with_null;
} }