X86: Define a noop ExtMachInst.

[gem5.git] / src / arch / mips / faults.hh

diff --git a/src/arch/mips/faults.hh b/src/arch/mips/faults.hh
index 75157ab92882600a70804bd8fa7ea26cfa5e29b7..7a001d390bac93812804aeee165b4abd50818196 100644 (file)
--- a/src/arch/mips/faults.hh
+++ b/src/arch/mips/faults.hh
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2003-2005 The Regents of The University of Michigan
  * Copyright (c) 2007 MIPS Technologies, Inc.
  * All rights reserved.
  *
@@ -35,10 +36,9 @@
 
 #include "sim/faults.hh"
 
-// The design of the "name" and "vect" functions is in sim/faults.hh
-
 namespace MipsISA
 {
+
 typedef const Addr FaultVect;
 
 class MipsFault : public FaultBase
@@ -47,15 +47,15 @@ class MipsFault : public FaultBase
     virtual bool skipFaultingInstruction() {return false;}
     virtual bool setRestartAddress() {return true;}
   public:
-    Addr BadVAddr;
-    Addr EntryHi_Asid;
-    Addr EntryHi_VPN2;
-    Addr EntryHi_VPN2X;
-    Addr Context_BadVPN2;
+    Addr badVAddr;
+    Addr entryHiAsid;
+    Addr entryHiVPN2;
+    Addr entryHiVPN2X;
+    Addr contextBadVPN2;
 #if FULL_SYSTEM
-  void invoke(ThreadContext * tc) {};
-  void setExceptionState(ThreadContext *,uint8_t);
-  void setHandlerPC(Addr,ThreadContext *);
+    void invoke(ThreadContext * tc) {};
+    void setExceptionState(ThreadContext *, uint8_t);
+    void setHandlerPC(Addr, ThreadContext *);
 #endif
     virtual FaultVect vect() = 0;
     virtual FaultStat & countStat() = 0;
@@ -115,6 +115,7 @@ class AddressErrorFault : public MipsFault
 #endif
 
 };
+
 class StoreAddressErrorFault : public MipsFault
 {
   private:
@@ -128,8 +129,8 @@ class StoreAddressErrorFault : public MipsFault
 #if FULL_SYSTEM
     void invoke(ThreadContext * tc);
 #endif
-
 };
+
 class UnimplementedOpcodeFault : public MipsFault
 {
   private:
@@ -156,6 +157,7 @@ class TLBRefillIFetchFault : public MipsFault
     FaultStat & countStat() {return _count;}
     void invoke(ThreadContext * tc);
 };
+
 class TLBInvalidIFetchFault : public MipsFault
 {
   private:
@@ -258,6 +260,7 @@ class ResetFault : public MipsFault
     void invoke(ThreadContext * tc);
 
 };
+
 class SystemCallFault : public MipsFault
 {
   private:
@@ -283,6 +286,7 @@ class SoftResetFault : public MipsFault
     FaultStat & countStat() {return _count;}
     void invoke(ThreadContext * tc);
 };
+
 class DebugSingleStep : public MipsFault
 {
   private:
@@ -295,6 +299,7 @@ class DebugSingleStep : public MipsFault
     FaultStat & countStat() {return _count;}
     void invoke(ThreadContext * tc);
 };
+
 class DebugInterrupt : public MipsFault
 {
   private:
@@ -349,7 +354,6 @@ class ThreadFault : public MipsFault
     void invoke(ThreadContext * tc);
 };
 
-
 class ArithmeticFault : public MipsFault
 {
   protected:
@@ -383,8 +387,6 @@ class InterruptFault : public MipsFault
 #if FULL_SYSTEM
     void invoke(ThreadContext * tc);
 #endif
-
-    //void invoke(ThreadContext * tc);
 };
 
 class TrapFault : public MipsFault
@@ -431,6 +433,7 @@ class ItbRefillFault : public MipsFault
     void invoke(ThreadContext * tc);
 #endif
 };
+
 class DtbRefillFault : public MipsFault
 {
   private:
@@ -474,8 +477,8 @@ class ItbInvalidFault : public MipsFault
 #if FULL_SYSTEM
     void invoke(ThreadContext * tc);
 #endif
-
 };
+
 class TLBModifiedFault : public MipsFault
 {
   private:
@@ -489,7 +492,6 @@ class TLBModifiedFault : public MipsFault
 #if FULL_SYSTEM
     void invoke(ThreadContext * tc);
 #endif
-
 };
 
 class DtbInvalidFault : public MipsFault
@@ -505,7 +507,6 @@ class DtbInvalidFault : public MipsFault
 #if FULL_SYSTEM
     void invoke(ThreadContext * tc);
 #endif
-
 };
 
 class FloatEnableFault : public MipsFault