diff options
| author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-01-09 10:10:04 +0000 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-02-07 15:13:49 +0000 |
| commit | 7798ffb6948d12c7f2bc63dc9a3263bb19aa3297 (patch) | |
| tree | 24e2a42dc06b980a86e7763b6b01d9fd7aa372e0 /src/arch/arm/tlb.cc | |
| parent | 633fdd5841d8e7798e1b1158261612a6ad84c812 (diff) | |
| download | gem5-7798ffb6948d12c7f2bc63dc9a3263bb19aa3297.tar.xz | |
arch-arm: Change function name for banked miscregs
This commit changes the function's name used for retrieving the index of a
security banked register given the flatten index. This will avoid confusion
with flattenRegId, which has a different purpose.
Change-Id: I470ffb55916cb7fc9f78e071a7f2e609c1829f1a
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/7982
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/arch/arm/tlb.cc')
| -rw-r--r-- | src/arch/arm/tlb.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc index d3f44c316..3aebe3d59 100644 --- a/src/arch/arm/tlb.cc +++ b/src/arch/arm/tlb.cc @@ -1328,28 +1328,28 @@ TLB::updateMiscReg(ThreadContext *tc, ArmTranslationType tranType) stage2Req = false; } } else { // AArch32 - sctlr = tc->readMiscReg(flattenMiscRegNsBanked(MISCREG_SCTLR, tc, + sctlr = tc->readMiscReg(snsBankedIndex(MISCREG_SCTLR, tc, !isSecure)); - ttbcr = tc->readMiscReg(flattenMiscRegNsBanked(MISCREG_TTBCR, tc, + ttbcr = tc->readMiscReg(snsBankedIndex(MISCREG_TTBCR, tc, !isSecure)); scr = tc->readMiscReg(MISCREG_SCR); isPriv = cpsr.mode != MODE_USER; if (longDescFormatInUse(tc)) { uint64_t ttbr_asid = tc->readMiscReg( - flattenMiscRegNsBanked(ttbcr.a1 ? MISCREG_TTBR1 - : MISCREG_TTBR0, + snsBankedIndex(ttbcr.a1 ? MISCREG_TTBR1 : + MISCREG_TTBR0, tc, !isSecure)); asid = bits(ttbr_asid, 55, 48); } else { // Short-descriptor translation table format in use - CONTEXTIDR context_id = tc->readMiscReg(flattenMiscRegNsBanked( + CONTEXTIDR context_id = tc->readMiscReg(snsBankedIndex( MISCREG_CONTEXTIDR, tc,!isSecure)); asid = context_id.asid; } - prrr = tc->readMiscReg(flattenMiscRegNsBanked(MISCREG_PRRR, tc, + prrr = tc->readMiscReg(snsBankedIndex(MISCREG_PRRR, tc, !isSecure)); - nmrr = tc->readMiscReg(flattenMiscRegNsBanked(MISCREG_NMRR, tc, + nmrr = tc->readMiscReg(snsBankedIndex(MISCREG_NMRR, tc, !isSecure)); - dacr = tc->readMiscReg(flattenMiscRegNsBanked(MISCREG_DACR, tc, + dacr = tc->readMiscReg(snsBankedIndex(MISCREG_DACR, tc, !isSecure)); hcr = tc->readMiscReg(MISCREG_HCR); |