diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
commit | 0e4a80df1a471671b6ef7003e29124b6835ade42 (patch) | |
tree | 1d2c44d8c3462dd94c0fbf6e4f149e026c901aa8 /base/loader | |
parent | a48c24b61eedf580645ff0294b225d1e69a9444b (diff) | |
parent | 463aa6d49d49ba9c383f07207df57bad75c58ec9 (diff) | |
download | gem5-0e4a80df1a471671b6ef7003e29124b6835ade42.tar.xz |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision : 090b30a7f70294e1aeb13ba0bc15da4061bdf348
Diffstat (limited to 'base/loader')
-rw-r--r-- | base/loader/object_file.hh | 1 | ||||
-rw-r--r-- | base/loader/symtab.hh | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/base/loader/object_file.hh b/base/loader/object_file.hh index 3c8659e18..e90f93847 100644 --- a/base/loader/object_file.hh +++ b/base/loader/object_file.hh @@ -37,6 +37,7 @@ class SymbolTable; class ObjectFile { public: + typedef TheISA::Addr Addr; enum Arch { UnknownArch, diff --git a/base/loader/symtab.hh b/base/loader/symtab.hh index ebcda1345..38b4cdee2 100644 --- a/base/loader/symtab.hh +++ b/base/loader/symtab.hh @@ -37,8 +37,9 @@ class Checkpoint; class SymbolTable { + typedef TheISA::Addr Addr; public: - typedef std::map<Addr, std::string> ATable; + typedef std::map<TheISA::Addr, std::string> ATable; typedef std::map<std::string, Addr> STable; private: |