6 files changed, 55 insertions, 31 deletions
diff --git a/sim/faults.cc b/sim/faults.cc
index 58a631263..78bfc8092 100644
--- a/sim/faults.cc
+++ b/sim/faults.cc
@@ -28,9 +28,6 @@
 
 #include "sim/faults.hh"
 
-NoFaultType * const NoFault = new NoFaultType("none");
-MachineCheckFaultType * const MachineCheckFault =
-    new MachineCheckFaultType("mchk");
-AlignmentFaultType * const AlignmentFault =
-    new AlignmentFaultType("unalign");
+FaultName MachineCheckFault::_name = "mchk";
+FaultName AlignmentFault::_name = "unalign";
 
diff --git a/sim/faults.hh b/sim/faults.hh
index dbec399af..9b8c94cda 100644
--- a/sim/faults.hh
+++ b/sim/faults.hh
@@ -29,34 +29,63 @@
 #ifndef __FAULTS_HH__
 #define __FAULTS_HH__
 
+#include "base/refcnt.hh"
+#include "sim/stats.hh"
+#include "config/full_system.hh"
+
+class ExecContext;
 class FaultBase;
-typedef FaultBase * Fault;
+typedef RefCountingPtr<FaultBase> Fault;
+
+typedef const char * FaultName;
+typedef Stats::Scalar<> FaultStat;
 
-class FaultBase
+// Each class has it's name statically define in _name,
+// and has a virtual function to access it's name.
+// The function is necessary because otherwise, all objects
+// which are being accessed cast as a FaultBase * (namely
+// all faults returned using the Fault type) will use the
+// generic FaultBase name.
+
+class FaultBase : public RefCounted
 {
-public:
-        FaultBase(char * newName, int newId = 0) : name(newName), id(newId) {;}
-        const char * name;
-        int id;
+  public:
+    virtual FaultName name() = 0;
+    virtual FaultStat & stat() = 0;
+#if FULL_SYSTEM
+    virtual void ev5_trap(ExecContext * xc) = 0;
+#endif
+    template<typename T>
+    bool isA() {return dynamic_cast<T *>(this);}
+    virtual bool isMachineCheckFault() {return false;}
+    virtual bool isAlignmentFault() {return false;}
 };
 
-extern class NoFaultType : public FaultBase
-{
-public:
-        NoFaultType(char * newName) : FaultBase(newName) {;}
-} * const NoFault;
+FaultBase * const NoFault = 0;
 
-extern class MachineCheckFaultType : public FaultBase
+//The ISAs are each responsible for providing a genMachineCheckFault and a
+//genAlignmentFault functions, which return faults to use in the case of a
+//machine check fault or an alignment fault, respectively. Base classes which
+//provide the name() function, and the isMachineCheckFault and isAlignmentFault
+//functions are provided below.
+
+class MachineCheckFault : public virtual FaultBase
 {
-public:
-        MachineCheckFaultType(char * newName) : FaultBase(newName) {;}
-} * const MachineCheckFault;
+  private:
+    static FaultName _name;
+  public:
+    FaultName name() {return _name;}
+    bool isMachineCheckFault() {return true;}
+};
 
-extern class AlignmentFaultType : public FaultBase
+class AlignmentFault : public virtual FaultBase
 {
-public:
-        AlignmentFaultType(char * newName) : FaultBase(newName) {;}
-} * const AlignmentFault;
+  private:
+    static FaultName _name;
+  public:
+    FaultName name() {return _name;}
+    bool isAlignmentFault() {return true;}
+};
 
 
 #endif // __FAULTS_HH__
diff --git a/sim/process.cc b/sim/process.cc
index 0a7e46082..e3cae2855 100644
--- a/sim/process.cc
+++ b/sim/process.cc
@@ -48,10 +48,8 @@
 #include "sim/stats.hh"
 #include "sim/syscall_emul.hh"
 
-#ifdef TARGET_ALPHA
-#include "arch/alpha/alpha_tru64_process.hh"
-#include "arch/alpha/alpha_linux_process.hh"
-#endif
+#include "arch/tru64_process.hh"
+#include "arch/linux_process.hh"
 
 using namespace std;
 using namespace TheISA;
diff --git a/sim/pseudo_inst.cc b/sim/pseudo_inst.cc
index fbfce64d9..3effef7ae 100644
--- a/sim/pseudo_inst.cc
+++ b/sim/pseudo_inst.cc
@@ -34,7 +34,7 @@
 #include <string>
 
 #include "sim/pseudo_inst.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
 #include "cpu/base.hh"
 #include "cpu/sampler/sampler.hh"
 #include "cpu/exec_context.hh"
diff --git a/sim/system.cc b/sim/system.cc
index 41de8cee4..378568a8a 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -33,7 +33,7 @@
 #include "kern/kernel_stats.hh"
 #include "mem/functional/memory_control.hh"
 #include "mem/functional/physical.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
 #include "sim/builder.hh"
 #include "arch/isa_traits.hh"
 #include "sim/byteswap.hh"
diff --git a/sim/vptr.hh b/sim/vptr.hh
index 7ec43602d..0ec452f25 100644
--- a/sim/vptr.hh
+++ b/sim/vptr.hh
@@ -29,7 +29,7 @@
 #ifndef __ARCH_ALPHA_VPTR_HH__
 #define __ARCH_ALPHA_VPTR_HH__
 
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
 #include "arch/isa_traits.hh"
 
 class ExecContext;