// fileread.cc -- read files for gold
-// Copyright 2006, 2007 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold.
#include <sys/uio.h>
#include "filenames.h"
+#include "debug.h"
+#include "parameters.h"
#include "options.h"
#include "dirsearch.h"
+#include "target.h"
+#include "binary.h"
+#include "descriptors.h"
#include "fileread.h"
namespace gold
unsigned long long File_read::current_mapped_bytes;
unsigned long long File_read::maximum_mapped_bytes;
-// The File_read class is designed to support file descriptor caching,
-// but this is not currently implemented.
-
File_read::~File_read()
{
gold_assert(this->token_.is_writable());
- if (this->descriptor_ >= 0)
+ if (this->is_descriptor_opened_)
{
- if (close(this->descriptor_) < 0)
- gold_warning(_("close of %s failed: %s"),
- this->name_.c_str(), strerror(errno));
+ release_descriptor(this->descriptor_, true);
this->descriptor_ = -1;
+ this->is_descriptor_opened_ = false;
}
this->name_.clear();
this->clear_views(true);
{
gold_assert(this->token_.is_writable()
&& this->descriptor_ < 0
+ && !this->is_descriptor_opened_
&& this->name_.empty());
this->name_ = name;
- this->descriptor_ = ::open(this->name_.c_str(), O_RDONLY);
+ this->descriptor_ = open_descriptor(-1, this->name_.c_str(),
+ O_RDONLY);
if (this->descriptor_ >= 0)
{
+ this->is_descriptor_opened_ = true;
struct stat s;
if (::fstat(this->descriptor_, &s) < 0)
gold_error(_("%s: fstat failed: %s"),
this->name_.c_str(), strerror(errno));
this->size_ = s.st_size;
+ gold_debug(DEBUG_FILES, "Attempt to open %s succeeded",
+ this->name_.c_str());
}
this->token_.add_writer(task);
return this->descriptor_ >= 0;
}
-// Open the file for testing purposes.
+// Open the file with the contents in memory.
bool
File_read::open(const Task* task, const std::string& name,
{
gold_assert(this->token_.is_writable()
&& this->descriptor_ < 0
+ && !this->is_descriptor_opened_
&& this->name_.empty());
this->name_ = name;
this->contents_ = contents;
return true;
}
+// Reopen a descriptor if necessary.
+
+void
+File_read::reopen_descriptor()
+{
+ if (!this->is_descriptor_opened_)
+ {
+ this->descriptor_ = open_descriptor(this->descriptor_,
+ this->name_.c_str(),
+ O_RDONLY);
+ if (this->descriptor_ < 0)
+ gold_fatal(_("could not reopen file %s"), this->name_.c_str());
+ this->is_descriptor_opened_ = true;
+ }
+}
+
// Release the file. This is called when we are done with the file in
// a Task.
if (File_read::current_mapped_bytes > File_read::maximum_mapped_bytes)
File_read::maximum_mapped_bytes = File_read::current_mapped_bytes;
- this->clear_views(false);
+ // Only clear views if there is only one attached object. Otherwise
+ // we waste time trying to clear cached archive views. Similarly
+ // for releasing the descriptor.
+ if (this->object_count_ <= 1)
+ {
+ this->clear_views(false);
+ if (this->is_descriptor_opened_)
+ {
+ release_descriptor(this->descriptor_, false);
+ this->is_descriptor_opened_ = false;
+ }
+ }
this->released_ = true;
}
// See if we have a view which covers the file starting at START for
// SIZE bytes. Return a pointer to the View if found, NULL if not.
+// If BYTESHIFT is not -1U, the returned View must have the specified
+// byte shift; otherwise, it may have any byte shift. If VSHIFTED is
+// not NULL, this sets *VSHIFTED to a view which would have worked if
+// not for the requested BYTESHIFT.
inline File_read::View*
-File_read::find_view(off_t start, section_size_type size) const
+File_read::find_view(off_t start, section_size_type size,
+ unsigned int byteshift, File_read::View** vshifted) const
{
+ if (vshifted != NULL)
+ *vshifted = NULL;
+
off_t page = File_read::page_offset(start);
- Views::const_iterator p = this->views_.lower_bound(page);
- if (p == this->views_.end() || p->first > page)
+ unsigned int bszero = 0;
+ Views::const_iterator p = this->views_.upper_bound(std::make_pair(page - 1,
+ bszero));
+
+ while (p != this->views_.end() && p->first.first <= page)
{
- if (p == this->views_.begin())
- return NULL;
- --p;
- }
+ if (p->second->start() <= start
+ && (p->second->start() + static_cast<off_t>(p->second->size())
+ >= start + static_cast<off_t>(size)))
+ {
+ if (byteshift == -1U || byteshift == p->second->byteshift())
+ {
+ p->second->set_accessed();
+ return p->second;
+ }
- if (p->second->start() + static_cast<off_t>(p->second->size())
- < start + static_cast<off_t>(size))
- return NULL;
+ if (vshifted != NULL && *vshifted == NULL)
+ *vshifted = p->second;
+ }
- p->second->set_accessed();
+ ++p;
+ }
- return p->second;
+ return NULL;
}
// Read SIZE bytes from the file starting at offset START. Read into
// the buffer at P.
void
-File_read::do_read(off_t start, section_size_type size, void* p) const
+File_read::do_read(off_t start, section_size_type size, void* p)
{
ssize_t bytes;
if (this->contents_ != NULL)
}
else
{
+ this->reopen_descriptor();
bytes = ::pread(this->descriptor_, p, size, start);
if (static_cast<section_size_type>(bytes) == size)
return;
// Read data from the file.
void
-File_read::read(off_t start, section_size_type size, void* p) const
+File_read::read(off_t start, section_size_type size, void* p)
{
- const File_read::View* pv = this->find_view(start, size);
+ const File_read::View* pv = this->find_view(start, size, -1U, NULL);
if (pv != NULL)
{
- memcpy(p, pv->data() + (start - pv->start()), size);
+ memcpy(p, pv->data() + (start - pv->start() + pv->byteshift()), size);
return;
}
this->do_read(start, size, p);
}
-// Find an existing view or make a new one.
+// Add a new view. There may already be an existing view at this
+// offset. If there is, the new view will be larger, and should
+// replace the old view.
-File_read::View*
-File_read::find_or_make_view(off_t start, section_size_type size, bool cache)
+void
+File_read::add_view(File_read::View* v)
{
- gold_assert(!this->token_.is_writable());
- this->released_ = false;
+ std::pair<Views::iterator, bool> ins =
+ this->views_.insert(std::make_pair(std::make_pair(v->start(),
+ v->byteshift()),
+ v));
+ if (ins.second)
+ return;
- File_read::View* v = this->find_view(start, size);
- if (v != NULL)
+ // There was an existing view at this offset. It must not be large
+ // enough. We can't delete it here, since something might be using
+ // it; we put it on a list to be deleted when the file is unlocked.
+ File_read::View* vold = ins.first->second;
+ gold_assert(vold->size() < v->size());
+ if (vold->should_cache())
{
- if (cache)
- v->set_cache();
- return v;
+ v->set_cache();
+ vold->clear_cache();
}
+ this->saved_views_.push_back(vold);
- off_t poff = File_read::page_offset(start);
+ ins.first->second = v;
+}
- File_read::View* const vnull = NULL;
- std::pair<Views::iterator, bool> ins =
- this->views_.insert(std::make_pair(poff, vnull));
+// Make a new view with a specified byteshift, reading the data from
+// the file.
- if (!ins.second)
- {
- // There was an existing view at this offset. It must not be
- // large enough. We can't delete it here, since something might
- // be using it; put it on a list to be deleted when the file is
- // unlocked.
- v = ins.first->second;
- gold_assert(v->size() - (start - v->start()) < size);
- if (v->should_cache())
- cache = true;
- v->clear_cache();
- this->saved_views_.push_back(v);
- }
+File_read::View*
+File_read::make_view(off_t start, section_size_type size,
+ unsigned int byteshift, bool cache)
+{
+ gold_assert(size > 0);
- // We need to map data from the file.
+ off_t poff = File_read::page_offset(start);
section_size_type psize = File_read::pages(size + (start - poff));
gold_assert(psize >= size);
}
- if (this->contents_ != NULL)
+ File_read::View* v;
+ if (this->contents_ != NULL || byteshift != 0)
{
- unsigned char* p = new unsigned char[psize];
- this->do_read(poff, psize, p);
- v = new File_read::View(poff, psize, p, cache, false);
+ unsigned char* p = new unsigned char[psize + byteshift];
+ memset(p, 0, byteshift);
+ this->do_read(poff, psize, p + byteshift);
+ v = new File_read::View(poff, psize, p, byteshift, cache, false);
}
else
{
+ this->reopen_descriptor();
void* p = ::mmap(NULL, psize, PROT_READ, MAP_PRIVATE,
this->descriptor_, poff);
if (p == MAP_FAILED)
this->mapped_bytes_ += psize;
const unsigned char* pbytes = static_cast<const unsigned char*>(p);
- v = new File_read::View(poff, psize, pbytes, cache, true);
+ v = new File_read::View(poff, psize, pbytes, 0, cache, true);
}
- ins.first->second = v;
+ this->add_view(v);
+
return v;
}
+// Find a View or make a new one, shifted as required by the file
+// offset OFFSET and ALIGNED.
+
+File_read::View*
+File_read::find_or_make_view(off_t offset, off_t start,
+ section_size_type size, bool aligned, bool cache)
+{
+ unsigned int byteshift;
+ if (offset == 0)
+ byteshift = 0;
+ else
+ {
+ unsigned int target_size = (!parameters->target_valid()
+ ? 64
+ : parameters->target().get_size());
+ byteshift = offset & ((target_size / 8) - 1);
+
+ // Set BYTESHIFT to the number of dummy bytes which must be
+ // inserted before the data in order for this data to be
+ // aligned.
+ if (byteshift != 0)
+ byteshift = (target_size / 8) - byteshift;
+ }
+
+ // Try to find a View with the required BYTESHIFT.
+ File_read::View* vshifted;
+ File_read::View* v = this->find_view(offset + start, size,
+ aligned ? byteshift : -1U,
+ &vshifted);
+ if (v != NULL)
+ {
+ if (cache)
+ v->set_cache();
+ return v;
+ }
+
+ // If VSHIFTED is not NULL, then it has the data we need, but with
+ // the wrong byteshift.
+ v = vshifted;
+ if (v != NULL)
+ {
+ gold_assert(aligned);
+
+ unsigned char* pbytes = new unsigned char[v->size() + byteshift];
+ memset(pbytes, 0, byteshift);
+ memcpy(pbytes + byteshift, v->data() + v->byteshift(), v->size());
+
+ File_read::View* shifted_view = new File_read::View(v->start(), v->size(),
+ pbytes, byteshift,
+ cache, false);
+
+ this->add_view(shifted_view);
+ return shifted_view;
+ }
+
+ // Make a new view. If we don't need an aligned view, use a
+ // byteshift of 0, so that we can use mmap.
+ return this->make_view(offset + start, size,
+ aligned ? byteshift : 0,
+ cache);
+}
+
// Get a view into the file.
const unsigned char*
-File_read::get_view(off_t start, section_size_type size, bool cache)
+File_read::get_view(off_t offset, off_t start, section_size_type size,
+ bool aligned, bool cache)
{
- File_read::View* pv = this->find_or_make_view(start, size, cache);
- return pv->data() + (start - pv->start());
+ File_read::View* pv = this->find_or_make_view(offset, start, size,
+ aligned, cache);
+ return pv->data() + (offset + start - pv->start() + pv->byteshift());
}
File_view*
-File_read::get_lasting_view(off_t start, section_size_type size, bool cache)
+File_read::get_lasting_view(off_t offset, off_t start, section_size_type size,
+ bool aligned, bool cache)
{
- File_read::View* pv = this->find_or_make_view(start, size, cache);
+ File_read::View* pv = this->find_or_make_view(offset, start, size,
+ aligned, cache);
pv->lock();
- return new File_view(*this, pv, pv->data() + (start - pv->start()));
+ return new File_view(*this, pv,
+ (pv->data()
+ + (offset + start - pv->start() + pv->byteshift())));
}
// Use readv to read COUNT entries from RM starting at START. BASE
last_offset = i_entry.file_offset + i_entry.size;
}
+ this->reopen_descriptor();
+
gold_assert(iov_index < sizeof iov / sizeof iov[0]);
if (::lseek(this->descriptor_, base + first_offset, SEEK_SET) < 0)
else
{
File_read::View* view = this->find_view(base + i_off,
- end_off - i_off);
+ end_off - i_off,
+ -1U, NULL);
if (view == NULL)
this->do_readv(base, rm, i, j - i);
else
{
const unsigned char* v = (view->data()
- + (base + i_off - view->start()));
+ + (base + i_off - view->start()
+ + view->byteshift()));
for (size_t k = i; k < j; ++k)
{
const Read_multiple_entry& k_entry(rm[k]);
n1 += this->input_argument_->name();
std::string n2;
if (options.is_static()
- || this->input_argument_->options().do_static_search())
+ || !this->input_argument_->options().Bdynamic())
n1 += ".a";
else
{
}
// Now that we've figured out where the file lives, try to open it.
- if (!this->file_.open(task, name))
+
+ General_options::Object_format format =
+ this->input_argument_->options().format_enum();
+ bool ok;
+ if (format == General_options::OBJECT_FORMAT_ELF)
+ ok = this->file_.open(task, name);
+ else
+ {
+ gold_assert(format == General_options::OBJECT_FORMAT_BINARY);
+ ok = this->open_binary(options, task, name);
+ }
+
+ if (!ok)
{
gold_error(_("cannot open %s: %s"),
name.c_str(), strerror(errno));
return true;
}
+// Open a file for --format binary.
+
+bool
+Input_file::open_binary(const General_options&,
+ const Task* task, const std::string& name)
+{
+ // In order to open a binary file, we need machine code, size, and
+ // endianness. We may not have a valid target at this point, in
+ // which case we use the default target.
+ const Target* target;
+ if (parameters->target_valid())
+ target = ¶meters->target();
+ else
+ target = ¶meters->default_target();
+
+ Binary_to_elf binary_to_elf(target->machine_code(),
+ target->get_size(),
+ target->is_big_endian(),
+ name);
+ if (!binary_to_elf.convert(task))
+ return false;
+ return this->file_.open(task, name, binary_to_elf.converted_data_leak(),
+ binary_to_elf.converted_size());
+}
+
} // End namespace gold.
projects / deliverable / binutils-gdb.git / blobdiff