Merge zower:/home/gblack/m5/newmem-statetrace
into zizzer.eecs.umich.edu:/.automount/zower/eecshome/m5/newmem-statetrace-test --HG-- extra : convert_revision : c6a45d188b729176e196e19e2d75328da0414084
This commit is contained in:
commit
91c812c34d
1 changed files with 6 additions and 1 deletions
|
@ -654,7 +654,12 @@ void MiscRegFile::setReg(int miscReg,
|
||||||
#endif
|
#endif
|
||||||
return;
|
return;
|
||||||
case MISCREG_CWP:
|
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);
|
tc->changeRegFileContext(CONTEXT_CWP, new_val);
|
||||||
break;
|
break;
|
||||||
case MISCREG_GL:
|
case MISCREG_GL:
|
||||||
|
|
Loading…
Reference in a new issue