Merge zizzer.eecs.umich.edu:/bk/newmem

into  zower.eecs.umich.edu:/home/gblack/m5/newmem-statetrace

--HG--
extra : convert_revision : 6a8749be327bf2be888850060ae0427f0c943439
This commit is contained in:
Gabe Black
2007-03-10 19:52:53 -05:00

View File

@@ -654,7 +654,12 @@ void MiscRegFile::setReg(int miscReg,
#endif
return;
case MISCREG_CWP:
new_val = val > NWindows ? NWindows - 1 : val;
new_val = val >= NWindows ? NWindows - 1 : val;
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: