ARM: Return an FailUnimp instruction when an unimplemented CP15 register is accessed.

Just panicing in readMiscReg() doesn't work because a speculative access
in the o3 model can end the simulation.
This commit is contained in:
Ali Saidi 2010-11-15 14:04:04 -06:00
parent d4767f440a
commit 4a1814bd52
2 changed files with 6 additions and 3 deletions

View file

@ -173,11 +173,10 @@ ISA::readMiscReg(int misc_reg, ThreadContext *tc)
cpsr.t = pc.thumb() ? 1 : 0;
return cpsr;
}
if (misc_reg >= MISCREG_CP15_UNIMP_START &&
misc_reg < MISCREG_CP15_END) {
if (misc_reg >= MISCREG_CP15_UNIMP_START)
panic("Unimplemented CP15 register %s read.\n",
miscRegName[misc_reg]);
}
switch (misc_reg) {
case MISCREG_CLIDR:
warn_once("The clidr register always reports 0 caches.\n");

View file

@ -180,6 +180,10 @@ let {{
// Read/write, priveleged only.
default:
if (miscReg >= MISCREG_CP15_UNIMP_START)
return new FailUnimplemented(csprintf("%s %s",
isRead ? "mrc" : "mcr", miscRegName[miscReg]).c_str(),
machInst);
if (isRead) {
return new Mrc15(machInst, rt, (IntRegIndex)miscReg);
} else {