derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make m5.fast work

Browse Source 
base/loader/elf_object.cc:
    elf_version is an odd function.  Don't use assert since it
    has a necessary side effect.

--HG--
extra : convert_revision : 8c48f91afe6c7ff5030ac1a534dcda7e2e0c5c57
This commit is contained in:
Nathan Binkert
2005-06-03 21:47:30 -04:00
parent af3add2e33
commit 372b5e706c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
base/loader/elf_object.cc
View File

@@ -58,7 +58,8 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data)
GElf_Ehdr ehdr;
// check that header matches library version
assert(elf_version(EV_CURRENT) != EV_NONE);
if (elf_version(EV_CURRENT) == EV_NONE)
panic("wrong elf version number!");
// get a pointer to elf structure
elf = elf_memory((char*)data,len);
@@ -97,7 +98,8 @@ ElfObject::ElfObject(const string &_filename, int _fd,
GElf_Ehdr ehdr;
// check that header matches library version
assert(elf_version(EV_CURRENT) != EV_NONE);
if (elf_version(EV_CURRENT) == EV_NONE)
panic("wrong elf version number!");
// get a pointer to elf structure
elf = elf_memory((char*)fileData,len);
@@ -205,7 +207,8 @@ ElfObject::loadSomeSymbols(SymbolTable *symtab, int binding)
return false;
// check that header matches library version
assert(elf_version(EV_CURRENT) != EV_NONE);
if (elf_version(EV_CURRENT) == EV_NONE)
panic("wrong elf version number!");
// get a pointer to elf structure
elf = elf_memory((char*)fileData,len);