From: Gabe Black <gblack@eecs.umich.edu>
Date: Mon, 12 Jun 2006 04:49:24 +0000 (-0400)
Subject: Merge m5.eecs.umich.edu:/bk/newmem
X-Git-Tag: m5_2.0_beta1~66^2~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=15a8f050605919579e81b6abb98a0b596334216d;p=gem5.git

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
---

15a8f050605919579e81b6abb98a0b596334216d
diff --cc src/arch/sparc/regfile.hh
index 4e5494730,cbeb3c7b9..e5192d684
--- a/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(); }