aboutsummaryrefslogtreecommitdiff
path: root/gold/stringpool.cc
diff options
context:
space:
mode:
authorDoug Kwan <dougkwan@google.com>2010-03-16 01:26:15 +0000
committerDoug Kwan <dougkwan@google.com>2010-03-16 01:26:15 +0000
commit1aa37384696ad1fcec310e8d3c7955b0266f61d5 (patch)
treea1ac5f2059d8b607e64bf0f3796228043f50c687 /gold/stringpool.cc
parentac0cd78b43c40ce8311a9381da2e42bb40eaaea9 (diff)
downloadgdb-1aa37384696ad1fcec310e8d3c7955b0266f61d5.zip
gdb-1aa37384696ad1fcec310e8d3c7955b0266f61d5.tar.gz
gdb-1aa37384696ad1fcec310e8d3c7955b0266f61d5.tar.bz2
2010-03-15 Doug Kwan <dougkwan@google.com>
* stringpool.cc (Stringpool_template::Stringpool_template): Initialize offset_. (Stringpool_template::new_key_offset): New method. (Stringpool_template::add_string): Assign offsets when adding new strings. (Stringpool_template::set_string_offsets): Do not set string offsets when not optimizing. * stringpool.h (Chunked_vector::Chunked_vector): Initialize data member size_. (Chunked_vector::clear): Clear size_. (Chunked_vector::reserve): Call reserve method of all Element_vectors. (Chunked_vector::size): Return size_. (Chunked_vector::push_back): Use size_ to find insert position. (Chunked_vector::size_): New data member. (Stringpool_template::set_no_zero_null): Assert string set is empty. (Stringpool_template::new_key_offset): New method declaration. (Stringpool_template::offset_): New data member.
Diffstat (limited to 'gold/stringpool.cc')
-rw-r--r--gold/stringpool.cc41
1 files changed, 25 insertions, 16 deletions
diff --git a/gold/stringpool.cc b/gold/stringpool.cc
index d9f4050..bbbe975 100644
--- a/gold/stringpool.cc
+++ b/gold/stringpool.cc
@@ -36,7 +36,7 @@ namespace gold
template<typename Stringpool_char>
Stringpool_template<Stringpool_char>::Stringpool_template()
: string_set_(), key_to_offset_(), strings_(), strtab_size_(0),
- zero_null_(true), optimize_(false)
+ zero_null_(true), optimize_(false), offset_(0)
{
if (parameters->options_valid() && parameters->options().optimize() >= 2)
this->optimize_ = true;
@@ -232,6 +232,26 @@ Stringpool_template<Stringpool_char>::add(const Stringpool_char* s, bool copy,
return this->add_with_length(s, string_length(s), copy, pkey);
}
+// Add a new key offset entry.
+
+template<typename Stringpool_char>
+void
+Stringpool_template<Stringpool_char>::new_key_offset(size_t length)
+{
+ if (this->key_to_offset_.size() == 0)
+ this->offset_ = this->zero_null_ ? sizeof(Stringpool_char) : 0;
+
+ section_offset_type offset;
+ if (this->zero_null_ && length == 0)
+ offset = 0;
+ else
+ {
+ offset = this->offset_;
+ this->offset_ += (length + 1) * sizeof(Stringpool_char);
+ }
+ this->key_to_offset_.push_back(offset);
+}
+
template<typename Stringpool_char>
const Stringpool_char*
Stringpool_template<Stringpool_char>::add_with_length(const Stringpool_char* s,
@@ -259,7 +279,7 @@ Stringpool_template<Stringpool_char>::add_with_length(const Stringpool_char* s,
{
// We just added the string. The key value has now been
// used.
- this->key_to_offset_.push_back(0);
+ this->new_key_offset(length);
}
else
{
@@ -285,7 +305,7 @@ Stringpool_template<Stringpool_char>::add_with_length(const Stringpool_char* s,
return p->first.string;
}
- this->key_to_offset_.push_back(0);
+ this->new_key_offset(length);
hk.string = this->add_string(s, length);
// The contents of the string stay the same, so we don't need to
@@ -390,19 +410,8 @@ Stringpool_template<Stringpool_char>::set_string_offsets()
// take the time to sort when the user asks for heavy optimization.
if (!this->optimize_)
{
- for (typename String_set_type::iterator curr = this->string_set_.begin();
- curr != this->string_set_.end();
- curr++)
- {
- section_offset_type* poff = &this->key_to_offset_[curr->second - 1];
- if (this->zero_null_ && curr->first.string[0] == 0)
- *poff = 0;
- else
- {
- *poff = offset;
- offset += (curr->first.length + 1) * charsize;
- }
- }
+ // If we are not optimizing, the offsets are already assigned.
+ offset = this->offset_;
}
else
{