9 files changed, 20 insertions, 5 deletions

diff --git a/sim/process.cc b/sim/process.cc
index 59d122b48..b2f3046fb 100644
--- a/sim/process.cc
+++ b/sim/process.cc
@@ -53,6 +53,7 @@
 #endif
 
 using namespace std;
+using namespace TheISA;
 
 //
 // The purpose of this code is to fake the loader & syscall mechanism
diff --git a/sim/process.hh b/sim/process.hh
index 43fafd9d7..f5b713e3c 100644
--- a/sim/process.hh
+++ b/sim/process.hh
@@ -50,6 +50,10 @@ class ExecContext;
 class FunctionalMemory;
 class Process : public SimObject
 {
+  protected:
+    typedef TheISA::Addr Addr;
+    typedef TheISA::RegFile RegFile;
+    typedef TheISA::MachInst MachInst;
   public:
 
     // have we initialized an execution context from this process?  If
diff --git a/sim/pseudo_inst.cc b/sim/pseudo_inst.cc
index 11ab55f53..58ea8266f 100644
--- a/sim/pseudo_inst.cc
+++ b/sim/pseudo_inst.cc
@@ -53,6 +53,7 @@ using namespace std;
 extern Sampler *SampCPU;
 
 using namespace Stats;
+using namespace TheISA;
 
 namespace AlphaPseudo
 {
diff --git a/sim/pseudo_inst.hh b/sim/pseudo_inst.hh
index 3857f2050..07bdd7091 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, Addr vaddr, uint64_t len, uint64_t offset);
+    uint64_t readfile(ExecContext *xc, TheISA::Addr vaddr, uint64_t len, uint64_t offset);
     void debugbreak(ExecContext *xc);
     void switchcpu(ExecContext *xc);
-    void addsymbol(ExecContext *xc, Addr addr, Addr symbolAddr);
+    void addsymbol(ExecContext *xc, TheISA::Addr addr, TheISA::Addr symbolAddr);
 }
diff --git a/sim/syscall_emul.cc b/sim/syscall_emul.cc
index 0fac43fc5..68001b0d1 100644
--- a/sim/syscall_emul.cc
+++ b/sim/syscall_emul.cc
@@ -40,6 +40,7 @@
 #include "sim/sim_events.hh"
 
 using namespace std;
+using namespace TheISA;
 
 void
 SyscallDesc::doSyscall(int callnum, Process *process, ExecContext *xc)
@@ -89,7 +90,7 @@ exitFunc(SyscallDesc *desc, int callnum, Process *process,
 SyscallReturn
 getpagesizeFunc(SyscallDesc *desc, int num, Process *p, ExecContext *xc)
 {
-    return VMPageSize;
+    return (int)VMPageSize;
 }
 
 
diff --git a/sim/syscall_emul.hh b/sim/syscall_emul.hh
index 739cd20e5..bc22c5c4c 100644
--- a/sim/syscall_emul.hh
+++ b/sim/syscall_emul.hh
@@ -90,6 +90,9 @@ class SyscallDesc {
 
 class BaseBufferArg {
 
+  protected:
+    typedef TheISA::Addr Addr;
+
   public:
 
     BaseBufferArg(Addr _addr, int _size) : addr(_addr), size(_size)
@@ -636,7 +639,7 @@ template <class OS>
 SyscallReturn
 mmapFunc(SyscallDesc *desc, int num, Process *p, ExecContext *xc)
 {
-    Addr start = xc->getSyscallArg(0);
+    TheISA::Addr start = xc->getSyscallArg(0);
     uint64_t length = xc->getSyscallArg(1);
     // int prot = xc->getSyscallArg(2);
     int flags = xc->getSyscallArg(3);
@@ -646,7 +649,7 @@ mmapFunc(SyscallDesc *desc, int num, Process *p, ExecContext *xc)
     if (start == 0) {
         // user didn't give an address... pick one from our "mmap region"
         start = p->mmap_end;
-        p->mmap_end += roundUp(length, VMPageSize);
+        p->mmap_end += roundUp(length, TheISA::VMPageSize);
         if (p->nxm_start != 0) {
             //If we have an nxm space, make sure we haven't colided
             assert(p->mmap_end < p->nxm_start);
diff --git a/sim/system.cc b/sim/system.cc
index 990145826..ebeb5b244 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -41,6 +41,7 @@
 #include "base/trace.hh"
 
 using namespace std;
+using namespace TheISA;
 
 vector<System *> System::systemList;
 
diff --git a/sim/system.hh b/sim/system.hh
index aa697c040..4bf33a170 100644
--- a/sim/system.hh
+++ b/sim/system.hh
@@ -50,6 +50,8 @@ 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 7ec43602d..1baa00610 100644
--- a/sim/vptr.hh
+++ b/sim/vptr.hh
@@ -37,6 +37,8 @@ class ExecContext;
 template <class T>
 class VPtr
 {
+  protected:
+    typedef TheISA::Addr Addr;
   public:
     typedef T Type;