Merge zizzer:/bk/newmem

into  zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release

--HG--
extra : convert_revision : 82b83199a36059d4b402f89f7db2de299ea59c1e

1 files changed, 2 insertions, 12 deletions

diff --git a/src/arch/mips/isa/base.isa b/src/arch/mips/isa/base.isa
index b2a31c018..848438cb3 100644
--- a/src/arch/mips/isa/base.isa
+++ b/src/arch/mips/isa/base.isa
@@ -18,16 +18,6 @@ output header {{
     {
       protected:
 
-        /// Make MipsISA register dependence tags directly visible in
-        /// this class and derived classes.  Maybe these should really
-        /// live here and not in the MipsISA namespace.
-        /*enum DependenceTags {
-            FP_Base_DepTag = MipsISA::FP_Base_DepTag,
-            Fpcr_DepTag = MipsISA::Fpcr_DepTag,
-            Uniq_DepTag = MipsISA::Uniq_DepTag,
-            IPR_Base_DepTag = MipsISA::IPR_Base_DepTag
-            };*/
-
         // Constructor
         MipsStaticInst(const char *mnem, MachInst _machInst, OpClass __opClass)
             : StaticInst(mnem, _machInst, __opClass)
@@ -67,12 +57,12 @@ output decoder {{
         }
 
         if(_numSrcRegs > 0) {
-            ss << ",";
+            ss << ", ";
             printReg(ss, _srcRegIdx[0]);
         }
 
         if(_numSrcRegs > 1) {
-            ss << ",";
+            ss << ", ";
             printReg(ss, _srcRegIdx[1]);
         }