Merge zizzer.eecs.umich.edu:/bk/newmem
into vm1.(none):/home/stever/bk/newmem-head --HG-- extra : convert_revision : faab7569deefde94c20133b2f70a8567bcaa2960
This commit is contained in:
commit
51d8c59ef8
|
@ -132,7 +132,6 @@ namespace AlphaISA
|
||||||
MiscRegFile::setRegWithEffect(int misc_reg, const MiscReg &val,
|
MiscRegFile::setRegWithEffect(int misc_reg, const MiscReg &val,
|
||||||
ThreadContext *tc)
|
ThreadContext *tc)
|
||||||
{
|
{
|
||||||
#if FULL_SYSTEM
|
|
||||||
switch(misc_reg) {
|
switch(misc_reg) {
|
||||||
case MISCREG_FPCR:
|
case MISCREG_FPCR:
|
||||||
fpcr = val;
|
fpcr = val;
|
||||||
|
@ -150,12 +149,13 @@ namespace AlphaISA
|
||||||
intr_flag = val;
|
intr_flag = val;
|
||||||
return;
|
return;
|
||||||
default:
|
default:
|
||||||
return setIpr(misc_reg, val, tc);
|
#if FULL_SYSTEM
|
||||||
}
|
setIpr(misc_reg, val, tc);
|
||||||
#else
|
#else
|
||||||
//panic("No registers with side effects in SE mode!");
|
panic("No registers with side effects in SE mode!");
|
||||||
return;
|
|
||||||
#endif
|
#endif
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue