summaryrefslogtreecommitdiff
path: root/src/arch/arm/miscregs.hh
diff options
context:
space:
mode:
authorGiacomo Travaglini <giacomo.travaglini@arm.com>2018-05-17 17:19:53 +0100
committerGiacomo Travaglini <giacomo.travaglini@arm.com>2018-07-16 08:18:56 +0000
commite7f6e7cd26de7d37c63d6642c576c1b97758340a (patch)
treeb882bb7ef4d7bbf6348e184980f279d7d38e8de5 /src/arch/arm/miscregs.hh
parentcb09573e52d05d71587a93fbde310147492eacef (diff)
downloadgem5-e7f6e7cd26de7d37c63d6642c576c1b97758340a.tar.xz
arch-arm: Introduce ARMv8.1 Virtual Timer System Registers
Adding CNTHV_CTL_EL2, CNTHV_CVAL_EL2, CNTHV_TVAL_EL2 System Registers into the decode tree. They are currently implemented as a generic timer and produces a warning if accessed. Change-Id: I1a23035d67f95eeac49d890283e9a0d58426d504 Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-on: https://gem5-review.googlesource.com/11592 Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/arch/arm/miscregs.hh')
-rw-r--r--src/arch/arm/miscregs.hh16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/arch/arm/miscregs.hh b/src/arch/arm/miscregs.hh
index 4567964b3..c1d5efa10 100644
--- a/src/arch/arm/miscregs.hh
+++ b/src/arch/arm/miscregs.hh
@@ -668,14 +668,14 @@ namespace ArmISA
// Introduced in ARMv8.1
MISCREG_TTBR1_EL2, // 600
+ MISCREG_CNTHV_CTL_EL2, // 601
+ MISCREG_CNTHV_CVAL_EL2, // 602
+ MISCREG_CNTHV_TVAL_EL2, // 603
// These MISCREG_FREESLOT are available Misc Register
// slots for future registers to be implemented.
- MISCREG_FREESLOT_1, // 601
- MISCREG_FREESLOT_2, // 602
- MISCREG_FREESLOT_3, // 603
- MISCREG_FREESLOT_4, // 604
- MISCREG_FREESLOT_5, // 605
+ MISCREG_FREESLOT_1, // 604
+ MISCREG_FREESLOT_2, // 605
// NUM_PHYS_MISCREGS specifies the number of actual physical
// registers, not considering the following pseudo-registers
@@ -1385,11 +1385,11 @@ namespace ArmISA
"contextidr_el2",
"ttbr1_el2",
+ "cnthv_ctl_el2",
+ "cnthv_cval_el2",
+ "cnthv_tval_el2",
"freeslot1",
"freeslot2",
- "freeslot3",
- "freeslot4",
- "freeslot5",
"num_phys_regs",