summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:08 -0500
committerGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:08 -0500
commit7932b862986c325d647097e13ffb6a54a5cc93b9 (patch)
treedb2903a45b5c3f9f391383dac5a1a858fc2e3a40 /src
parent6ae4d34a124b0c06a30c7ddb9da6d59225aa6cf3 (diff)
downloadgem5-7932b862986c325d647097e13ffb6a54a5cc93b9.tar.xz
ARM: Ignore accesses to DCCIMVAC.
Diffstat (limited to 'src')
-rw-r--r--src/arch/arm/isa/formats/misc.isa16
-rw-r--r--src/arch/arm/miscregs.hh7
2 files changed, 14 insertions, 9 deletions
diff --git a/src/arch/arm/isa/formats/misc.isa b/src/arch/arm/isa/formats/misc.isa
index 5498a84b0..74e10a2d8 100644
--- a/src/arch/arm/isa/formats/misc.isa
+++ b/src/arch/arm/isa/formats/misc.isa
@@ -90,14 +90,18 @@ def format McrMrc15() {{
const bool isRead = bits(machInst, 20);
- if (miscReg == MISCREG_NOP) {
+ switch (miscReg) {
+ case MISCREG_NOP:
return new NopInst(machInst);
- } else if (miscReg == NUM_MISCREGS) {
+ case NUM_MISCREGS:
return new Unknown(machInst);
- } else if (miscReg == MISCREG_DCCISW) {
- return new WarnUnimplemented(isRead ? "mrc dccisw" : "mcr dcisw",
- machInst);
- } else {
+ case MISCREG_DCCISW:
+ return new WarnUnimplemented(
+ isRead ? "mrc dccisw" : "mcr dcisw", machInst);
+ case MISCREG_DCCIMVAC:
+ return new WarnUnimplemented(
+ isRead ? "mrc dccimvac" : "mcr dcimvac", machInst);
+ default:
if (isRead) {
return new Mrc15(machInst, rt, (IntRegIndex)miscReg);
} else {
diff --git a/src/arch/arm/miscregs.hh b/src/arch/arm/miscregs.hh
index dfa9829b9..c1c7e9422 100644
--- a/src/arch/arm/miscregs.hh
+++ b/src/arch/arm/miscregs.hh
@@ -83,6 +83,7 @@ namespace ArmISA
MISCREG_CP15_START,
MISCREG_SCTLR = MISCREG_CP15_START,
MISCREG_DCCISW,
+ MISCREG_DCCIMVAC,
MISCREG_CONTEXTIDR,
MISCREG_TPIDRURW,
MISCREG_TPIDRURO,
@@ -140,7 +141,6 @@ namespace ArmISA
MISCREG_CP15DSB,
MISCREG_CP15DMB,
MISCREG_DCCMVAU,
- MISCREG_DCCIMVAC,
MISCREG_CP15_END,
@@ -158,7 +158,8 @@ namespace ArmISA
"cpsr", "spsr", "spsr_fiq", "spsr_irq", "spsr_svc",
"spsr_mon", "spsr_und", "spsr_abt",
"fpsr", "fpsid", "fpscr", "fpexc",
- "sctlr", "dccisw", "contextidr", "tpidrurw", "tpidruro", "tpidrprw",
+ "sctlr", "dccisw", "dccimvac",
+ "contextidr", "tpidrurw", "tpidruro", "tpidrprw",
"ctr", "tcmtr", "mpuir", "mpidr", "midr",
"id_pfr0", "id_pfr1", "id_dfr0", "id_afr0",
"id_mmfr0", "id_mmfr1", "id_mmfr2", "id_mmfr3",
@@ -168,7 +169,7 @@ namespace ArmISA
"drbar", "irbar", "drsr", "irsr", "dracr", "iracr",
"rgnr", "icialluis", "bpiallis", "iciallu", "icimvau",
"cp15isb", "bpiall", "bpimva", "dcimvac", "dcisw", "dccmvac", "mccsw",
- "cp15dsb", "cp15dmb", "dccmvau", "dccimvac",
+ "cp15dsb", "cp15dmb", "dccmvau",
"nop", "raz"
};