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

into  ewok.(none):/home/gblack/m5/newmem

src/arch/sparc/regfile.hh:
    Hand Merge

--HG--
extra : convert_revision : c47202689202069892524a7d71962082469996ee

diff --cc src/arch/sparc/regfile.hh
index 4e5494730ef377de50c82067c9fe5b6d44783381,cbeb3c7b9819c65b187baeb0a4eb1d399e025620..e5192d68457b522ff3d6db8a8d6865d2e78b2766
--- 1/src/arch/sparc/regfile.hh
--- 2/src/arch/sparc/regfile.hh
+++ b/src/arch/sparc/regfile.hh
@@@ -56,6 -61,8 +60,7 @@@ namespace SparcIS
      const int HprStart = 64;
      const int MiscStart = 96;
  
 -
+     const uint64_t Bit64 = (1ULL << 63);
      class IntRegFile
      {
        protected:
@@@ -599,6 -625,11 +623,9 @@@
              hpstateFields.red = 1;
              hpstateFields.hpriv = 1;
              hpstateFields.tlz = 0; // this is a guess
 -
+             hintp = 0; // no interrupts pending
+             hstick_cmprFields.int_dis = 1; // disable timer compare interrupts
+             hstick_cmprFields.tick_cmpr = 0; // Reset to 0 for pretty printing
 -
  #else
  /*        //This sets up the initial state of the processor for usermode processes
              pstateFields.priv = 0; //Process runs in user mode
@@@ -637,10 -685,8 +681,10 @@@
  
          void unserialize(Checkpoint * cp, const std::string & section);
  
-         void copyMiscRegs(ExecContext * xc);
+         void copyMiscRegs(ThreadContext * tc);
  
 +      protected:
 +
          bool isHyperPriv() { return hpstateFields.hpriv; }
          bool isPriv() { return hpstateFields.hpriv || pstateFields.priv; }
          bool isNonPriv() { return !isPriv(); }