summaryrefslogtreecommitdiff
path: root/src/arch/arm
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
commit54850e4d23a15c035164ca77a95fdae775bb3214 (patch)
tree3d779b8bc3678970cb28a71faee4618e7e8c6ca1 /src/arch/arm
parent221e0ac5234b60283753af5d7173199085ededa6 (diff)
downloadgem5-54850e4d23a15c035164ca77a95fdae775bb3214.tar.xz
ARM: Allow accesses to the contextidr register.
Diffstat (limited to 'src/arch/arm')
-rw-r--r--src/arch/arm/miscregs.hh6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/arm/miscregs.hh b/src/arch/arm/miscregs.hh
index c65b55a52..d22c09d67 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_CONTEXTIDR,
MISCREG_CP15_UNIMP_START,
MISCREG_CTR = MISCREG_CP15_UNIMP_START,
MISCREG_TCMTR,
@@ -137,7 +138,6 @@ namespace ArmISA
MISCREG_CP15DMB,
MISCREG_DCCMVAU,
MISCREG_DCCIMVAC,
- MISCREG_CONTEXTIDR,
MISCREG_TPIDRURW,
MISCREG_TPIDRURO,
MISCREG_TPIDRPRW,
@@ -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", "ctr", "tcmtr", "mpuir", "mpidr", "midr",
+ "sctlr", "dccisw", "contextidr", "ctr", "tcmtr", "mpuir", "mpidr", "midr",
"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",
@@ -168,7 +168,7 @@ namespace ArmISA
"rgnr", "icialluis", "bpiallis", "iciallu", "icimvau",
"cp15isb", "bpiall", "bpimva", "dcimvac", "dcisw", "dccmvac", "mccsw",
"cp15dsb", "cp15dmb", "dccmvau", "dccimvac",
- "contextidr", "tpidrurw", "tpidruro", "tpidrprw",
+ "tpidrurw", "tpidruro", "tpidrprw",
"nop", "raz"
};