diff options
| author | Ian Lance Taylor <ian@airs.com> | 2008-04-02 20:58:21 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2008-04-02 20:58:21 +0000 |
| commit | 39d0cb0e83f9eb33feb96a18f24607065426d089 (patch) | |
| tree | 3b147c4a9fe94f4eb2cb847999db7adc5ae70e5c /gold/object.h | |
| parent | 5caffa0e9b4a3cab0749be6b30fa7ebeda6b62f5 (diff) | |
| download | gdb-39d0cb0e83f9eb33feb96a18f24607065426d089.zip gdb-39d0cb0e83f9eb33feb96a18f24607065426d089.tar.gz gdb-39d0cb0e83f9eb33feb96a18f24607065426d089.tar.bz2 | |
* fileread.cc (File_read::find_view): Add byteshift and vshifted
parameters. Update for new key type to views_. Change all
callers.
(File_read::read): Adjust for byteshift in returned view.
(File_read::add_view): New function, broken out of
find_and_make_view.
(File_read::make_view): New function, broken out of
find_and_make_view.
(File_read::find_or_make_view): Add offset and aligned
parameters. Rewrite accordingly. Change all callers.
(File_read::get_view): Add offset and aligned parameters. Adjust
for byteshift in return value.
(File_read::get_lasting_view): Likewise.
* fileread.h (class File_read): Update declarations.
(class File_read::View): Add byteshift_ field. Add byteshift to
constructor. Add byteshift method.
* archive.h (Archive::clear_uncached_views): New function.
(Archive::get_view): Add aligned parameter. Change all callers.
* object.h (Object::get_view): Add aligned parameter. Change all
callers.
(Object::get_lasting_view): Likewise.
* fileread.cc (File_read::release): Don't call clear_views if
there are multiple objects.
* fileread.h (File_read::clear_uncached_views): New function.
* archive.cc (Add_archive_symbols::run): Call clear_uncached_views
on the archive.
Diffstat (limited to 'gold/object.h')
| -rw-r--r-- | gold/object.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gold/object.h b/gold/object.h index 4a2ad8a..9e64277 100644 --- a/gold/object.h +++ b/gold/object.h @@ -295,7 +295,7 @@ class Object // Return a View. View view(off_t file_offset, section_size_type data_size) - { return View(this->get_view(file_offset, data_size, true)); } + { return View(this->get_view(file_offset, data_size, true, true)); } // Report an error. void @@ -314,22 +314,23 @@ class Object // Get a View given a Location. View view(Location loc) - { return View(this->get_view(loc.file_offset, loc.data_size, true)); } + { return View(this->get_view(loc.file_offset, loc.data_size, true, true)); } // Get a view into the underlying file. const unsigned char* - get_view(off_t start, section_size_type size, bool cache) + get_view(off_t start, section_size_type size, bool aligned, bool cache) { - return this->input_file()->file().get_view(start + this->offset_, size, - cache); + return this->input_file()->file().get_view(this->offset_, start, size, + aligned, cache); } // Get a lasting view into the underlying file. File_view* - get_lasting_view(off_t start, section_size_type size, bool cache) + get_lasting_view(off_t start, section_size_type size, bool aligned, + bool cache) { - return this->input_file()->file().get_lasting_view(start + this->offset_, - size, cache); + return this->input_file()->file().get_lasting_view(this->offset_, start, + size, aligned, cache); } // Read data from the underlying file. |