// merge.cc -- handle section merging for gold
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
+// Copyright (C) 2006-2020 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold.
Object_merge_map::get_input_merge_map(unsigned int shndx) const
{
gold_assert(shndx != -1U);
- if (shndx == this->first_shnum_)
- return &this->first_map_;
- if (shndx == this->second_shnum_)
- return &this->second_map_;
- Section_merge_maps::const_iterator p = this->section_merge_maps_.find(shndx);
- if (p != this->section_merge_maps_.end())
- return p->second;
+ const Section_merge_maps &maps = this->section_merge_maps_;
+ for (Section_merge_maps::const_iterator i = maps.begin(), e = maps.end();
+ i != e; ++i)
+ {
+ if (i->first == shndx)
+ return i->second;
+ }
return NULL;
}
return map;
}
- // We need to create a new entry.
- if (this->first_shnum_ == -1U)
- {
- this->first_shnum_ = shndx;
- this->first_map_.output_data = output_data;
- return &this->first_map_;
- }
- if (this->second_shnum_ == -1U)
- {
- this->second_shnum_ = shndx;
- this->second_map_.output_data = output_data;
- return &this->second_map_;
- }
-
Input_merge_map* new_map = new Input_merge_map;
new_map->output_data = output_data;
- this->section_merge_maps_[shndx] = new_map;
+ Section_merge_maps &maps = this->section_merge_maps_;
+ maps.push_back(std::make_pair(shndx, new_map));
return new_map;
}
section_offset_type output_offset)
{
Input_merge_map* map = this->get_or_make_input_merge_map(output_data, shndx);
+ map->add_mapping(input_offset, length, output_offset);
+}
+void
+Object_merge_map::Input_merge_map::add_mapping(
+ section_offset_type input_offset, section_size_type length,
+ section_offset_type output_offset) {
// Try to merge the new entry in the last one we saw.
- if (!map->entries.empty())
+ if (!this->entries.empty())
{
- Input_merge_entry& entry(map->entries.back());
+ Input_merge_entry& entry(this->entries.back());
// Use section_size_type to avoid signed/unsigned warnings.
section_size_type input_offset_u = input_offset;
gold_assert(input_offset < entry.input_offset);
gold_assert(input_offset_u + length
<= static_cast<section_size_type>(entry.input_offset));
- map->sorted = false;
+ this->sorted = false;
}
else if (entry.input_offset + entry.length == input_offset_u
&& (output_offset == -1
entry.input_offset = input_offset;
entry.length = length;
entry.output_offset = output_offset;
- map->entries.push_back(entry);
+ this->entries.push_back(entry);
}
// Get the output offset for an input address.
this->input_count_ += len / entsize;
+ Object_merge_map* merge_map = object->get_or_create_merge_map();
+ Object_merge_map::Input_merge_map* input_merge_map =
+ merge_map->get_or_make_input_merge_map(this, shndx);
+
for (section_size_type i = 0; i < len; i += entsize, p += entsize)
{
// Add the constant to the section contents. If we find that it
}
// Record the offset of this constant in the output section.
- object->add_merge_mapping(this, shndx, i, entsize, k);
+ input_merge_map->add_mapping(i, entsize, k);
}
// For script processing, we keep the input sections.
{
section_size_type sec_len;
bool is_new;
+ uint64_t addralign = this->addralign();
const unsigned char* pdata = object->decompressed_section_contents(shndx,
&sec_len,
- &is_new);
+ &is_new,
+ &addralign);
const Char_type* p = reinterpret_cast<const Char_type*>(pdata);
const Char_type* pend = p + sec_len / sizeof(Char_type);
// aligned, so each string within the section must retain the same
// modulo.
uintptr_t init_align_modulo = (reinterpret_cast<uintptr_t>(pdata)
- & (this->addralign() - 1));
+ & (addralign - 1));
bool has_misaligned_strings = false;
while (p < pend)
// Within merge input section each string must be aligned.
if (len != 0
- && ((reinterpret_cast<uintptr_t>(p) & (this->addralign() - 1))
+ && ((reinterpret_cast<uintptr_t>(p) & (addralign - 1))
!= init_align_modulo))
has_misaligned_strings = true;
{
section_offset_type last_input_offset = 0;
section_offset_type last_output_offset = 0;
+ Relobj *object = (*l)->object;
+ Object_merge_map* merge_map = object->get_or_create_merge_map();
+ Object_merge_map::Input_merge_map* input_merge_map =
+ merge_map->get_or_make_input_merge_map(this, (*l)->shndx);
+
for (typename Merged_strings::const_iterator p =
(*l)->merged_strings.begin();
p != (*l)->merged_strings.end();
{
section_size_type length = p->offset - last_input_offset;
if (length > 0)
- (*l)->object->add_merge_mapping(this, (*l)->shndx,
- last_input_offset, length, last_output_offset);
+ input_merge_map->add_mapping(last_input_offset, length,
+ last_output_offset);
last_input_offset = p->offset;
if (p->stringpool_key != 0)
last_output_offset =