Made Addr a global type

--HG--
extra : convert_revision : 869bd9fa5d8591115ac9b4a7401eb2490986b835

6 files changed, 11 insertions, 11 deletions

diff --git a/sim/host.hh b/sim/host.hh
index ef7008042..f7e64f23c 100644
--- a/sim/host.hh
+++ b/sim/host.hh
@@ -54,4 +54,12 @@ typedef int64_t Counter;
  */
 typedef int64_t Tick;
 
+/**
+ * Address type
+ * This will probably be moved somewhere else in the near future.
+ * This should be at least as big as the biggest address width in use
+ * in the system, which will probably be 64 bits.
+ */
+typedef uint64_t Addr;
+
 #endif // __HOST_H__
diff --git a/sim/process.hh b/sim/process.hh
index 6e91bb0ab..71b7d02b3 100644
--- a/sim/process.hh
+++ b/sim/process.hh
@@ -52,7 +52,6 @@ class SyscallDesc;
 class Process : public SimObject
 {
   protected:
-    typedef TheISA::Addr Addr;
     typedef TheISA::RegFile RegFile;
     typedef TheISA::MachInst MachInst;
   public:
diff --git a/sim/pseudo_inst.hh b/sim/pseudo_inst.hh
index 07bdd7091..3857f2050 100644
--- a/sim/pseudo_inst.hh
+++ b/sim/pseudo_inst.hh
@@ -52,8 +52,8 @@ namespace AlphaPseudo
     void dumpstats(ExecContext *xc, Tick delay, Tick period);
     void dumpresetstats(ExecContext *xc, Tick delay, Tick period);
     void m5checkpoint(ExecContext *xc, Tick delay, Tick period);
-    uint64_t readfile(ExecContext *xc, TheISA::Addr vaddr, uint64_t len, uint64_t offset);
+    uint64_t readfile(ExecContext *xc, Addr vaddr, uint64_t len, uint64_t offset);
     void debugbreak(ExecContext *xc);
     void switchcpu(ExecContext *xc);
-    void addsymbol(ExecContext *xc, TheISA::Addr addr, TheISA::Addr symbolAddr);
+    void addsymbol(ExecContext *xc, Addr addr, Addr symbolAddr);
 }
diff --git a/sim/syscall_emul.hh b/sim/syscall_emul.hh
index 4e4f9a5d7..f49248dea 100644
--- a/sim/syscall_emul.hh
+++ b/sim/syscall_emul.hh
@@ -90,9 +90,6 @@ class SyscallDesc {
 
 class BaseBufferArg {
 
-  protected:
-    typedef TheISA::Addr Addr;
-
   public:
 
     BaseBufferArg(Addr _addr, int _size) : addr(_addr), size(_size)
@@ -643,7 +640,7 @@ template <class OS>
 SyscallReturn
 mmapFunc(SyscallDesc *desc, int num, Process *p, ExecContext *xc)
 {
-    TheISA::Addr start = xc->getSyscallArg(0);
+    Addr start = xc->getSyscallArg(0);
     uint64_t length = xc->getSyscallArg(1);
     // int prot = xc->getSyscallArg(2);
     int flags = xc->getSyscallArg(3);
diff --git a/sim/system.hh b/sim/system.hh
index 4bf33a170..aa697c040 100644
--- a/sim/system.hh
+++ b/sim/system.hh
@@ -50,8 +50,6 @@ namespace Kernel { class Binning; }
 
 class System : public SimObject
 {
-  protected:
-    typedef TheISA::Addr Addr;
   public:
     MemoryController *memctrl;
     PhysicalMemory *physmem;
diff --git a/sim/vptr.hh b/sim/vptr.hh
index 1baa00610..7ec43602d 100644
--- a/sim/vptr.hh
+++ b/sim/vptr.hh
@@ -37,8 +37,6 @@ class ExecContext;
 template <class T>
 class VPtr
 {
-  protected:
-    typedef TheISA::Addr Addr;
   public:
     typedef T Type;