diff options
| -rw-r--r-- | src/arch/arm/isa.cc | 11 | ||||
| -rw-r--r-- | src/arch/arm/miscregs.cc | 10 | ||||
| -rw-r--r-- | src/arch/arm/miscregs.hh | 2 | ||||
| -rw-r--r-- | src/arch/arm/miscregs_types.hh | 4 | ||||
| -rw-r--r-- | src/arch/arm/tracers/tarmac_parser.cc | 1 |
5 files changed, 17 insertions, 11 deletions
diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc index 712b43040..14cc993d1 100644 --- a/src/arch/arm/isa.cc +++ b/src/arch/arm/isa.cc @@ -479,12 +479,10 @@ ISA::readMiscReg(int misc_reg, ThreadContext *tc) switch (unflattenMiscReg(misc_reg)) { case MISCREG_HCR: - { + case MISCREG_HCR2: if (!haveVirtualization) return 0; - else - return readMiscRegNoEffect(MISCREG_HCR); - } + break; case MISCREG_CPACR: { const uint32_t ones = (uint32_t)(-1); @@ -1028,11 +1026,10 @@ ISA::setMiscReg(int misc_reg, RegVal val, ThreadContext *tc) } break; case MISCREG_HCR: - { + case MISCREG_HCR2: if (!haveVirtualization) return; - } - break; + break; case MISCREG_IFSR: { // ARM ARM (ARM DDI 0406C.b) B4.1.96 diff --git a/src/arch/arm/miscregs.cc b/src/arch/arm/miscregs.cc index bffb4446a..787ba2faf 100644 --- a/src/arch/arm/miscregs.cc +++ b/src/arch/arm/miscregs.cc @@ -257,6 +257,8 @@ decodeCP15Reg(unsigned crn, unsigned opc1, unsigned crm, unsigned opc2) return MISCREG_HDCR; case 2: return MISCREG_HCPTR; + case 4: + return MISCREG_HCR2; case 3: return MISCREG_HSTR; case 7: @@ -3215,7 +3217,11 @@ ISA::initializeMiscRegMetadata() InitReg(MISCREG_HACTLR) .hyp().monNonSecure(); InitReg(MISCREG_HCR) - .hyp().monNonSecure(); + .hyp().monNonSecure() + .res0(0x90000000); + InitReg(MISCREG_HCR2) + .hyp().monNonSecure() + .res0(0xffa9ff8c); InitReg(MISCREG_HDCR) .hyp().monNonSecure(); InitReg(MISCREG_HCPTR) @@ -4003,7 +4009,7 @@ ISA::initializeMiscRegMetadata() .mapsTo(MISCREG_HACTLR); InitReg(MISCREG_HCR_EL2) .hyp().mon() - .mapsTo(MISCREG_HCR /*, MISCREG_HCR2*/); + .mapsTo(MISCREG_HCR, MISCREG_HCR2); InitReg(MISCREG_MDCR_EL2) .hyp().mon() .mapsTo(MISCREG_HDCR); diff --git a/src/arch/arm/miscregs.hh b/src/arch/arm/miscregs.hh index 3ce371bfe..4f522f298 100644 --- a/src/arch/arm/miscregs.hh +++ b/src/arch/arm/miscregs.hh @@ -182,6 +182,7 @@ namespace ArmISA MISCREG_HSCTLR, MISCREG_HACTLR, MISCREG_HCR, + MISCREG_HCR2, MISCREG_HDCR, MISCREG_HCPTR, MISCREG_HSTR, @@ -1127,6 +1128,7 @@ namespace ArmISA "hsctlr", "hactlr", "hcr", + "hcr2", "hdcr", "hcptr", "hstr", diff --git a/src/arch/arm/miscregs_types.hh b/src/arch/arm/miscregs_types.hh index 0d6775ec9..20265e294 100644 --- a/src/arch/arm/miscregs_types.hh +++ b/src/arch/arm/miscregs_types.hh @@ -234,8 +234,8 @@ namespace ArmISA BitUnion64(HCR) Bitfield<34> e2h; // AArch64 - Bitfield<33> id; // AArch64 - Bitfield<32> cd; // AArch64 + Bitfield<33> id; + Bitfield<32> cd; Bitfield<31> rw; // AArch64 Bitfield<30> trvm; // AArch64 Bitfield<29> hcd; // AArch64 diff --git a/src/arch/arm/tracers/tarmac_parser.cc b/src/arch/arm/tracers/tarmac_parser.cc index ce2300ed5..1495c7a74 100644 --- a/src/arch/arm/tracers/tarmac_parser.cc +++ b/src/arch/arm/tracers/tarmac_parser.cc @@ -168,6 +168,7 @@ TarmacParserRecord::MiscRegMap TarmacParserRecord::miscRegMap = { { "hsctlr", MISCREG_HSCTLR }, { "hactlr", MISCREG_HACTLR }, { "hcr", MISCREG_HCR }, + { "hcr2", MISCREG_HCR2 }, { "hdcr", MISCREG_HDCR }, { "hcptr", MISCREG_HCPTR }, { "hstr", MISCREG_HSTR }, |