bfd/

[deliverable/binutils-gdb.git] / gold / fileread.cc

diff --git a/gold/fileread.cc b/gold/fileread.cc
index 43c69b3cf417e2e6ad852687cb28cbfa8a9a5aea..1a142022569a624bdfd8e7148404374e96a1d104 100644 (file)
--- a/gold/fileread.cc
+++ b/gold/fileread.cc
@@ -2,7 +2,6 @@
 
 #include "gold.h"
 
-#include <cassert>
 #include <cstring>
 #include <cerrno>
 #include <fcntl.h>
@@ -19,7 +18,7 @@ namespace gold
 
 File_read::View::~View()
 {
-  assert(!this->is_locked());
+  gold_assert(!this->is_locked());
   delete[] this->data_;
 }
 
@@ -32,7 +31,7 @@ File_read::View::lock()
 void
 File_read::View::unlock()
 {
-  assert(this->lock_count_ > 0);
+  gold_assert(this->lock_count_ > 0);
   --this->lock_count_;
 }
 
@@ -49,7 +48,7 @@ File_read::View::is_locked()
 
 File_read::~File_read()
 {
-  assert(this->lock_count_ == 0);
+  gold_assert(this->lock_count_ == 0);
   if (this->descriptor_ >= 0)
     {
       if (close(this->descriptor_) < 0)
@@ -61,23 +60,34 @@ File_read::~File_read()
   this->clear_views(true);
 }
 
+// Open the file.
+
 bool
 File_read::open(const std::string& name)
 {
-  assert(this->lock_count_ == 0
-        && this->descriptor_ < 0
-        && this->name_.empty());
+  gold_assert(this->lock_count_ == 0
+             && this->descriptor_ < 0
+             && this->name_.empty());
   this->name_ = name;
   this->descriptor_ = ::open(this->name_.c_str(), O_RDONLY);
   ++this->lock_count_;
   return this->descriptor_ >= 0;
 }
 
-int
-File_read::get_descriptor()
+// Open the file for testing purposes.
+
+bool
+File_read::open(const std::string& name, const unsigned char* contents,
+               off_t contents_size)
 {
-  assert(this->lock_count_ > 0);
-  return this->descriptor_;
+  gold_assert(this->lock_count_ == 0
+             && this->descriptor_ < 0
+             && this->name_.empty());
+  this->name_ = name;
+  this->contents_ = contents;
+  this->contents_size_ = contents_size;
+  ++this->lock_count_;
+  return true;
 }
 
 void
@@ -89,7 +99,7 @@ File_read::lock()
 void
 File_read::unlock()
 {
-  assert(this->lock_count_ > 0);
+  gold_assert(this->lock_count_ > 0);
   --this->lock_count_;
 }
 
@@ -121,24 +131,38 @@ File_read::find_view(off_t start, off_t size)
 off_t
 File_read::do_read(off_t start, off_t size, void* p, off_t* pbytes)
 {
-  assert(this->lock_count_ > 0);
-  int o = this->descriptor_;
+  gold_assert(this->lock_count_ > 0);
 
-  if (lseek(o, start, SEEK_SET) < 0)
+  off_t bytes;
+  if (this->contents_ == NULL)
     {
-      fprintf(stderr, _("%s: %s: lseek to %lld failed: %s"),
-             program_name, this->filename().c_str(),
-             static_cast<long long>(start),
-             strerror(errno));
-      gold_exit(false);
-    }
+      int o = this->descriptor_;
+
+      if (lseek(o, start, SEEK_SET) < 0)
+       {
+         fprintf(stderr, _("%s: %s: lseek to %lld failed: %s"),
+                 program_name, this->filename().c_str(),
+                 static_cast<long long>(start),
+                 strerror(errno));
+         gold_exit(false);
+       }
 
-  off_t bytes = ::read(o, p, size);
-  if (bytes < 0)
+      bytes = ::read(o, p, size);
+      if (bytes < 0)
+       {
+         fprintf(stderr, _("%s: %s: read failed: %s\n"),
+                 program_name, this->filename().c_str(), strerror(errno));
+         gold_exit(false);
+       }
+    }
+  else
     {
-      fprintf(stderr, _("%s: %s: read failed: %s\n"),
-             program_name, this->filename().c_str(), strerror(errno));
-      gold_exit(false);
+      bytes = this->contents_size_ - start;
+      if (bytes < 0)
+       bytes = 0;
+      else if (bytes > size)
+       bytes = size;
+      memcpy(p, this->contents_ + start, bytes);
     }
 
   if (pbytes != NULL)
@@ -161,7 +185,7 @@ File_read::do_read(off_t start, off_t size, void* p, off_t* pbytes)
 void
 File_read::read(off_t start, off_t size, void* p, off_t* pbytes)
 {
-  assert(this->lock_count_ > 0);
+  gold_assert(this->lock_count_ > 0);
 
   File_read::View* pv = this->find_view(start, size);
   if (pv != NULL)
@@ -180,7 +204,7 @@ File_read::read(off_t start, off_t size, void* p, off_t* pbytes)
 File_read::View*
 File_read::find_or_make_view(off_t start, off_t size, off_t* pbytes)
 {
-  assert(this->lock_count_ > 0);
+  gold_assert(this->lock_count_ > 0);
 
   off_t poff = File_read::page_offset(start);
 
@@ -244,7 +268,7 @@ File_read::find_or_make_view(off_t start, off_t size, off_t* pbytes)
 const unsigned char*
 File_read::get_view(off_t start, off_t size, off_t* pbytes)
 {
-  assert(this->lock_count_ > 0);
+  gold_assert(this->lock_count_ > 0);
   File_read::View* pv = this->find_or_make_view(start, size, pbytes);
   return pv->data() + (start - pv->start());
 }
@@ -252,7 +276,7 @@ File_read::get_view(off_t start, off_t size, off_t* pbytes)
 File_view*
 File_read::get_lasting_view(off_t start, off_t size, off_t* pbytes)
 {
-  assert(this->lock_count_ > 0);
+  gold_assert(this->lock_count_ > 0);
   File_read::View* pv = this->find_or_make_view(start, size, pbytes);
   pv->lock();
   return new File_view(*this, pv, pv->data() + (start - pv->start()));
@@ -271,7 +295,7 @@ File_read::clear_views(bool destroying)
        delete p->second;
       else
        {
-         assert(!destroying);
+         gold_assert(!destroying);
          this->saved_views_.push_back(p->second);
        }
     }
@@ -287,7 +311,7 @@ File_read::clear_views(bool destroying)
        }
       else
        {
-         assert(!destroying);
+         gold_assert(!destroying);
          ++p;
        }
     }
@@ -297,22 +321,36 @@ File_read::clear_views(bool destroying)
 
 File_view::~File_view()
 {
-  assert(this->file_.is_locked());
+  gold_assert(this->file_.is_locked());
   this->view_->unlock();
 }
 
 // Class Input_file.
 
+// Create a file for testing.
+
+Input_file::Input_file(const char* name, const unsigned char* contents,
+                      off_t size)
+  : file_()
+{
+  this->input_argument_ =
+    new Input_file_argument(name, false, Position_dependent_options());
+  bool ok = file_.open(name, contents, size);
+  gold_assert(ok);
+}
+
+// Open the file.
+
 void
 Input_file::open(const General_options& options, const Dirsearch& dirpath)
 {
   std::string name;
-  if (!this->input_argument_.is_lib())
-    name = this->input_argument_.name();
+  if (!this->input_argument_->is_lib())
+    name = this->input_argument_->name();
   else
     {
       std::string n1("lib");
-      n1 += this->input_argument_.name();
+      n1 += this->input_argument_->name();
       std::string n2;
       if (options.is_static())
        n1 += ".a";
@@ -325,7 +363,7 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath)
       if (name.empty())
        {
          fprintf(stderr, _("%s: cannot find %s\n"), program_name,
-                 this->input_argument_.name());
+                 this->input_argument_->name());
          gold_exit(false);
        }
     }