diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-13 13:50:31 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-13 13:50:31 +0100 |
commit | 0d9012eedbd4a47c621e5dc21cdbaeff8cb15796 (patch) | |
tree | 5d00e046015cc28efd0fc63fe5cd5d0a8ab8c465 | |
parent | 4dcee89483e3f249cb0968bcd6442c503c68a84c (diff) |
target-arm: Check watchpoints against CPU security statetransaction-attrs
Fix a TODO in bp_wp_matches() now that we have a function for
testing whether the CPU is currently in Secure mode or not.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
-rw-r--r-- | target-arm/op_helper.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 4a8c4e000d..3df9c57c91 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -600,8 +600,10 @@ static bool bp_wp_matches(ARMCPU *cpu, int n, bool is_wp) CPUARMState *env = &cpu->env; uint64_t cr; int pac, hmc, ssc, wt, lbn; - /* TODO: check against CPU security state when we implement TrustZone */ - bool is_secure = false; + /* Note that for watchpoints the check is against the CPU security + * state, not the S/NS attribute on the offending data access. + */ + bool is_secure = arm_is_secure(env); int access_el = arm_current_el(env); if (is_wp) { |