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, 10 insertions, 1 deletions

diff --git a/arch/sparc/isa_traits.hh b/arch/sparc/isa_traits.hh
index ad8ae5c8d..0955abb3a 100644
--- a/arch/sparc/isa_traits.hh
+++ b/arch/sparc/isa_traits.hh
@@ -83,6 +83,15 @@ class SyscallReturn
 
 namespace SparcISA
 {
+
+    // These enumerate all the registers for dependence tracking.
+    enum DependenceTags {
+        // 0..31 are the integer regs 0..31
+        // 32..63 are the FP regs 0..31, i.e. use (reg + FP_Base_DepTag)
+        FP_Base_DepTag = 32,
+        Ctrl_Base_DepTag = 96,
+    };
+
     //This makes sure the big endian versions of certain functions are used.
     using namespace BigEndianGuest;
 
@@ -142,7 +151,7 @@ namespace SparcISA
 
     void unserialize(Checkpoint *cp, const std::string &section);
 
-    StaticInstPtr decodeInst(MachInst);
+    StaticInstPtr decodeInst(ExtMachInst);
 
     // return a no-op instruction... used for instruction fetch faults
     extern const MachInst NoopMachInst;