From 6b7d62790399f3ff675e5d37a25c320aa068897a Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 1 Mar 2006 19:03:42 -0500
Subject: Got rid of the multiple inheritance in the Fault classes, and the
 base MachineCheck and Alignment faults.

--HG--
extra : convert_revision : 4b1429ef5c7a11c25e28f2bc868cc1481a08c5d1
---
 sim/faults.cc |  3 ---
 sim/faults.hh | 25 -------------------------
 2 files changed, 28 deletions(-)

(limited to 'sim')

diff --git a/sim/faults.cc b/sim/faults.cc
index 68df2b785..9b4a0ea7f 100644
--- a/sim/faults.cc
+++ b/sim/faults.cc
@@ -29,9 +29,6 @@
 #include "sim/faults.hh"
 #include "cpu/exec_context.hh"
 
-FaultName MachineCheckFault::_name = "mchk";
-FaultName AlignmentFault::_name = "unalign";
-
 #if !FULL_SYSTEM
 void FaultBase::invoke(ExecContext * xc)
 {
diff --git a/sim/faults.hh b/sim/faults.hh
index 1e43bfb82..9e8d224cd 100644
--- a/sim/faults.hh
+++ b/sim/faults.hh
@@ -65,29 +65,4 @@ class FaultBase : public RefCounted
 
 FaultBase * const NoFault = 0;
 
-//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
-{
-  private:
-    static FaultName _name;
-  public:
-    FaultName name() {return _name;}
-    bool isMachineCheckFault() {return true;}
-};
-
-class AlignmentFault : public virtual FaultBase
-{
-  private:
-    static FaultName _name;
-  public:
-    FaultName name() {return _name;}
-    bool isAlignmentFault() {return true;}
-};
-
-
 #endif // __FAULTS_HH__
-- 
cgit v1.2.3