MIPS: Get rid of cruft in the fault classes.

Get rid of Fault classes left over from when this file was copied from Alpha,
and rename ArithmeticOverflowFault to be IntegerOverflowFault and get rid of
the old IntegerOverflowFault stub. The Integer version is what's actually in
the manual, but the Arithmetic version had the implementation.

diff --git a/src/arch/mips/faults.cc b/src/arch/mips/faults.cc
index 87a69669ea930cbc43d52ca6589b967306f57697..464c2fe9e7a3b814f441b02053a5ee02368abcc8 100644 (file)
--- a/src/arch/mips/faults.cc
+++ b/src/arch/mips/faults.cc
@@ -51,9 +51,6 @@ typedef MipsFaultBase::FaultVals FaultVals;
 template <> FaultVals MipsFault<MachineCheckFault>::vals =
     { "Machine Check", 0x0401 };
 
-template <> FaultVals MipsFault<AlignmentFault>::vals =
-    { "Alignment", 0x0301 };
-
 template <> FaultVals MipsFault<ResetFault>::vals =
 #if  FULL_SYSTEM
     { "Reset Fault", 0xBFC00000};
@@ -79,11 +76,8 @@ template <> FaultVals MipsFault<ReservedInstructionFault>::vals =
 template <> FaultVals MipsFault<ThreadFault>::vals =
     { "Thread Fault", 0x00F1 };
 
-template <> FaultVals MipsFault<ArithmeticFault>::vals =
-    { "Arithmetic Overflow Exception", 0x180 };
-
-template <> FaultVals MipsFault<UnimplementedOpcodeFault>::vals =
-    { "opdec", 0x0481 };
+template <> FaultVals MipsFault<IntegerOverflowFault>::vals =
+    { "Integer Overflow Exception", 0x180 };
 
 template <> FaultVals MipsFault<InterruptFault>::vals =
     { "interrupt", 0x0180 };
@@ -97,30 +91,9 @@ template <> FaultVals MipsFault<BreakpointFault>::vals =
 template <> FaultVals MipsFault<ItbInvalidFault>::vals =
     { "Invalid TLB Entry Exception (I-Fetch/LW)", 0x0180 };
 
-template <> FaultVals MipsFault<ItbPageFault>::vals =
-    { "itbmiss", 0x0181 };
-
-template <> FaultVals MipsFault<ItbMissFault>::vals =
-    { "itbmiss", 0x0181 };
-
-template <> FaultVals MipsFault<ItbAcvFault>::vals =
-    { "iaccvio", 0x0081 };
-
 template <> FaultVals MipsFault<ItbRefillFault>::vals =
     { "TLB Refill Exception (I-Fetch/LW)", 0x0180 };
 
-template <> FaultVals MipsFault<NDtbMissFault>::vals =
-    { "dtb_miss_single", 0x0201 };
-
-template <> FaultVals MipsFault<PDtbMissFault>::vals =
-    { "dtb_miss_double", 0x0281 };
-
-template <> FaultVals MipsFault<DtbPageFault>::vals =
-    { "dfault", 0x0381 };
-
-template <> FaultVals MipsFault<DtbAcvFault>::vals =
-    { "dfault", 0x0381 };
-
 template <> FaultVals MipsFault<DtbInvalidFault>::vals =
     { "Invalid TLB Entry Exception (Store)", 0x0180 };
 
@@ -130,12 +103,6 @@ template <> FaultVals MipsFault<DtbRefillFault>::vals =
 template <> FaultVals MipsFault<TLBModifiedFault>::vals =
     { "TLB Modified Exception", 0x0180 };
 
-template <> FaultVals MipsFault<FloatEnableFault>::vals =
-    { "float_enable_fault", 0x0581 };
-
-template <> FaultVals MipsFault<IntegerOverflowFault>::vals =
-    { "Integer Overflow Fault", 0x0501 };
-
 template <> FaultVals MipsFault<DspStateDisabledFault>::vals =
     { "DSP Disabled Fault", 0x001a };
 
@@ -190,7 +157,7 @@ MipsFaultBase::setExceptionState(ThreadContext *tc, uint8_t excCode)
 }
 
 void
-ArithmeticFault::invoke(ThreadContext *tc, StaticInstPtr inst)
+IntegerOverflowFault::invoke(ThreadContext *tc, StaticInstPtr inst)
 {
     DPRINTF(MipsPRA, "%s encountered.\n", name());
     setExceptionState(tc, 0xC);

diff --git a/src/arch/mips/faults.hh b/src/arch/mips/faults.hh
index 055aa597ece245b2954de64f7aecacb382693165..f04f757f02c50847efe1239839a9b8c534749fd6 100644 (file)
--- a/src/arch/mips/faults.hh
+++ b/src/arch/mips/faults.hh
@@ -91,12 +91,6 @@ class NonMaskableInterrupt : public MipsFault<NonMaskableInterrupt>
     bool isNonMaskableInterrupt() {return true;}
 };
 
-class AlignmentFault : public MipsFault<AlignmentFault>
-{
-  public:
-    bool isAlignmentFault() {return true;}
-};
-
 class AddressErrorFault : public MipsFault<AddressErrorFault>
 {
   public:
@@ -118,37 +112,11 @@ class StoreAddressErrorFault : public MipsFault<StoreAddressErrorFault>
 #endif
 };
 
-class UnimplementedOpcodeFault : public MipsFault<UnimplementedOpcodeFault> {};
-
-class TLBRefillIFetchFault : public MipsFault<TLBRefillIFetchFault>
-{
-  public:
-    void invoke(ThreadContext * tc,
-            StaticInstPtr inst = StaticInst::nullStaticInstPtr);
-};
-
-class TLBInvalidIFetchFault : public MipsFault<TLBInvalidIFetchFault>
-{
-  public:
-    void invoke(ThreadContext * tc,
-            StaticInstPtr inst = StaticInst::nullStaticInstPtr);
-};
-
-class NDtbMissFault : public MipsFault<NDtbMissFault> {};
-class PDtbMissFault : public MipsFault<PDtbMissFault> {};
-class DtbPageFault : public MipsFault<DtbPageFault> {};
-class DtbAcvFault : public MipsFault<DtbAcvFault> {};
-
 static inline Fault genMachineCheckFault()
 {
     return new MachineCheckFault;
 }
 
-static inline Fault genAlignmentFault()
-{
-    return new AlignmentFault;
-}
-
 class ResetFault : public MipsFault<ResetFault>
 {
   public:
@@ -173,20 +141,6 @@ class SoftResetFault : public MipsFault<SoftResetFault>
             StaticInstPtr inst = StaticInst::nullStaticInstPtr);
 };
 
-class DebugSingleStep : public MipsFault<DebugSingleStep>
-{
-  public:
-    void invoke(ThreadContext * tc,
-            StaticInstPtr inst = StaticInst::nullStaticInstPtr);
-};
-
-class DebugInterrupt : public MipsFault<DebugInterrupt>
-{
-  public:
-    void invoke(ThreadContext * tc,
-            StaticInstPtr inst = StaticInst::nullStaticInstPtr);
-};
-
 class CoprocessorUnusableFault : public MipsFault<CoprocessorUnusableFault>
 {
   protected:
@@ -213,7 +167,7 @@ class ThreadFault : public MipsFault<ThreadFault>
             StaticInstPtr inst = StaticInst::nullStaticInstPtr);
 };
 
-class ArithmeticFault : public MipsFault<ArithmeticFault>
+class IntegerOverflowFault : public MipsFault<IntegerOverflowFault>
 {
   protected:
     bool skipFaultingInstruction() {return true;}
@@ -287,15 +241,6 @@ class DtbRefillFault : public MipsFault<DtbRefillFault>
 #endif
 };
 
-class ItbPageFault : public MipsFault<ItbPageFault>
-{
-  public:
-#if FULL_SYSTEM
-    void invoke(ThreadContext * tc,
-            StaticInstPtr inst = StaticInst::nullStaticInstPtr);
-#endif
-};
-
 class ItbInvalidFault : public MipsFault<ItbInvalidFault>
 {
   public:
@@ -347,11 +292,6 @@ class DtbInvalidFault : public MipsFault<DtbInvalidFault>
 #endif
 };
 
-class FloatEnableFault : public MipsFault<FloatEnableFault> {};
-class ItbMissFault : public MipsFault<ItbMissFault> {};
-class ItbAcvFault : public MipsFault<ItbAcvFault> {};
-class IntegerOverflowFault : public MipsFault<IntegerOverflowFault> {};
-
 class DspStateDisabledFault : public MipsFault<DspStateDisabledFault>
 {
   public:

diff --git a/src/arch/mips/isa/decoder.isa b/src/arch/mips/isa/decoder.isa
index 4ed8c0c0c1961e7c28df7ab7ddf775a37e7178a5..eca7d741149622707254929f156ad299656a796d 100644 (file)
--- a/src/arch/mips/isa/decoder.isa
+++ b/src/arch/mips/isa/decoder.isa
@@ -214,7 +214,7 @@ decode OPCODE_HI default Unknown::unknown() {
                             Rd = result = Rs + Rt;
                             if (FULL_SYSTEM &&
                                     findOverflow(32, result, Rs, Rt)) {
-                                fault = new ArithmeticFault();
+                                fault = new IntegerOverflowFault();
                             }
                         }});
                         0x1: addu({{ Rd.sw = Rs.sw + Rt.sw;}});
@@ -223,7 +223,7 @@ decode OPCODE_HI default Unknown::unknown() {
                             Rd = result = Rs - Rt;
                             if (FULL_SYSTEM &&
                                     findOverflow(32, result, Rs, ~Rt)) {
-                                fault = new ArithmeticFault();
+                                fault = new IntegerOverflowFault();
                             }
                         }});
                         0x3: subu({{ Rd.sw = Rs.sw - Rt.sw; }});
@@ -327,7 +327,7 @@ decode OPCODE_HI default Unknown::unknown() {
                 Rt = result = Rs + imm;
                 if (FULL_SYSTEM &&
                         findOverflow(32, result, Rs, imm)) {
-                    fault = new ArithmeticFault();
+                    fault = new IntegerOverflowFault();
                 }
             }});
             0x1: addiu({{ Rt.sw = Rs.sw + imm; }});

diff --git a/src/arch/mips/isa/formats/unimp.isa b/src/arch/mips/isa/formats/unimp.isa
index e599510a424591bbdc6d6e09fd197f1afa644541..65b4425af485c107e7b4e8605b57820dbbee5132 100644 (file)
--- a/src/arch/mips/isa/formats/unimp.isa
+++ b/src/arch/mips/isa/formats/unimp.isa
@@ -186,7 +186,7 @@ output exec {{
         panic("attempt to execute unimplemented instruction '%s' "
               "(inst 0x%08x, opcode 0x%x, binary:%s)", mnemonic, machInst, OPCODE,
               inst2string(machInst));
-        return new UnimplementedOpcodeFault;
+        return NoFault;
     }
 
     Fault
@@ -202,7 +202,7 @@ output exec {{
             panic("attempt to execute unimplemented instruction '%s' "
                     "(inst %#08x, opcode %#x, binary:%s)",
                     mnemonic, machInst, OPCODE, inst2string(machInst));
-            return new UnimplementedOpcodeFault;
+            return NoFault;
         }
     }
 
@@ -219,7 +219,7 @@ output exec {{
             panic("attempt to execute unimplemented instruction '%s' "
                     "(inst %#08x, opcode %#x, binary:%s)",
                     mnemonic, machInst, OPCODE, inst2string(machInst));
-            return new UnimplementedOpcodeFault;
+            return NoFault;
         }
     }
 
@@ -236,7 +236,7 @@ output exec {{
             panic("attempt to execute unimplemented instruction '%s' "
                     "(inst %#08x, opcode %#x, binary:%s)",
                     mnemonic, machInst, OPCODE, inst2string(machInst));
-            return new UnimplementedOpcodeFault;
+            return NoFault;
         }
     }
 

diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc
index b2286850ed470027b852607e1b997c2d0d3665dd..f379b9919fea11b2300f62db9f14d31e17826b59 100644 (file)
--- a/src/arch/mips/tlb.cc
+++ b/src/arch/mips/tlb.cc
@@ -387,7 +387,10 @@ TLB::translateData(RequestPtr req, ThreadContext *tc, bool write)
     if (req->getVaddr() & (req->getSize() - 1)) {
         DPRINTF(TLB, "Alignment Fault on %#x, size = %d", req->getVaddr(),
                 req->getSize());
-        return new AlignmentFault();
+        if (write)
+            return new StoreAddressErrorFault(req->getVaddr());
+        else
+            return new AddressErrorFault(req->getVaddr());
     }