summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arch/x86/isa_traits.hh2
-rw-r--r--src/base/loader/elf_object.cc8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/isa_traits.hh
index 13fe9af4e..762f9b172 100644
--- a/src/arch/x86/isa_traits.hh
+++ b/src/arch/x86/isa_traits.hh
@@ -136,7 +136,7 @@ namespace X86ISA
StaticInstPtr decodeInst(ExtMachInst);
- const Addr LoadAddrMask = ULL(0xffffffffff);
+ const Addr LoadAddrMask = ULL(-1);
};
#endif // __ARCH_X86_ISATRAITS_HH__
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index 653088c44..23df1c5ba 100644
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -270,13 +270,13 @@ ElfObject::ElfObject(const string &_filename, int _fd,
}
// Check to see if this is the text or data segment
- if (phdr.p_paddr <= textSecStart &&
- phdr.p_paddr + phdr.p_filesz > textSecStart) {
+ if (phdr.p_vaddr <= textSecStart &&
+ phdr.p_vaddr + phdr.p_filesz > textSecStart) {
text.baseAddr = phdr.p_paddr;
text.size = phdr.p_filesz;
text.fileImage = fileData + phdr.p_offset;
- } else if (phdr.p_paddr <= dataSecStart &&
- phdr.p_paddr + phdr.p_filesz > dataSecStart) {
+ } else if (phdr.p_vaddr <= dataSecStart &&
+ phdr.p_vaddr + phdr.p_filesz > dataSecStart) {
data.baseAddr = phdr.p_paddr;
data.size = phdr.p_filesz;
data.fileImage = fileData + phdr.p_offset;