Commit ef7bab8d authored by Peter Maydell's avatar Peter Maydell
Browse files

target-arm: Check watchpoints against CPU security state 



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: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
parent 9e1fc5bd

target-arm/op_helper.c

+4 −2
Original line number Diff line number Diff line
@@ -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) {