4 files changed, 7 insertions, 5 deletions
diff --git a/src/arch/sparc/intregfile.cc b/src/arch/sparc/intregfile.cc
index 6250b1810..0a8ac055f 100644
--- a/src/arch/sparc/intregfile.cc
+++ b/src/arch/sparc/intregfile.cc
@@ -31,6 +31,7 @@
 
 #include "arch/sparc/intregfile.hh"
 #include "base/trace.hh"
+#include "base/misc.hh"
 #include "sim/serialize.hh"
 
 #include <string.h>
@@ -83,7 +84,8 @@ IntReg IntRegFile::readReg(int intReg)
     else if((intReg -= NumIntArchRegs) < NumMicroIntRegs)
         val = microRegs[intReg];
     else
-        panic("Tried to read non-existant integer register %d, %d\n", NumIntArchRegs + NumMicroIntRegs + intReg, intReg);
+        panic("Tried to read non-existant integer register %d, %d\n",
+                NumIntArchRegs + NumMicroIntRegs + intReg, intReg);
 
     DPRINTF(Sparc, "Read register %d = 0x%x\n", intReg, val);
     return val;
diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh
index 008f45bcd..287f90658 100644
--- a/src/arch/sparc/isa_traits.hh
+++ b/src/arch/sparc/isa_traits.hh
@@ -89,7 +89,7 @@ namespace SparcISA
 
     //Why does both the previous set of constants and this one exist?
     const int PageShift = 13;
-    const int PageBytes = ULL(1) << PageShift;
+    const int PageBytes = 1ULL << PageShift;
 
     const int BranchPredAddrShiftAmt = 2;
 
diff --git a/src/arch/sparc/miscregfile.cc b/src/arch/sparc/miscregfile.cc
index 9bbe9a5a0..7b0939c29 100644
--- a/src/arch/sparc/miscregfile.cc
+++ b/src/arch/sparc/miscregfile.cc
@@ -67,7 +67,7 @@ enum RegMask
         PSTATE_MASK = (((1 << 4) - 1) << 1) | (((1 << 4) - 1) << 6) | (1 << 12)
 };
 
-void MiscRegFile::reset()
+void MiscRegFile::clear()
 {
     y = 0;
     ccr = 0;
diff --git a/src/arch/sparc/miscregfile.hh b/src/arch/sparc/miscregfile.hh
index 3093b56e6..6bc04b583 100644
--- a/src/arch/sparc/miscregfile.hh
+++ b/src/arch/sparc/miscregfile.hh
@@ -176,11 +176,11 @@ namespace SparcISA
 #endif
       public:
 
-        void reset();
+        void clear();
 
         MiscRegFile()
         {
-            reset();
+            clear();
         }
 
         MiscReg readReg(int miscReg);