2007-05-16 17:42:48 +00:00
|
|
|
// merge.h -- handle section merging for gold -*- C++ -*-
|
|
|
|
|
2010-12-14 19:03:30 +00:00
|
|
|
// Copyright 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
|
2007-09-22 21:02:10 +00:00
|
|
|
// Written by Ian Lance Taylor <iant@google.com>.
|
|
|
|
|
|
|
|
// This file is part of gold.
|
|
|
|
|
|
|
|
// This program is free software; you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU General Public License as published by
|
|
|
|
// the Free Software Foundation; either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
|
|
// along with this program; if not, write to the Free Software
|
|
|
|
// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
|
|
// MA 02110-1301, USA.
|
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
#ifndef GOLD_MERGE_H
|
|
|
|
#define GOLD_MERGE_H
|
|
|
|
|
|
|
|
#include <climits>
|
2007-12-21 21:19:45 +00:00
|
|
|
#include <map>
|
|
|
|
#include <vector>
|
2007-05-16 17:42:48 +00:00
|
|
|
|
|
|
|
#include "stringpool.h"
|
|
|
|
#include "output.h"
|
|
|
|
|
|
|
|
namespace gold
|
|
|
|
{
|
|
|
|
|
2007-12-21 21:19:45 +00:00
|
|
|
class Merge_map;
|
|
|
|
|
|
|
|
// For each object with merge sections, we store an Object_merge_map.
|
|
|
|
// This is used to map locations in input sections to a merged output
|
|
|
|
// section. The output section itself is not recorded here--it can be
|
2008-07-10 23:01:20 +00:00
|
|
|
// found in the output_sections_ field of the Object.
|
2007-12-21 21:19:45 +00:00
|
|
|
|
|
|
|
class Object_merge_map
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Object_merge_map()
|
|
|
|
: first_shnum_(-1U), first_map_(),
|
|
|
|
second_shnum_(-1U), second_map_(),
|
|
|
|
section_merge_maps_()
|
|
|
|
{ }
|
|
|
|
|
|
|
|
~Object_merge_map();
|
|
|
|
|
|
|
|
// Add a mapping for MERGE_MAP, for the bytes from OFFSET to OFFSET
|
|
|
|
// + LENGTH in the input section SHNDX to OUTPUT_OFFSET in the
|
|
|
|
// output section. An OUTPUT_OFFSET of -1 means that the bytes are
|
|
|
|
// discarded. OUTPUT_OFFSET is relative to the start of the merged
|
|
|
|
// data in the output section.
|
|
|
|
void
|
|
|
|
add_mapping(const Merge_map*, unsigned int shndx, section_offset_type offset,
|
|
|
|
section_size_type length, section_offset_type output_offset);
|
|
|
|
|
|
|
|
// Get the output offset for an input address. MERGE_MAP is the map
|
|
|
|
// we are looking for, or NULL if we don't care. The input address
|
|
|
|
// is at offset OFFSET in section SHNDX. This sets *OUTPUT_OFFSET
|
|
|
|
// to the offset in the output section; this will be -1 if the bytes
|
|
|
|
// are not being copied to the output. This returns true if the
|
|
|
|
// mapping is known, false otherwise. *OUTPUT_OFFSET is relative to
|
|
|
|
// the start of the merged data in the output section.
|
|
|
|
bool
|
|
|
|
get_output_offset(const Merge_map*, unsigned int shndx,
|
|
|
|
section_offset_type offset,
|
2010-08-25 08:36:54 +00:00
|
|
|
section_offset_type* output_offset);
|
2007-12-21 21:19:45 +00:00
|
|
|
|
|
|
|
// Return whether this is the merge map for section SHNDX.
|
|
|
|
bool
|
|
|
|
is_merge_section_for(const Merge_map*, unsigned int shndx);
|
|
|
|
|
|
|
|
// Initialize an mapping from input offsets to output addresses for
|
|
|
|
// section SHNDX. STARTING_ADDRESS is the output address of the
|
|
|
|
// merged section.
|
|
|
|
template<int size>
|
|
|
|
void
|
|
|
|
initialize_input_to_output_map(
|
|
|
|
unsigned int shndx,
|
|
|
|
typename elfcpp::Elf_types<size>::Elf_Addr starting_address,
|
|
|
|
Unordered_map<section_offset_type,
|
|
|
|
typename elfcpp::Elf_types<size>::Elf_Addr>*);
|
|
|
|
|
|
|
|
private:
|
|
|
|
// Map input section offsets to a length and an output section
|
|
|
|
// offset. An output section offset of -1 means that this part of
|
|
|
|
// the input section is being discarded.
|
|
|
|
struct Input_merge_entry
|
|
|
|
{
|
|
|
|
// The offset in the input section.
|
|
|
|
section_offset_type input_offset;
|
|
|
|
// The length.
|
|
|
|
section_size_type length;
|
|
|
|
// The offset in the output section.
|
|
|
|
section_offset_type output_offset;
|
|
|
|
};
|
|
|
|
|
|
|
|
// A less-than comparison routine for Input_merge_entry.
|
|
|
|
struct Input_merge_compare
|
|
|
|
{
|
|
|
|
bool
|
|
|
|
operator()(const Input_merge_entry& i1, const Input_merge_entry& i2) const
|
|
|
|
{ return i1.input_offset < i2.input_offset; }
|
|
|
|
};
|
|
|
|
|
|
|
|
// A list of entries for a particular input section.
|
|
|
|
struct Input_merge_map
|
|
|
|
{
|
|
|
|
typedef std::vector<Input_merge_entry> Entries;
|
|
|
|
|
|
|
|
// We store these with the Relobj, and we look them up by input
|
|
|
|
// section. It is possible to have two different merge maps
|
|
|
|
// associated with a single output section. For example, this
|
|
|
|
// happens routinely with .rodata, when merged string constants
|
|
|
|
// and merged fixed size constants are both put into .rodata. The
|
|
|
|
// output offset that we store is not the offset from the start of
|
|
|
|
// the output section; it is the offset from the start of the
|
|
|
|
// merged data in the output section. That means that the caller
|
|
|
|
// is going to add the offset of the merged data within the output
|
|
|
|
// section, which means that the caller needs to know which set of
|
|
|
|
// merged data it found the entry in. So it's not enough to find
|
|
|
|
// this data based on the input section and the output section; we
|
|
|
|
// also have to find it based on a set of merged data in the
|
|
|
|
// output section. In order to verify that we are looking at the
|
|
|
|
// right data, we store a pointer to the Merge_map here, and we
|
|
|
|
// pass in a pointer when looking at the data. If we are asked to
|
|
|
|
// look up information for a different Merge_map, we report that
|
|
|
|
// we don't have it, rather than trying a lookup and returning an
|
|
|
|
// answer which will receive the wrong offset.
|
|
|
|
const Merge_map* merge_map;
|
|
|
|
// The list of mappings.
|
|
|
|
Entries entries;
|
|
|
|
// Whether the ENTRIES field is sorted by input_offset.
|
|
|
|
bool sorted;
|
|
|
|
|
|
|
|
Input_merge_map()
|
|
|
|
: merge_map(NULL), entries(), sorted(true)
|
|
|
|
{ }
|
|
|
|
};
|
|
|
|
|
|
|
|
// Map input section indices to merge maps.
|
|
|
|
typedef std::map<unsigned int, Input_merge_map*> Section_merge_maps;
|
|
|
|
|
|
|
|
// Return a pointer to the Input_merge_map to use for the input
|
|
|
|
// section SHNDX, or NULL.
|
|
|
|
Input_merge_map*
|
|
|
|
get_input_merge_map(unsigned int shndx);
|
|
|
|
|
2010-12-14 19:03:30 +00:00
|
|
|
// Get or make the Input_merge_map to use for the section SHNDX
|
2007-12-21 21:19:45 +00:00
|
|
|
// with MERGE_MAP.
|
|
|
|
Input_merge_map*
|
|
|
|
get_or_make_input_merge_map(const Merge_map* merge_map, unsigned int shndx);
|
|
|
|
|
|
|
|
// Any given object file will normally only have a couple of input
|
|
|
|
// sections with mergeable contents. So we keep the first two input
|
|
|
|
// section numbers inline, and push any further ones into a map. A
|
|
|
|
// value of -1U in first_shnum_ or second_shnum_ means that we don't
|
|
|
|
// have a corresponding entry.
|
|
|
|
unsigned int first_shnum_;
|
|
|
|
Input_merge_map first_map_;
|
|
|
|
unsigned int second_shnum_;
|
|
|
|
Input_merge_map second_map_;
|
|
|
|
Section_merge_maps section_merge_maps_;
|
|
|
|
};
|
|
|
|
|
2007-11-09 07:00:15 +00:00
|
|
|
// This class manages mappings from input sections to offsets in an
|
2007-11-27 06:13:33 +00:00
|
|
|
// output section. This is used where input sections are merged. The
|
|
|
|
// actual data is stored in fields in Object.
|
2007-11-09 07:00:15 +00:00
|
|
|
|
|
|
|
class Merge_map
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Merge_map()
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Add a mapping for the bytes from OFFSET to OFFSET + LENGTH in the
|
|
|
|
// input section SHNDX in object OBJECT to OUTPUT_OFFSET in the
|
|
|
|
// output section. An OUTPUT_OFFSET of -1 means that the bytes are
|
2007-12-20 16:27:34 +00:00
|
|
|
// discarded. OUTPUT_OFFSET is not the offset from the start of the
|
|
|
|
// output section, it is the offset from the start of the merged
|
|
|
|
// data within the output section.
|
2007-11-09 07:00:15 +00:00
|
|
|
void
|
2007-12-18 00:48:04 +00:00
|
|
|
add_mapping(Relobj* object, unsigned int shndx,
|
|
|
|
section_offset_type offset, section_size_type length,
|
|
|
|
section_offset_type output_offset);
|
2007-11-09 07:00:15 +00:00
|
|
|
|
|
|
|
// Return the output offset for an input address. The input address
|
|
|
|
// is at offset OFFSET in section SHNDX in OBJECT. This sets
|
|
|
|
// *OUTPUT_OFFSET to the offset in the output section; this will be
|
|
|
|
// -1 if the bytes are not being copied to the output. This returns
|
2007-12-20 16:27:34 +00:00
|
|
|
// true if the mapping is known, false otherwise. This returns the
|
|
|
|
// value stored by add_mapping, namely the offset from the start of
|
|
|
|
// the merged data within the output section.
|
2007-11-09 07:00:15 +00:00
|
|
|
bool
|
2007-12-18 00:48:04 +00:00
|
|
|
get_output_offset(const Relobj* object, unsigned int shndx,
|
|
|
|
section_offset_type offset,
|
2010-08-25 08:36:54 +00:00
|
|
|
section_offset_type* output_offset) const;
|
2007-12-21 21:19:45 +00:00
|
|
|
|
|
|
|
// Return whether this is the merge mapping for section SHNDX in
|
|
|
|
// OBJECT. This should return true when get_output_offset would
|
|
|
|
// return true for some input offset.
|
|
|
|
bool
|
|
|
|
is_merge_section_for(const Relobj* object, unsigned int shndx) const;
|
2007-11-09 07:00:15 +00:00
|
|
|
};
|
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// A general class for SHF_MERGE data, to hold functions shared by
|
|
|
|
// fixed-size constant data and string data.
|
|
|
|
|
|
|
|
class Output_merge_base : public Output_section_data
|
|
|
|
{
|
|
|
|
public:
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_merge_base(uint64_t entsize, uint64_t addralign)
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
: Output_section_data(addralign), merge_map_(), entsize_(entsize),
|
|
|
|
keeps_input_sections_(false), first_relobj_(NULL), first_shndx_(-1),
|
|
|
|
input_sections_()
|
2007-05-16 17:42:48 +00:00
|
|
|
{ }
|
|
|
|
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
// Return the entry size.
|
|
|
|
uint64_t
|
|
|
|
entsize() const
|
|
|
|
{ return this->entsize_; }
|
|
|
|
|
|
|
|
// Whether this is a merge string section. This is only true of
|
|
|
|
// Output_merge_string.
|
|
|
|
bool
|
|
|
|
is_string()
|
|
|
|
{ return this->do_is_string(); }
|
|
|
|
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
// Whether this keeps input sections.
|
|
|
|
bool
|
|
|
|
keeps_input_sections() const
|
|
|
|
{ return this->keeps_input_sections_; }
|
|
|
|
|
|
|
|
// Set the keeps-input-sections flag. This is virtual so that sub-classes
|
|
|
|
// can perform additional checks.
|
|
|
|
void
|
|
|
|
set_keeps_input_sections()
|
|
|
|
{ this->do_set_keeps_input_sections(); }
|
|
|
|
|
|
|
|
// Return the object of the first merged input section. This used
|
|
|
|
// for script processing. This is NULL if merge section is empty.
|
|
|
|
Relobj*
|
|
|
|
first_relobj() const
|
|
|
|
{ return this->first_relobj_; }
|
|
|
|
|
|
|
|
// Return the section index of the first merged input section. This
|
|
|
|
// is used for script processing. This is valid only if merge section
|
|
|
|
// is not valid.
|
|
|
|
unsigned int
|
|
|
|
first_shndx() const
|
|
|
|
{
|
|
|
|
gold_assert(this->first_relobj_ != NULL);
|
|
|
|
return this->first_shndx_;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set of merged input sections.
|
|
|
|
typedef Unordered_set<Section_id, Section_id_hash> Input_sections;
|
|
|
|
|
|
|
|
// Beginning of merged input sections.
|
|
|
|
Input_sections::const_iterator
|
|
|
|
input_sections_begin() const
|
|
|
|
{
|
|
|
|
gold_assert(this->keeps_input_sections_);
|
|
|
|
return this->input_sections_.begin();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Beginning of merged input sections.
|
|
|
|
Input_sections::const_iterator
|
|
|
|
input_sections_end() const
|
|
|
|
{
|
|
|
|
gold_assert(this->keeps_input_sections_);
|
|
|
|
return this->input_sections_.end();
|
|
|
|
}
|
|
|
|
|
2007-12-21 21:19:45 +00:00
|
|
|
protected:
|
2007-11-09 07:00:15 +00:00
|
|
|
// Return the output offset for an input offset.
|
2007-05-16 17:42:48 +00:00
|
|
|
bool
|
2007-12-18 00:48:04 +00:00
|
|
|
do_output_offset(const Relobj* object, unsigned int shndx,
|
|
|
|
section_offset_type offset,
|
|
|
|
section_offset_type* poutput) const;
|
2007-05-16 17:42:48 +00:00
|
|
|
|
2007-12-21 21:19:45 +00:00
|
|
|
// Return whether this is the merge section for an input section.
|
|
|
|
bool
|
|
|
|
do_is_merge_section_for(const Relobj*, unsigned int shndx) const;
|
|
|
|
|
2009-12-14 19:53:05 +00:00
|
|
|
// Add a mapping from an OFFSET in input section SHNDX in object
|
|
|
|
// OBJECT to an OUTPUT_OFFSET in the output section. OUTPUT_OFFSET
|
2007-12-20 16:27:34 +00:00
|
|
|
// is the offset from the start of the merged data in the output
|
|
|
|
// section.
|
2007-05-16 17:42:48 +00:00
|
|
|
void
|
2009-12-14 19:53:05 +00:00
|
|
|
add_mapping(Relobj* object, unsigned int shndx, section_offset_type offset,
|
|
|
|
section_size_type length, section_offset_type output_offset)
|
2007-05-16 17:42:48 +00:00
|
|
|
{
|
2009-12-14 19:53:05 +00:00
|
|
|
this->merge_map_.add_mapping(object, shndx, offset, length, output_offset);
|
2007-11-09 07:00:15 +00:00
|
|
|
}
|
2007-05-16 17:42:48 +00:00
|
|
|
|
2010-12-14 19:03:30 +00:00
|
|
|
// This may be overridden by the child class.
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
virtual bool
|
|
|
|
do_is_string()
|
|
|
|
{ return false; }
|
|
|
|
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
// This may be overridden by the child class.
|
|
|
|
virtual void
|
|
|
|
do_set_keeps_input_sections()
|
|
|
|
{ this->keeps_input_sections_ = true; }
|
|
|
|
|
|
|
|
// Record the merged input section for script processing.
|
|
|
|
void
|
|
|
|
record_input_section(Relobj* relobj, unsigned int shndx);
|
|
|
|
|
2007-11-09 07:00:15 +00:00
|
|
|
private:
|
2007-05-16 17:42:48 +00:00
|
|
|
// A mapping from input object/section/offset to offset in output
|
|
|
|
// section.
|
|
|
|
Merge_map merge_map_;
|
|
|
|
// The entry size. For fixed-size constants, this is the size of
|
|
|
|
// the constants. For strings, this is the size of a character.
|
|
|
|
uint64_t entsize_;
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
// Whether we keep input sections.
|
|
|
|
bool keeps_input_sections_;
|
|
|
|
// Object of the first merged input section. We use this for script
|
|
|
|
// processing.
|
|
|
|
Relobj* first_relobj_;
|
|
|
|
// Section index of the first merged input section.
|
|
|
|
unsigned int first_shndx_;
|
|
|
|
// Input sections. We only keep them is keeps_input_sections_ is true.
|
|
|
|
Input_sections input_sections_;
|
2007-05-16 17:42:48 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
// Handle SHF_MERGE sections with fixed-size constant data.
|
|
|
|
|
|
|
|
class Output_merge_data : public Output_merge_base
|
|
|
|
{
|
|
|
|
public:
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_merge_data(uint64_t entsize, uint64_t addralign)
|
|
|
|
: Output_merge_base(entsize, addralign), p_(NULL), len_(0), alc_(0),
|
2007-12-18 21:24:10 +00:00
|
|
|
input_count_(0),
|
2007-05-16 17:42:48 +00:00
|
|
|
hashtable_(128, Merge_data_hash(this), Merge_data_eq(this))
|
|
|
|
{ }
|
|
|
|
|
2007-12-18 21:24:10 +00:00
|
|
|
protected:
|
2007-05-16 17:42:48 +00:00
|
|
|
// Add an input section.
|
|
|
|
bool
|
|
|
|
do_add_input_section(Relobj* object, unsigned int shndx);
|
|
|
|
|
|
|
|
// Set the final data size.
|
|
|
|
void
|
2007-11-29 20:10:17 +00:00
|
|
|
set_final_data_size();
|
2007-05-16 17:42:48 +00:00
|
|
|
|
|
|
|
// Write the data to the file.
|
|
|
|
void
|
|
|
|
do_write(Output_file*);
|
|
|
|
|
2007-12-01 06:34:12 +00:00
|
|
|
// Write the data to a buffer.
|
|
|
|
void
|
|
|
|
do_write_to_buffer(unsigned char*);
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** merge constants")); }
|
|
|
|
|
2007-12-18 21:24:10 +00:00
|
|
|
// Print merge stats to stderr.
|
|
|
|
void
|
|
|
|
do_print_merge_stats(const char* section_name);
|
|
|
|
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
// Set keeps-input-sections flag.
|
|
|
|
void
|
|
|
|
do_set_keeps_input_sections()
|
|
|
|
{
|
|
|
|
gold_assert(this->input_count_ == 0);
|
|
|
|
Output_merge_base::do_set_keeps_input_sections();
|
|
|
|
}
|
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
private:
|
|
|
|
// We build a hash table of the fixed-size constants. Each constant
|
|
|
|
// is stored as a pointer into the section data we are accumulating.
|
|
|
|
|
|
|
|
// A key in the hash table. This is an offset in the section
|
|
|
|
// contents we are building.
|
2007-12-18 00:48:04 +00:00
|
|
|
typedef section_offset_type Merge_data_key;
|
2007-05-16 17:42:48 +00:00
|
|
|
|
|
|
|
// Compute the hash code. To do this we need a pointer back to the
|
|
|
|
// object holding the data.
|
|
|
|
class Merge_data_hash
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Merge_data_hash(const Output_merge_data* pomd)
|
|
|
|
: pomd_(pomd)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
size_t
|
|
|
|
operator()(Merge_data_key) const;
|
|
|
|
|
|
|
|
private:
|
|
|
|
const Output_merge_data* pomd_;
|
|
|
|
};
|
|
|
|
|
|
|
|
friend class Merge_data_hash;
|
|
|
|
|
|
|
|
// Compare two entries in the hash table for equality. To do this
|
|
|
|
// we need a pointer back to the object holding the data. Note that
|
|
|
|
// we now have a pointer to the object stored in two places in the
|
|
|
|
// hash table. Fixing this would require specializing the hash
|
|
|
|
// table, which would be hard to do portably.
|
|
|
|
class Merge_data_eq
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Merge_data_eq(const Output_merge_data* pomd)
|
|
|
|
: pomd_(pomd)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
bool
|
|
|
|
operator()(Merge_data_key k1, Merge_data_key k2) const;
|
|
|
|
|
|
|
|
private:
|
|
|
|
const Output_merge_data* pomd_;
|
|
|
|
};
|
|
|
|
|
|
|
|
friend class Merge_data_eq;
|
|
|
|
|
|
|
|
// The type of the hash table.
|
|
|
|
typedef Unordered_set<Merge_data_key, Merge_data_hash, Merge_data_eq>
|
|
|
|
Merge_data_hashtable;
|
|
|
|
|
|
|
|
// Given a hash table key, which is just an offset into the section
|
|
|
|
// data, return a pointer to the corresponding constant.
|
|
|
|
const unsigned char*
|
|
|
|
constant(Merge_data_key k) const
|
|
|
|
{
|
2007-12-18 00:48:04 +00:00
|
|
|
gold_assert(k >= 0 && k < static_cast<section_offset_type>(this->len_));
|
2007-05-16 17:42:48 +00:00
|
|
|
return this->p_ + k;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a constant to the output.
|
|
|
|
void
|
|
|
|
add_constant(const unsigned char*);
|
|
|
|
|
|
|
|
// The accumulated data.
|
|
|
|
unsigned char* p_;
|
|
|
|
// The length of the accumulated data.
|
2007-12-18 00:48:04 +00:00
|
|
|
section_size_type len_;
|
2007-05-16 17:42:48 +00:00
|
|
|
// The size of the allocated buffer.
|
2007-12-18 00:48:04 +00:00
|
|
|
section_size_type alc_;
|
2007-12-18 21:24:10 +00:00
|
|
|
// The number of entries seen in input files.
|
|
|
|
size_t input_count_;
|
2007-05-16 17:42:48 +00:00
|
|
|
// The hash table.
|
|
|
|
Merge_data_hashtable hashtable_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Handle SHF_MERGE sections with string data. This is a template
|
|
|
|
// based on the type of the characters in the string.
|
|
|
|
|
|
|
|
template<typename Char_type>
|
|
|
|
class Output_merge_string : public Output_merge_base
|
|
|
|
{
|
|
|
|
public:
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_merge_string(uint64_t addralign)
|
2013-04-29 17:15:09 +00:00
|
|
|
: Output_merge_base(sizeof(Char_type), addralign), stringpool_(addralign),
|
2010-08-03 20:38:09 +00:00
|
|
|
merged_strings_lists_(), input_count_(0), input_size_(0)
|
2007-10-18 17:46:23 +00:00
|
|
|
{
|
|
|
|
this->stringpool_.set_no_zero_null();
|
|
|
|
}
|
2007-05-16 17:42:48 +00:00
|
|
|
|
2007-11-30 00:35:27 +00:00
|
|
|
protected:
|
2007-05-16 17:42:48 +00:00
|
|
|
// Add an input section.
|
|
|
|
bool
|
|
|
|
do_add_input_section(Relobj* object, unsigned int shndx);
|
|
|
|
|
2007-11-30 00:35:27 +00:00
|
|
|
// Do all the final processing after the input sections are read in.
|
|
|
|
// Returns the final data size.
|
2007-12-18 00:48:04 +00:00
|
|
|
section_size_type
|
2007-11-30 00:35:27 +00:00
|
|
|
finalize_merged_data();
|
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// Set the final data size.
|
|
|
|
void
|
2007-11-29 20:10:17 +00:00
|
|
|
set_final_data_size();
|
2007-05-16 17:42:48 +00:00
|
|
|
|
|
|
|
// Write the data to the file.
|
|
|
|
void
|
|
|
|
do_write(Output_file*);
|
|
|
|
|
2007-12-01 06:34:12 +00:00
|
|
|
// Write the data to a buffer.
|
|
|
|
void
|
|
|
|
do_write_to_buffer(unsigned char*);
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** merge strings")); }
|
|
|
|
|
2007-12-18 21:24:10 +00:00
|
|
|
// Print merge stats to stderr.
|
|
|
|
void
|
|
|
|
do_print_merge_stats(const char* section_name);
|
|
|
|
|
2007-11-30 00:35:27 +00:00
|
|
|
// Writes the stringpool to a buffer.
|
|
|
|
void
|
2007-12-18 00:48:04 +00:00
|
|
|
stringpool_to_buffer(unsigned char* buffer, section_size_type buffer_size)
|
2007-11-30 00:35:27 +00:00
|
|
|
{ this->stringpool_.write_to_buffer(buffer, buffer_size); }
|
|
|
|
|
|
|
|
// Clears all the data in the stringpool, to save on memory.
|
|
|
|
void
|
|
|
|
clear_stringpool()
|
2007-12-08 03:05:27 +00:00
|
|
|
{ this->stringpool_.clear(); }
|
2007-11-30 00:35:27 +00:00
|
|
|
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
// Whether this is a merge string section.
|
|
|
|
virtual bool
|
|
|
|
do_is_string()
|
|
|
|
{ return true; }
|
|
|
|
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
// Set keeps-input-sections flag.
|
|
|
|
void
|
|
|
|
do_set_keeps_input_sections()
|
|
|
|
{
|
|
|
|
gold_assert(this->input_count_ == 0);
|
|
|
|
Output_merge_base::do_set_keeps_input_sections();
|
|
|
|
}
|
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
private:
|
2007-12-18 21:24:10 +00:00
|
|
|
// The name of the string type, for stats.
|
|
|
|
const char*
|
|
|
|
string_name();
|
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// As we see input sections, we build a mapping from object, section
|
|
|
|
// index and offset to strings.
|
2007-09-22 05:38:12 +00:00
|
|
|
struct Merged_string
|
2007-05-16 17:42:48 +00:00
|
|
|
{
|
2007-09-22 05:38:12 +00:00
|
|
|
// The offset in the input section.
|
2007-12-18 00:48:04 +00:00
|
|
|
section_offset_type offset;
|
2007-12-19 01:23:46 +00:00
|
|
|
// The key in the Stringpool.
|
|
|
|
Stringpool::Key stringpool_key;
|
2007-05-16 17:42:48 +00:00
|
|
|
|
2010-07-21 21:03:54 +00:00
|
|
|
Merged_string(section_offset_type offseta, Stringpool::Key stringpool_keya)
|
|
|
|
: offset(offseta), stringpool_key(stringpool_keya)
|
2007-05-16 17:42:48 +00:00
|
|
|
{ }
|
|
|
|
};
|
|
|
|
|
2007-09-22 05:38:12 +00:00
|
|
|
typedef std::vector<Merged_string> Merged_strings;
|
2007-05-16 17:42:48 +00:00
|
|
|
|
2010-07-21 21:03:54 +00:00
|
|
|
struct Merged_strings_list
|
|
|
|
{
|
|
|
|
// The input object where the strings were found.
|
|
|
|
Relobj* object;
|
|
|
|
// The input section in the input object.
|
|
|
|
unsigned int shndx;
|
|
|
|
// The list of merged strings.
|
|
|
|
Merged_strings merged_strings;
|
|
|
|
|
|
|
|
Merged_strings_list(Relobj* objecta, unsigned int shndxa)
|
|
|
|
: object(objecta), shndx(shndxa), merged_strings()
|
|
|
|
{ }
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef std::vector<Merged_strings_list*> Merged_strings_lists;
|
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// 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.
|
2010-07-21 21:03:54 +00:00
|
|
|
Merged_strings_lists merged_strings_lists_;
|
2007-12-18 21:24:10 +00:00
|
|
|
// The number of entries seen in input files.
|
|
|
|
size_t input_count_;
|
2010-08-03 20:38:09 +00:00
|
|
|
// The total size of input sections.
|
|
|
|
size_t input_size_;
|
2007-05-16 17:42:48 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
} // End namespace gold.
|
|
|
|
|
|
|
|
#endif // !defined(GOLD_MERGE_H)
|