Merge Gabe's changes with mine.

--HG--
extra : convert_revision : f50ed42e7acb3f11e610fd6976eaa8df0c6ba2ab

1 files changed, 5 insertions, 5 deletions

diff --git a/src/sim/faults.hh b/src/sim/faults.hh
index 2f0b5af62..f2e638945 100644
--- a/src/sim/faults.hh
+++ b/src/sim/faults.hh
@@ -53,12 +53,12 @@ typedef Stats::Scalar<> FaultStat;
 class FaultBase : public RefCounted
 {
   public:
-    virtual FaultName name() = 0;
+    virtual FaultName name() const = 0;
     virtual void invoke(ThreadContext * tc);
 //    template<typename T>
 //    bool isA() {return dynamic_cast<T *>(this);}
-    virtual bool isMachineCheckFault() {return false;}
-    virtual bool isAlignmentFault() {return false;}
+    virtual bool isMachineCheckFault() const {return false;}
+    virtual bool isAlignmentFault() const {return false;}
 };
 
 FaultBase * const NoFault = 0;
@@ -72,7 +72,7 @@ class UnimpFault : public FaultBase
         : panicStr(_str)
     { }
 
-    FaultName name() {return "Unimplemented simulator feature";}
+    FaultName name() const {return "Unimplemented simulator feature";}
     void invoke(ThreadContext * tc);
 };
 
@@ -82,7 +82,7 @@ class PageTableFault : public FaultBase
   private:
     Addr vaddr;
   public:
-    FaultName name() {return "M5 page table fault";}
+    FaultName name() const {return "M5 page table fault";}
     PageTableFault(Addr va) : vaddr(va) {}
     void invoke(ThreadContext * tc);
 };