diff options
| author | Curtis Dunham <Curtis.Dunham@arm.com> | 2015-07-03 10:14:34 -0400 |
|---|---|---|
| committer | Curtis Dunham <Curtis.Dunham@arm.com> | 2015-07-03 10:14:34 -0400 |
| commit | e385ae0c72993d1d58256324d0fe425247fad207 (patch) | |
| tree | d133e9497e8f08ed370a0fc425b2e8f561632156 /src/base/loader/elf_object.cc | |
| parent | d9f8f076135870de5382f2d2ec3b185b6ece6b16 (diff) | |
| download | gem5-e385ae0c72993d1d58256324d0fe425247fad207.tar.xz | |
base: remove fd from object loaders
All the object loaders directly examine the (already completely loaded
by object_file.cc) memory image. There is no current motivation to
keep the fd around.
Diffstat (limited to 'src/base/loader/elf_object.cc')
| -rw-r--r-- | src/base/loader/elf_object.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc index ed4fee37a..d1d89f20b 100644 --- a/src/base/loader/elf_object.cc +++ b/src/base/loader/elf_object.cc @@ -56,7 +56,7 @@ using namespace std; ObjectFile * -ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data) +ElfObject::tryFile(const string &fname, size_t len, uint8_t *data) { Elf *elf; GElf_Ehdr ehdr; @@ -69,7 +69,6 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data) // get a pointer to elf structure elf = elf_memory((char*)data,len); - // will only fail if fd is invalid assert(elf != NULL); // Check that we actually have a elf file @@ -213,7 +212,7 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data) } // while sections } - ElfObject * result = new ElfObject(fname, fd, len, data, arch, opSys); + ElfObject * result = new ElfObject(fname, len, data, arch, opSys); //The number of headers in the file result->_programHeaderCount = ehdr.e_phnum; @@ -250,10 +249,9 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data) } -ElfObject::ElfObject(const string &_filename, int _fd, - size_t _len, uint8_t *_data, +ElfObject::ElfObject(const string &_filename, size_t _len, uint8_t *_data, Arch _arch, OpSys _opSys) - : ObjectFile(_filename, _fd, _len, _data, _arch, _opSys), + : ObjectFile(_filename, _len, _data, _arch, _opSys), _programHeaderTable(0), _programHeaderSize(0), _programHeaderCount(0) { @@ -266,7 +264,6 @@ ElfObject::ElfObject(const string &_filename, int _fd, // get a pointer to elf structure elf = elf_memory((char*)fileData,len); - // will only fail if fd is invalid assert(elf != NULL); // Check that we actually have a elf file |