[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 02/22] target/arm: Extract TCMA with ARMVAParamet
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v4 02/22] target/arm: Extract TCMA with ARMVAParameters |
Date: |
Thu, 7 Mar 2019 09:04:20 -0800 |
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/arm/internals.h | 1 +
target/arm/helper.c | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/target/arm/internals.h b/target/arm/internals.h
index 6c018e773c..2922324f63 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -959,6 +959,7 @@ typedef struct ARMVAParameters {
bool tbid : 1;
bool epd : 1;
bool hpd : 1;
+ bool tcma : 1;
bool using16k : 1;
bool using64k : 1;
} ARMVAParameters;
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 90d15578ca..ab8006291b 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -10599,7 +10599,7 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState
*env, uint64_t va,
{
uint64_t tcr = regime_tcr(env, mmu_idx)->raw_tcr;
uint32_t el = regime_el(env, mmu_idx);
- bool tbi, tbid, epd, hpd, using16k, using64k;
+ bool tbi, tbid, epd, hpd, tcma, using16k, using64k;
int select, tsz;
/*
@@ -10614,11 +10614,12 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState
*env, uint64_t va,
using16k = extract32(tcr, 15, 1);
if (mmu_idx == ARMMMUIdx_S2NS) {
/* VTCR_EL2 */
- tbi = tbid = hpd = false;
+ tbi = tbid = hpd = tcma = false;
} else {
tbi = extract32(tcr, 20, 1);
hpd = extract32(tcr, 24, 1);
tbid = extract32(tcr, 29, 1);
+ tcma = extract32(tcr, 30, 1);
}
epd = false;
} else if (!select) {
@@ -10629,6 +10630,7 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState
*env, uint64_t va,
tbi = extract64(tcr, 37, 1);
hpd = extract64(tcr, 41, 1);
tbid = extract64(tcr, 51, 1);
+ tcma = extract64(tcr, 57, 1);
} else {
int tg = extract32(tcr, 30, 2);
using16k = tg == 1;
@@ -10638,6 +10640,7 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState
*env, uint64_t va,
tbi = extract64(tcr, 38, 1);
hpd = extract64(tcr, 42, 1);
tbid = extract64(tcr, 52, 1);
+ tcma = extract64(tcr, 58, 1);
}
tsz = MIN(tsz, 39); /* TODO: ARMv8.4-TTST */
tsz = MAX(tsz, 16); /* TODO: ARMv8.2-LVA */
@@ -10649,6 +10652,7 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState
*env, uint64_t va,
.tbid = tbid,
.epd = epd,
.hpd = hpd,
+ .tcma = tcma,
.using16k = using16k,
.using64k = using64k,
};
--
2.17.2
- [Qemu-devel] [PATCH v4 00/22] target/arm: Implement ARMv8.5-MemTag, system mode, Richard Henderson, 2019/03/07
- [Qemu-devel] [PATCH v4 01/22] target/arm: Add MTE_ACTIVE to tb_flags, Richard Henderson, 2019/03/07
- [Qemu-devel] [PATCH v4 02/22] target/arm: Extract TCMA with ARMVAParameters,
Richard Henderson <=
- [Qemu-devel] [PATCH v4 07/22] target/arm: Implement ADDG, SUBG instructions, Richard Henderson, 2019/03/07
- [Qemu-devel] [PATCH v4 05/22] target/arm: Suppress tag check for sp+offset, Richard Henderson, 2019/03/07
- [Qemu-devel] [PATCH v4 04/22] target/arm: Add helper_mte_check{1, 2}, Richard Henderson, 2019/03/07
- [Qemu-devel] [PATCH v4 09/22] target/arm: Implement the SUBP instruction, Richard Henderson, 2019/03/07
- [Qemu-devel] [PATCH v4 03/22] target/arm: Add MTE system registers, Richard Henderson, 2019/03/07
- [Qemu-devel] [PATCH v4 08/22] target/arm: Implement the GMI instruction, Richard Henderson, 2019/03/07
- [Qemu-devel] [PATCH v4 06/22] target/arm: Implement the IRG instruction, Richard Henderson, 2019/03/07
- [Qemu-devel] [PATCH v4 21/22] target/arm: Add allocation tag storage for system mode, Richard Henderson, 2019/03/07