diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-03-07 20:04:45 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-03-07 20:04:45 +0000 |
| commit | 8edc9d79cee3edd6d16a8254a0180aaa242974c7 (patch) | |
| tree | 9ac7148f0862e81210fe929fcd61496ea7216727 /src/arch/sparc/utility.hh | |
| parent | c82251326986affba0224460552236ebfe3447c2 (diff) | |
| parent | 49527ab55312bf02dfce20c45db8f173b0c2324e (diff) | |
| download | gem5-8edc9d79cee3edd6d16a8254a0180aaa242974c7.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem
--HG--
extra : convert_revision : d764fe37c71269a04fcede6cbf30e24262447e89
Diffstat (limited to 'src/arch/sparc/utility.hh')
| -rw-r--r-- | src/arch/sparc/utility.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/sparc/utility.hh b/src/arch/sparc/utility.hh index 3c8bdcd01..64b91695e 100644 --- a/src/arch/sparc/utility.hh +++ b/src/arch/sparc/utility.hh @@ -44,8 +44,8 @@ namespace SparcISA static inline bool inUserMode(ThreadContext *tc) { - return !(tc->readMiscReg(MISCREG_PSTATE & (1 << 2)) || - tc->readMiscReg(MISCREG_HPSTATE & (1 << 2))); + return !(tc->readMiscRegNoEffect(MISCREG_PSTATE & (1 << 2)) || + tc->readMiscRegNoEffect(MISCREG_HPSTATE & (1 << 2))); } inline ExtMachInst @@ -56,7 +56,7 @@ namespace SparcISA //slightly redundant, but it removes the need to put a condition //into all the execute functions if(inst & (1 << 13)) - emi |= (static_cast<ExtMachInst>(xc->readMiscReg(MISCREG_ASI)) + emi |= (static_cast<ExtMachInst>(xc->readMiscRegNoEffect(MISCREG_ASI)) << (sizeof(MachInst) * 8)); else emi |= (static_cast<ExtMachInst>(bits(inst, 12, 5)) |