Merge gblack@m5.eecs.umich.edu:/bk/multiarch

into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : 090b30a7f70294e1aeb13ba0bc15da4061bdf348

9 files changed, 29 insertions, 14 deletions

diff --git a/kern/freebsd/freebsd_system.cc b/kern/freebsd/freebsd_system.cc
index dbf60a3fc..cead8caaf 100644
--- a/kern/freebsd/freebsd_system.cc
+++ b/kern/freebsd/freebsd_system.cc
@@ -46,6 +46,7 @@
 #define TIMER_FREQUENCY 1193180
 
 using namespace std;
+using namespace TheISA;
 
 FreebsdSystem::FreebsdSystem(Params *p)
     : System(p)
diff --git a/kern/kernel_stats.hh b/kern/kernel_stats.hh
index 98cc044ac..e4d5ec011 100644
--- a/kern/kernel_stats.hh
+++ b/kern/kernel_stats.hh
@@ -50,6 +50,8 @@ extern const char *modestr[];
 
 class Binning
 {
+  protected:
+    typedef TheISA::Addr Addr;
   private:
     std::string myname;
     System *system;
@@ -106,7 +108,7 @@ class Binning
 
     cpu_mode themode;
     void palSwapContext(ExecContext *xc);
-    void execute(ExecContext *xc, StaticInstPtr<TheISA> inst);
+    void execute(ExecContext *xc, StaticInstPtr inst);
     void call(ExecContext *xc, Stats::MainBin *myBin);
     void changeMode(cpu_mode mode);
 
@@ -124,6 +126,9 @@ class Binning
 
 class Statistics : public Serializable
 {
+  protected:
+    typedef TheISA::Addr Addr;
+  private:
     friend class Binning;
 
   private:
diff --git a/kern/linux/aligned.hh b/kern/linux/aligned.hh
index 18d1b43c0..137f65076 100644
--- a/kern/linux/aligned.hh
+++ b/kern/linux/aligned.hh
@@ -37,7 +37,7 @@
 #if __GNUC__ == 3 && __GNUC_MINOR__  != 3
 typedef uint64_t uint64_ta __attribute__ ((aligned (8))) ;
 typedef int64_t int64_ta __attribute__ ((aligned (8))) ;
-typedef Addr Addr_a __attribute__ ((aligned (8))) ;
+typedef TheISA::Addr Addr_a __attribute__ ((aligned (8))) ;
 #else
 #define uint64_ta uint64_t __attribute__ ((aligned (8)))
 #define int64_ta int64_t __attribute__ ((aligned (8)))
diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc
index 26a4c0d3e..c5a9e184a 100644
--- a/kern/linux/linux_system.cc
+++ b/kern/linux/linux_system.cc
@@ -50,6 +50,7 @@
 #include "targetarch/vtophys.hh"
 
 using namespace std;
+using namespace TheISA;
 
 LinuxSystem::LinuxSystem(Params *p)
     : System(p)
diff --git a/kern/linux/linux_threadinfo.hh b/kern/linux/linux_threadinfo.hh
index 9bab1dc49..f20188360 100644
--- a/kern/linux/linux_threadinfo.hh
+++ b/kern/linux/linux_threadinfo.hh
@@ -37,6 +37,8 @@ namespace Linux {
 
 class ThreadInfo
 {
+  protected:
+    typedef TheISA::Addr Addr;
   private:
     ExecContext *xc;
 
@@ -53,7 +55,7 @@ class ThreadInfo
          * thread_info struct. So we can get the address by masking off
          * the lower 14 bits.
          */
-        current = xc->regs.intRegFile[StackPointerReg] & ~0x3fff;
+        current = xc->regs.intRegFile[TheISA::StackPointerReg] & ~0x3fff;
         return VPtr<thread_info>(xc, current);
     }
 
diff --git a/kern/system_events.cc b/kern/system_events.cc
index ba3c9274a..55595b9b6 100644
--- a/kern/system_events.cc
+++ b/kern/system_events.cc
@@ -29,6 +29,8 @@
 #include "encumbered/cpu/full/cpu.hh"
 #include "kern/kernel_stats.hh"
 
+using namespace TheISA;
+
 void
 SkipFuncEvent::process(ExecContext *xc)
 {
diff --git a/kern/tru64/dump_mbuf.cc b/kern/tru64/dump_mbuf.cc
index 85cb4de96..efdaed62d 100644
--- a/kern/tru64/dump_mbuf.cc
+++ b/kern/tru64/dump_mbuf.cc
@@ -38,6 +38,8 @@
 #include "arch/isa_traits.hh"
 #include "targetarch/vtophys.hh"
 
+using namespace TheISA;
+
 namespace tru64 {
 
 void
diff --git a/kern/tru64/mbuf.hh b/kern/tru64/mbuf.hh
index 93424858f..7b84b5e10 100644
--- a/kern/tru64/mbuf.hh
+++ b/kern/tru64/mbuf.hh
@@ -35,35 +35,35 @@
 namespace tru64 {
 
 struct m_hdr {
-    Addr	mh_next;	// 0x00
-    Addr	mh_nextpkt;	// 0x08
-    Addr	mh_data;	// 0x10
+    TheISA::Addr	mh_next;	// 0x00
+    TheISA::Addr	mh_nextpkt;	// 0x08
+    TheISA::Addr	mh_data;	// 0x10
     int32_t	mh_len;		// 0x18
     int32_t	mh_type;	// 0x1C
     int32_t	mh_flags;	// 0x20
     int32_t	mh_pad0;	// 0x24
-    Addr	mh_foo[4];	// 0x28, 0x30, 0x38, 0x40
+    TheISA::Addr	mh_foo[4];	// 0x28, 0x30, 0x38, 0x40
 };
 
 struct	pkthdr {
     int32_t	len;
     int32_t	protocolSum;
-    Addr	rcvif;
+    TheISA::Addr	rcvif;
 };
 
 struct m_ext {
-    Addr	ext_buf;	// 0x00
-    Addr	ext_free;	// 0x08
+    TheISA::Addr	ext_buf;	// 0x00
+    TheISA::Addr	ext_free;	// 0x08
     uint32_t	ext_size;	// 0x10
     uint32_t	ext_pad0;	// 0x14
-    Addr	ext_arg;	// 0x18
+    TheISA::Addr	ext_arg;	// 0x18
     struct	ext_refq {
-        Addr	forw, back;	// 0x20, 0x28
+        TheISA::Addr	forw, back;	// 0x20, 0x28
     } ext_ref;
-    Addr	uiomove_f;	// 0x30
+    TheISA::Addr	uiomove_f;	// 0x30
     int32_t	protocolSum;	// 0x38
     int32_t	bytesSummed;	// 0x3C
-    Addr	checksum;	// 0x40
+    TheISA::Addr	checksum;	// 0x40
 };
 
 struct mbuf {
diff --git a/kern/tru64/tru64_events.cc b/kern/tru64/tru64_events.cc
index d769aab0f..2fe6a2dc4 100644
--- a/kern/tru64/tru64_events.cc
+++ b/kern/tru64/tru64_events.cc
@@ -36,6 +36,8 @@
 #include "targetarch/arguments.hh"
 #include "arch/isa_traits.hh"
 
+using namespace TheISA;
+
 //void SkipFuncEvent::process(ExecContext *xc);
 
 void