diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-31 20:32:18 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-31 20:32:18 -0500 |
| commit | adeb458b878d0768fd4de82bc1997512dc65e6d3 (patch) | |
| tree | d7b27950803618125f7c2fcfa3353e4e40e0166c /base/loader/object_file.hh | |
| parent | 5c79eb04104e6e3dd2fd957c071fef3ceb47b722 (diff) | |
| parent | 5936c79ba0f3fd29ef2bbf41fcaddc78fcd9c75c (diff) | |
| download | gem5-adeb458b878d0768fd4de82bc1997512dc65e6d3.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 08ae5e999d9b313e3e40cb6d58863905b70ca781
Diffstat (limited to 'base/loader/object_file.hh')
| -rw-r--r-- | base/loader/object_file.hh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/base/loader/object_file.hh b/base/loader/object_file.hh index 309089728..b43989cb5 100644 --- a/base/loader/object_file.hh +++ b/base/loader/object_file.hh @@ -29,11 +29,12 @@ #ifndef __OBJECT_FILE_HH__ #define __OBJECT_FILE_HH__ +#include <limits> #include <string> #include "sim/host.hh" // for Addr -class TranslatingPort; +class Port; class SymbolTable; class ObjectFile @@ -72,7 +73,8 @@ class ObjectFile void close(); - virtual bool loadSections(TranslatingPort *memPort, bool loadPhys = false); + virtual bool loadSections(Port *memPort, Addr addrMask = + std::numeric_limits<Addr>::max()); virtual bool loadGlobalSymbols(SymbolTable *symtab) = 0; virtual bool loadLocalSymbols(SymbolTable *symtab) = 0; @@ -94,7 +96,7 @@ class ObjectFile Section data; Section bss; - bool loadSection(Section *sec, TranslatingPort *memPort, bool loadPhys); + bool loadSection(Section *sec, Port *memPort, Addr addrMask); void setGlobalPointer(Addr global_ptr) { globalPtr = global_ptr; } public: |