diff options
author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-05-17 17:19:53 +0100 |
---|---|---|
committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-07-16 08:18:56 +0000 |
commit | e7f6e7cd26de7d37c63d6642c576c1b97758340a (patch) | |
tree | b882bb7ef4d7bbf6348e184980f279d7d38e8de5 /src/arch/arm/miscregs.cc | |
parent | cb09573e52d05d71587a93fbde310147492eacef (diff) | |
download | gem5-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.cc')
-rw-r--r-- | src/arch/arm/miscregs.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/arch/arm/miscregs.cc b/src/arch/arm/miscregs.cc index cab5a70d2..bbd5347e5 100644 --- a/src/arch/arm/miscregs.cc +++ b/src/arch/arm/miscregs.cc @@ -2331,6 +2331,16 @@ decodeAArch64SysReg(unsigned op0, unsigned op1, return MISCREG_CNTHP_CVAL_EL2; } break; + case 3: + switch (op2) { + case 0: + return MISCREG_CNTHV_TVAL_EL2; + case 1: + return MISCREG_CNTHV_CTL_EL2; + case 2: + return MISCREG_CNTHV_CVAL_EL2; + } + break; } break; case 7: @@ -4018,6 +4028,12 @@ ISA::initializeMiscRegMetadata() .allPrivileges().exceptUserMode().writes(0); InitReg(MISCREG_CONTEXTIDR_EL2) .mon().hyp(); + InitReg(MISCREG_CNTHV_CTL_EL2) + .mon().hyp(); + InitReg(MISCREG_CNTHV_CVAL_EL2) + .mon().hyp(); + InitReg(MISCREG_CNTHV_TVAL_EL2) + .mon().hyp(); // Dummy registers InitReg(MISCREG_NOP) |