ARM: Ignore/warn on accesses to the dccmvac register.

diff --git a/src/arch/arm/isa/formats/misc.isa b/src/arch/arm/isa/formats/misc.isa
index 2052e0d3d8b4302a8a581b901a051bd1f7cbc0a0..8ba46960ab7cba2a063e29fcbc0edd8b2504d251 100644 (file)
--- a/src/arch/arm/isa/formats/misc.isa
+++ b/src/arch/arm/isa/formats/misc.isa
@@ -100,7 +100,10 @@ def format McrMrc15() {{
                     isRead ? "mrc dccisw" : "mcr dcisw", machInst);
           case MISCREG_DCCIMVAC:
             return new WarnUnimplemented(
-                    isRead ? "mrc dccimvac" : "mcr dcimvac", machInst);
+                    isRead ? "mrc dccimvac" : "mcr dccimvac", machInst);
+          case MISCREG_DCCMVAC:
+            return new WarnUnimplemented(
+                    isRead ? "mrc dccmvac" : "mcr dccmvac", machInst);
           case MISCREG_CP15ISB:
             return new WarnUnimplemented(
                     isRead ? "mrc cp15isb" : "mcr cp15isb", machInst);

diff --git a/src/arch/arm/miscregs.hh b/src/arch/arm/miscregs.hh
index ae2cc22478cf1b3b77329bb3e4d2ac05bd9d185c..df3d0094614b00e114ed347091d7a025ef2e45a3 100644 (file)
--- a/src/arch/arm/miscregs.hh
+++ b/src/arch/arm/miscregs.hh
@@ -84,6 +84,7 @@ namespace ArmISA
         MISCREG_SCTLR = MISCREG_CP15_START,
         MISCREG_DCCISW,
         MISCREG_DCCIMVAC,
+        MISCREG_DCCMVAC,
         MISCREG_CONTEXTIDR,
         MISCREG_TPIDRURW,
         MISCREG_TPIDRURO,
@@ -138,7 +139,6 @@ namespace ArmISA
         MISCREG_BPIMVA,
         MISCREG_DCIMVAC,
         MISCREG_DCISW,
-        MISCREG_DCCMVAC,
         MISCREG_MCCSW,
         MISCREG_DCCMVAU,
 
@@ -158,7 +158,7 @@ namespace ArmISA
         "cpsr", "spsr", "spsr_fiq", "spsr_irq", "spsr_svc",
         "spsr_mon", "spsr_und", "spsr_abt",
         "fpsr", "fpsid", "fpscr", "fpexc",
-        "sctlr", "dccisw", "dccimvac",
+        "sctlr", "dccisw", "dccimvac", "dccmvac",
         "contextidr", "tpidrurw", "tpidruro", "tpidrprw",
         "cp15isb", "cp15dsb", "cp15dmb", "cpacr", "clidr",
         "icialluis", "iciallu", "icimvau",
@@ -170,7 +170,7 @@ namespace ArmISA
         "dfsr", "ifsr", "adfsr", "aifsr", "dfar", "ifar",
         "drbar", "irbar", "drsr", "irsr", "dracr", "iracr",
         "rgnr", "bpiallis",
-        "bpiall", "bpimva", "dcimvac", "dcisw", "dccmvac", "mccsw",
+        "bpiall", "bpimva", "dcimvac", "dcisw", "mccsw",
         "dccmvau",
         "nop", "raz"
     };