From 7548082d3baf578fe984c79f414dbefd96091359 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Tue, 21 Jul 2009 01:08:53 -0700
Subject: MIPS: Many style fixes. White space, commented out code, some other
 minor fixes.

---
 src/arch/mips/isa.cc | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

(limited to 'src/arch/mips/isa.cc')

diff --git a/src/arch/mips/isa.cc b/src/arch/mips/isa.cc
index a3538435c..6ef6f9f41 100644
--- a/src/arch/mips/isa.cc
+++ b/src/arch/mips/isa.cc
@@ -447,12 +447,7 @@ ISA::readMiscReg(int reg_idx, ThreadContext *tc,  ThreadID tid)
             misc_reg / 8, misc_reg % 8, miscRegNames[misc_reg],
             miscRegFile[misc_reg][reg_sel]);
 
-
-    switch (misc_reg)
-    {
-      default:
-        return miscRegFile[misc_reg][reg_sel];
-    }
+    return miscRegFile[misc_reg][reg_sel];
 }
 
 void
@@ -486,7 +481,6 @@ ISA::setRegMask(int reg_idx, const MiscReg &val, ThreadID tid)
 // (1) Some CP0 Registers have fields that cannot
 // be overwritten. Make sure to handle those particular registers
 // with care!
-//template <class TC>
 void
 ISA::setMiscReg(int reg_idx, const MiscReg &val,
                     ThreadContext *tc, ThreadID tid)
@@ -515,21 +509,21 @@ ISA::setMiscReg(int reg_idx, const MiscReg &val,
 MiscReg
 ISA::filterCP0Write(int misc_reg, int reg_sel, const MiscReg &val)
 {
-  MiscReg retVal = val;
-
-  // Mask off read-only regions
-  retVal &= miscRegFile_WriteMask[misc_reg][reg_sel];
-  MiscReg curVal = miscRegFile[misc_reg][reg_sel];
-  // Mask off current alue with inverse mask (clear writeable bits)
-  curVal &= (~miscRegFile_WriteMask[misc_reg][reg_sel]);
-  retVal |= curVal; // Combine the two
-  DPRINTF(MipsPRA,
-          "filterCP0Write: Mask: %lx, Inverse Mask: %lx, write Val: %x, "
-          "current val: %lx, written val: %x\n",
-          miscRegFile_WriteMask[misc_reg][reg_sel],
-          ~miscRegFile_WriteMask[misc_reg][reg_sel],
-          val, miscRegFile[misc_reg][reg_sel], retVal);
-  return retVal;
+    MiscReg retVal = val;
+
+    // Mask off read-only regions
+    retVal &= miscRegFile_WriteMask[misc_reg][reg_sel];
+    MiscReg curVal = miscRegFile[misc_reg][reg_sel];
+    // Mask off current alue with inverse mask (clear writeable bits)
+    curVal &= (~miscRegFile_WriteMask[misc_reg][reg_sel]);
+    retVal |= curVal; // Combine the two
+    DPRINTF(MipsPRA,
+            "filterCP0Write: Mask: %lx, Inverse Mask: %lx, write Val: %x, "
+            "current val: %lx, written val: %x\n",
+            miscRegFile_WriteMask[misc_reg][reg_sel],
+            ~miscRegFile_WriteMask[misc_reg][reg_sel],
+            val, miscRegFile[misc_reg][reg_sel], retVal);
+    return retVal;
 }
 
 void
@@ -586,8 +580,6 @@ ISA::CP0Event::process()
         cp0->updateCPU();
         break;
     }
-
-    //cp0EventRemoveList.push(this);
 }
 
 const char *
-- 
cgit v1.2.3