6 files changed, 10 insertions, 21 deletions
diff --git a/arch/alpha/alpha_memory.hh b/arch/alpha/alpha_memory.hh
index b39a1ef26..849063f59 100644
--- a/arch/alpha/alpha_memory.hh
+++ b/arch/alpha/alpha_memory.hh
@@ -42,7 +42,6 @@ class ExecContext;
 class AlphaTLB : public SimObject
 {
   protected:
-    typedef TheISA::Addr Addr;
     typedef std::multimap<Addr, int> PageTable;
     PageTable lookupTable;	// Quick lookup into page table
 
@@ -83,7 +82,6 @@ class AlphaTLB : public SimObject
 class AlphaITB : public AlphaTLB
 {
   protected:
-    typedef TheISA::Addr Addr;
     mutable Stats::Scalar<> hits;
     mutable Stats::Scalar<> misses;
     mutable Stats::Scalar<> acv;
diff --git a/arch/alpha/faults.hh b/arch/alpha/faults.hh
index 7676d751c..60c9e735c 100644
--- a/arch/alpha/faults.hh
+++ b/arch/alpha/faults.hh
@@ -34,14 +34,12 @@
 
 class AlphaFault : public Fault
 {
-  protected:
-    typedef TheISA::Addr Addr;
   public:
     AlphaFault(char * newName, int newId, Addr newVect)
         : Fault(newName, newId), vect(newVect)
     {;}
 
-    TheISA::Addr vect;
+    Addr vect;
 };
 
 extern class ResetFaultType : public AlphaFault
diff --git a/arch/alpha/isa/branch.isa b/arch/alpha/isa/branch.isa
index cc6fd1a09..9a7fb9d79 100644
--- a/arch/alpha/isa/branch.isa
+++ b/arch/alpha/isa/branch.isa
@@ -40,8 +40,6 @@ output header {{
     class PCDependentDisassembly : public AlphaStaticInst
     {
       protected:
-        typedef TheISA::Addr Addr;
-      protected:
         /// Cached program counter from last disassembly
         mutable Addr cachedPC;
         /// Cached symbol table pointer from last disassembly
@@ -66,7 +64,6 @@ output header {{
     class Branch : public PCDependentDisassembly
     {
       protected:
-        typedef TheISA::Addr Addr;
         /// Displacement to target address (signed).
         int32_t disp;
 
@@ -90,7 +87,6 @@ output header {{
     class Jump : public PCDependentDisassembly
     {
       protected:
-        typedef TheISA::Addr Addr;
 
         /// Displacement to target address (signed).
         int32_t disp;
diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh
index 2da37b2e0..f47e90f86 100644
--- a/arch/alpha/isa_traits.hh
+++ b/arch/alpha/isa_traits.hh
@@ -56,7 +56,7 @@ namespace AlphaISA
 {
 
     typedef uint32_t MachInst;
-    typedef uint64_t Addr;
+//    typedef uint64_t Addr;
     typedef uint8_t  RegIndex;
 
     enum {
diff --git a/arch/alpha/stacktrace.hh b/arch/alpha/stacktrace.hh
index 211909060..1d8d97a79 100644
--- a/arch/alpha/stacktrace.hh
+++ b/arch/alpha/stacktrace.hh
@@ -37,8 +37,6 @@ class StackTrace;
 
 class ProcessInfo
 {
-  protected:
-    typedef TheISA::Addr Addr;
   private:
     ExecContext *xc;
 
@@ -59,7 +57,6 @@ class ProcessInfo
 class StackTrace
 {
   protected:
-    typedef TheISA::Addr Addr;
     typedef TheISA::MachInst MachInst;
   private:
     ExecContext *xc;
diff --git a/arch/alpha/vtophys.hh b/arch/alpha/vtophys.hh
index 988f050ba..95430ce77 100644
--- a/arch/alpha/vtophys.hh
+++ b/arch/alpha/vtophys.hh
@@ -35,16 +35,16 @@ class ExecContext;
 class PhysicalMemory;
 
 AlphaISA::PageTableEntry
-kernel_pte_lookup(PhysicalMemory *pmem, AlphaISA::Addr ptbr, AlphaISA::VAddr vaddr);
+kernel_pte_lookup(PhysicalMemory *pmem, Addr ptbr, AlphaISA::VAddr vaddr);
 
-AlphaISA::Addr vtophys(PhysicalMemory *xc, AlphaISA::Addr vaddr);
-AlphaISA::Addr vtophys(ExecContext *xc, AlphaISA::Addr vaddr);
-uint8_t *vtomem(ExecContext *xc, AlphaISA::Addr vaddr, size_t len);
-uint8_t *ptomem(ExecContext *xc, AlphaISA::Addr paddr, size_t len);
+Addr vtophys(PhysicalMemory *xc, Addr vaddr);
+Addr vtophys(ExecContext *xc, Addr vaddr);
+uint8_t *vtomem(ExecContext *xc, Addr vaddr, size_t len);
+uint8_t *ptomem(ExecContext *xc, Addr paddr, size_t len);
 
-void CopyOut(ExecContext *xc, void *dst, AlphaISA::Addr src, size_t len);
-void CopyIn(ExecContext *xc, AlphaISA::Addr dst, void *src, size_t len);
-void CopyString(ExecContext *xc, char *dst, AlphaISA::Addr vaddr, size_t maxlen);
+void CopyOut(ExecContext *xc, void *dst, Addr src, size_t len);
+void CopyIn(ExecContext *xc, Addr dst, void *src, size_t len);
+void CopyString(ExecContext *xc, char *dst, Addr vaddr, size_t maxlen);
 
 #endif // __ARCH_ALPHA_VTOPHYS_H__