Merge zizzer.eecs.umich.edu:/bk/newmem

into  zower.eecs.umich.edu:/home/gblack/m5/newmem-statetrace

--HG--
extra : convert_revision : c886266320e6c1352e359d5abf6fb3a804f81451

1 files changed, 6 insertions, 4 deletions

diff --git a/util/statetrace/arch/tracechild_sparc.hh b/util/statetrace/arch/tracechild_sparc.hh
index 8b4ff9aae..0284fb82e 100644
--- a/util/statetrace/arch/tracechild_sparc.hh
+++ b/util/statetrace/arch/tracechild_sparc.hh
@@ -72,10 +72,10 @@ private:
         regs oldregs;
         fpu thefpregs;
         fpu oldfpregs;
-        int64_t locals[8];
-        int64_t oldLocals[8];
-        int64_t inputs[8];
-        int64_t oldInputs[8];
+        uint64_t locals[8];
+        uint64_t oldLocals[8];
+        uint64_t inputs[8];
+        uint64_t oldInputs[8];
         bool regDiffSinceUpdate[numregs];
 
         //This calculates where the pc might go after the current instruction.
@@ -90,6 +90,8 @@ protected:
 public:
         SparcTraceChild();
 
+        bool sendState(int socket);
+
         int getNumRegs()
         {
                 return numregs;