ARM: Make MPIDR return 0 and ignore writes.

diff --git a/src/arch/arm/isa.hh b/src/arch/arm/isa.hh
index 9195cdfcd9a6a8dc918e31383e98ae1d7ca079cd..1dad823979fb68c50866a5a7dd20f91231504706 100644 (file)
--- a/src/arch/arm/isa.hh
+++ b/src/arch/arm/isa.hh
@@ -155,6 +155,8 @@ namespace ArmISA
             mvfr1.vfpHalfPrecision = 1;
             miscRegs[MISCREG_MVFR1] = mvfr1;
 
+            miscRegs[MISCREG_MPIDR] = 0;
+
             //XXX We need to initialize the rest of the state.
         }
 
@@ -296,6 +298,7 @@ namespace ArmISA
               case MISCREG_TLBTR:
               case MISCREG_MVFR0:
               case MISCREG_MVFR1:
+              case MISCREG_MPIDR:
                 return;
             }
             return setMiscRegNoEffect(misc_reg, newVal);

diff --git a/src/arch/arm/miscregs.hh b/src/arch/arm/miscregs.hh
index 851044a35295e7353bfa8a8c25cb633f99acc5b8..27f12c3b27618e24e892855d27e319f930b2d676 100644 (file)
--- a/src/arch/arm/miscregs.hh
+++ b/src/arch/arm/miscregs.hh
@@ -128,10 +128,10 @@ namespace ArmISA
         MISCREG_IFSR,
         MISCREG_DFAR,
         MISCREG_IFAR,
+        MISCREG_MPIDR,
         MISCREG_CP15_UNIMP_START,
         MISCREG_CTR = MISCREG_CP15_UNIMP_START,
         MISCREG_TCMTR,
-        MISCREG_MPIDR,
         MISCREG_ID_PFR0,
         MISCREG_ID_PFR1,
         MISCREG_ID_DFR0,
@@ -203,8 +203,8 @@ namespace ArmISA
         "itlbiall", "itlbimva", "itlbiasid",
         "dtlbiall", "dtlbimva", "dtlbiasid",
         "tlbiall", "tlbimva", "tlbiasid", "tlbimvaa",
-        "dfsr", "ifsr", "dfar", "ifar",
-        "ctr", "tcmtr", "mpidr",
+        "dfsr", "ifsr", "dfar", "ifar", "mpidr",
+        "ctr", "tcmtr",
         "id_pfr0", "id_pfr1", "id_dfr0", "id_afr0",
         "id_mmfr0", "id_mmfr1", "id_mmfr2", "id_mmfr3",
         "id_isar0", "id_isar1", "id_isar2", "id_isar3", "id_isar4", "id_isar5",