changeset c14db20af064 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=c14db20af064
description:
automerge
diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
src/arch/sparc/utility.hh | 4 ++--
diffs (14 lines):
diff -r 2e91670790c8 -r c14db20af064 src/arch/sparc/utility.hh
--- a/src/arch/sparc/utility.hh Mon Jul 06 15:49:48 2009 -0700
+++ b/src/arch/sparc/utility.hh Mon Jul 06 15:54:18 2009 -0700
@@ -47,8 +47,8 @@
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) {
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
