espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-05-31 18:20:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

We don't need a hash table mapping input locations to strings.

Browse Source
This commit is contained in:
Ian Lance Taylor
2007-09-22 05:38:12 +00:00
parent e214a02b9b
commit 42e3fe0dd9
2 changed files with 19 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gold/merge.h
View File

@ -169,7 +169,7 @@ class Output_merge_string : public Output_merge_base
{
public:
Output_merge_string()
: Output_merge_base(sizeof(Char_type)), stringpool_(), hashtable_()
: Output_merge_base(sizeof(Char_type)), stringpool_(), merged_strings_()
{ this->stringpool_.set_no_zero_null(); }
// Add an input section.
@ -187,38 +187,30 @@ class Output_merge_string : public Output_merge_base
private:
// As we see input sections, we build a mapping from object, section
// index and offset to strings.
struct Merge_string_key
struct Merged_string
{
// The input object where the string was found.
Relobj* object;
// The input section in the input object.
unsigned int shndx;
// The offset in the input section.
off_t offset;
// The string itself, a pointer into a Stringpool.
const Char_type* string;
Merge_string_key(Relobj *objecta, unsigned int shndxa, off_t offseta)
: object(objecta), shndx(shndxa), offset(offseta)
Merged_string(Relobj *objecta, unsigned int shndxa, off_t offseta,
const Char_type* stringa)
: object(objecta), shndx(shndxa), offset(offseta), string(stringa)
{ }
};
struct Merge_string_key_hash
{
size_t
operator()(const Merge_string_key&) const;
};
struct Merge_string_key_eq
{
bool
operator()(const Merge_string_key&, const Merge_string_key&) const;
};
typedef Unordered_map<Merge_string_key, const Char_type*,
Merge_string_key_hash, Merge_string_key_eq>
Merge_string_hashtable;
typedef std::vector<Merged_string> Merged_strings;
// As we see the strings, we add them to a Stringpool.
Stringpool_template<Char_type> stringpool_;
// Map from a location in an input object to an entry in the
// Stringpool.
Merge_string_hashtable hashtable_;
Merged_strings merged_strings_;
};
} // End namespace gold.