diff options
Diffstat (limited to 'base')
-rw-r--r-- | base/loader/object_file.hh | 1 | ||||
-rw-r--r-- | base/loader/symtab.hh | 3 | ||||
-rw-r--r-- | base/remote_gdb.cc | 3 | ||||
-rw-r--r-- | base/remote_gdb.hh | 3 |
4 files changed, 8 insertions, 2 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: diff --git a/base/remote_gdb.cc b/base/remote_gdb.cc index 67d745d43..17ec21fed 100644 --- a/base/remote_gdb.cc +++ b/base/remote_gdb.cc @@ -132,6 +132,7 @@ #include "targetarch/vtophys.hh" using namespace std; +using namespace TheISA; #ifndef NDEBUG vector<RemoteGDB *> debuggers; @@ -494,7 +495,7 @@ RemoteGDB::setSingleStep() // User was stopped at pc, e.g. the instruction at pc was not // executed. MachInst inst = read<MachInst>(pc); - StaticInstPtr<TheISA> si(inst); + StaticInstPtr si(inst); if (si->hasBranchTarget(pc, context, bpc)) { // Don't bother setting a breakpoint on the taken branch if it // is the same as the next pc diff --git a/base/remote_gdb.hh b/base/remote_gdb.hh index 652a58317..126d5f6f8 100644 --- a/base/remote_gdb.hh +++ b/base/remote_gdb.hh @@ -43,6 +43,9 @@ class PhysicalMemory; class GDBListener; class RemoteGDB { + protected: + typedef TheISA::Addr Addr; + typedef TheISA::MachInst MachInst; private: friend void debugger(); friend class GDBListener; |