summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2009-07-06 15:54:18 -0700
committerNathan Binkert <nate@binkert.org>2009-07-06 15:54:18 -0700
commit7ffb8e59143ba13b79077f11c3d01f039c115d9f (patch)
tree3197f14b6ef4238cd5e581929c9bd6b19c82eea3
parente3e509b31ae7013ba791c0b0c701b0891a9ce1ce (diff)
parent240e214236a693fbe091d9a40b7ddb43976dcfd4 (diff)
downloadgem5-7ffb8e59143ba13b79077f11c3d01f039c115d9f.tar.xz
automerge
-rw-r--r--src/arch/sparc/utility.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/sparc/utility.hh b/src/arch/sparc/utility.hh
index 9a84a82b3..4ad8950b1 100644
--- a/src/arch/sparc/utility.hh
+++ b/src/arch/sparc/utility.hh
@@ -47,8 +47,8 @@ namespace SparcISA
static inline bool
inUserMode(ThreadContext *tc)
{
- return !(tc->readMiscRegNoEffect(MISCREG_PSTATE & (1 << 2)) ||
- tc->readMiscRegNoEffect(MISCREG_HPSTATE & (1 << 2)));
+ return !((tc->readMiscRegNoEffect(MISCREG_PSTATE) & (1 << 2)) ||
+ (tc->readMiscRegNoEffect(MISCREG_HPSTATE) & (1 << 2)));
}
inline bool isCallerSaveIntegerRegister(unsigned int reg) {