summaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2008-12-05 12:11:46 -0500
committerLisa Hsu <hsul@eecs.umich.edu>2008-12-05 12:11:46 -0500
commit854aa60fdcec2a95d2c08844d62681b498281ca3 (patch)
tree773ef7b3acb7d6b1da8628217a0441fab9c45af2 /src/base
parentd6b229ea0f46de3a622ebb1ef86cb526625ebc2e (diff)
parentf1430941cf17fc15a8b86eba41f9c856ad9347d8 (diff)
downloadgem5-854aa60fdcec2a95d2c08844d62681b498281ca3.tar.xz
Automated merge with ssh://m5sim.org//repo/m5
Diffstat (limited to 'src/base')
-rw-r--r--src/base/loader/elf_object.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index f71c4456b..edaf323c7 100644
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -291,6 +291,8 @@ ElfObject::ElfObject(const string &_filename, int _fd,
data.size = phdr.p_filesz;
data.fileImage = fileData + phdr.p_offset;
} else {
+ // If it's none of the above but is loadable,
+ // load the filesize worth of data
Segment extra;
extra.baseAddr = phdr.p_paddr;
extra.size = phdr.p_filesz;