Merge zizzer:/bk/newmem

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

--HG--
extra : convert_revision : 02fe0b0170348dc6f6a985c15123806088a8c23e

1 files changed, 15 insertions, 0 deletions

diff --git a/arch/sparc/isa/base.isa b/arch/sparc/isa/base.isa
index 916a9c5a5..f8c6ae12c 100644
--- a/arch/sparc/isa/base.isa
+++ b/arch/sparc/isa/base.isa
@@ -48,6 +48,8 @@ output header {{
 
             std::string generateDisassembly(Addr pc,
                 const SymbolTable *symtab) const;
+
+            void printReg(std::ostream &os, int reg) const;
         };
 
         bool passesCondition(condCodes codes, condTest condition);
@@ -55,6 +57,17 @@ output header {{
 
 output decoder {{
 
+        void
+        SparcStaticInst::printReg(std::ostream &os, int reg) const
+        {
+            if (reg < FP_Base_DepTag) {
+                ccprintf(os, "r%d", reg);
+            }
+            else {
+                ccprintf(os, "f%d", reg - FP_Base_DepTag);
+            }
+        }
+
         std::string SparcStaticInst::generateDisassembly(Addr pc,
             const SymbolTable *symtab) const
         {
@@ -124,6 +137,8 @@ output decoder {{
               case OverflowSet:
                 return codes.v;
             }
+            panic("Tried testing condition nonexistant "
+                    "condition code %d", condition);
         }
 }};