diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-29 22:01:34 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-29 22:01:34 -0400 |
| commit | c46e946c94cf730bd2c22de27d3af43955b63ba9 (patch) | |
| tree | 3722b53132ba0659bc0614708c29e7a00916abf1 /src/arch | |
| parent | ac191ecc787222b4d045698b7f75a4cbeaaef50b (diff) | |
| parent | 528694817f28c963986129a6bae36c0c77df1179 (diff) | |
| download | gem5-c46e946c94cf730bd2c22de27d3af43955b63ba9.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 2f7f50f4ad31f741c0c67db96e49d30ca078fc94
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/sparc/miscregfile.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/arch/sparc/miscregfile.cc b/src/arch/sparc/miscregfile.cc index 5bd572d38..f511ef454 100644 --- a/src/arch/sparc/miscregfile.cc +++ b/src/arch/sparc/miscregfile.cc @@ -647,11 +647,9 @@ void MiscRegFile::setReg(int miscReg, return; case MISCREG_CWP: new_val = val >= NWindows ? NWindows - 1 : val; - if (val >= NWindows) { + if (val >= NWindows) new_val = NWindows - 1; - warn("Attempted to set the CWP to %d with NWindows = %d\n", - val, NWindows); - } + tc->changeRegFileContext(CONTEXT_CWP, new_val); break; case MISCREG_GL: |