[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/17] target-arm: Check watchpoints against CPU secu
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 14/17] target-arm: Check watchpoints against CPU security state |
Date: |
Mon, 27 Apr 2015 16:20:42 +0100 |
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 <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
---
target-arm/op_helper.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index 4a8c4e0..3df9c57 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) {
--
1.9.1
- [Qemu-devel] [PULL 00/17] target-arm queue, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 17/17] Allow ARMv8 SCR.SMD updates, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 14/17] target-arm: Check watchpoints against CPU security state,
Peter Maydell <=
- [Qemu-devel] [PULL 16/17] target-arm: Adjust id_aa64pfr0 when has_el3 CPU property disabled, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 01/17] memory: Define API for MemoryRegionOps to take attrs and return status, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 15/17] target-arm: rename c1_coproc to cpacr_el1, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 12/17] target-arm: Add user-mode transaction attribute, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 13/17] target-arm: Use attribute info to handle user-only watchpoints, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 11/17] target-arm: Use correct memory attributes for page table walks, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 10/17] target-arm: Honour NS bits in page tables, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 05/17] exec.c: Convert subpage memory ops to _with_attrs, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 03/17] Make CPU iotlb a structure rather than a plain hwaddr, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 06/17] exec.c: Make address_space_rw take transaction attributes, Peter Maydell, 2015/04/27