summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-12-09 18:27:54 -0500
committerAli Saidi <saidi@eecs.umich.edu>2006-12-09 18:27:54 -0500
commit4947bf276eaa19d33c1af0bd0843dc23192fdd19 (patch)
tree916e2f9ffa6e03d53637b5f801c197bc2b2b8c90 /src
parent2eef266c4587906601ab40b611695e781c4945dc (diff)
downloadgem5-4947bf276eaa19d33c1af0bd0843dc23192fdd19.tar.xz
fix lisa's hand merge
--HG-- extra : convert_revision : d25604156ae0b2cf29d92fb960b8f5d77427985b
Diffstat (limited to 'src')
-rw-r--r--src/arch/sparc/ua2005.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc
index c9aee9078..0db5f6acc 100644
--- a/src/arch/sparc/ua2005.cc
+++ b/src/arch/sparc/ua2005.cc
@@ -127,7 +127,7 @@ MiscRegFile::setFSRegWithEffect(int miscReg, const MiscReg &val,
case MISCREG_HPSTATE:
// T1000 spec says impl. dependent val must always be 1
setReg(miscReg, val | id);
-
+ break;
case MISCREG_HTSTATE:
case MISCREG_STRAND_STS_REG:
setReg(miscReg, val);