diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2006-12-08 15:07:26 -0500 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2006-12-08 15:07:26 -0500 |
| commit | 369e10d95adb45da7a791e6e8a6a4ced64892f14 (patch) | |
| tree | e7bd96aa8f5b8c7842805038121b3f27d03b2e24 /src/arch/sparc/miscregfile.cc | |
| parent | ed22eb781dc7714c1b2ca17cf17824917e38319c (diff) | |
| parent | da6c1f5b096288f13bd4c608b40d1caa84c4de49 (diff) | |
| download | gem5-369e10d95adb45da7a791e6e8a6a4ced64892f14.tar.xz | |
Merge zizzer:/bk/sparcfs
into zed.eecs.umich.edu:/z/hsul/work/sparc/m5
src/arch/sparc/ua2005.cc:
hand merge
--HG--
extra : convert_revision : 5157fa5d7053cb93f73241c63871eaae6f58b8a6
Diffstat (limited to 'src/arch/sparc/miscregfile.cc')
| -rw-r--r-- | src/arch/sparc/miscregfile.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/sparc/miscregfile.cc b/src/arch/sparc/miscregfile.cc index 48abad32a..fd20a14c1 100644 --- a/src/arch/sparc/miscregfile.cc +++ b/src/arch/sparc/miscregfile.cc @@ -372,7 +372,7 @@ void MiscRegFile::setReg(int miscReg, const MiscReg &val) gsr = val; break; case MISCREG_SOFTINT: - softint = val; + softint |= val; break; case MISCREG_TICK_CMPR: tick_cmpr = val; |