diff options
| -rw-r--r-- | src/arch/arm/isa.cc | 6 | ||||
| -rw-r--r-- | src/arch/arm/miscregs.cc | 16 | ||||
| -rw-r--r-- | src/arch/arm/miscregs.hh | 16 |
3 files changed, 30 insertions, 8 deletions
diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc index 9b17927e0..c701cc3a7 100644 --- a/src/arch/arm/isa.cc +++ b/src/arch/arm/isa.cc @@ -644,6 +644,9 @@ ISA::readMiscReg(int misc_reg, ThreadContext *tc) return 0; // bits [63:0] RES0 (reserved for future use) // Generic Timer registers + case MISCREG_CNTHV_CTL_EL2: + case MISCREG_CNTHV_CVAL_EL2: + case MISCREG_CNTHV_TVAL_EL2: case MISCREG_CNTFRQ ... MISCREG_CNTHP_CTL: case MISCREG_CNTPCT ... MISCREG_CNTHP_CVAL: case MISCREG_CNTKCTL_EL1 ... MISCREG_CNTV_CVAL_EL0: @@ -1913,6 +1916,9 @@ ISA::setMiscReg(int misc_reg, const MiscReg &val, ThreadContext *tc) break; // Generic Timer registers + case MISCREG_CNTHV_CTL_EL2: + case MISCREG_CNTHV_CVAL_EL2: + case MISCREG_CNTHV_TVAL_EL2: case MISCREG_CNTFRQ ... MISCREG_CNTHP_CTL: case MISCREG_CNTPCT ... MISCREG_CNTHP_CVAL: case MISCREG_CNTKCTL_EL1 ... MISCREG_CNTV_CVAL_EL0: 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) 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", |