From: Frank Chang <frank.ch...@sifive.com> The value of tselect CSR can be written should be limited within the range of supported triggers number.
Signed-off-by: Frank Chang <frank.ch...@sifive.com> --- target/riscv/debug.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/target/riscv/debug.c b/target/riscv/debug.c index 6913682f75..296192ffc4 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -126,10 +126,6 @@ bool tdata_available(CPURISCVState *env, int tdata_index) return false; } - if (unlikely(env->trigger_cur >= RV_MAX_TRIGGERS)) { - return false; - } - return tdata_mapping[trigger_type][tdata_index]; } @@ -140,8 +136,9 @@ target_ulong tselect_csr_read(CPURISCVState *env) void tselect_csr_write(CPURISCVState *env, target_ulong val) { - /* all target_ulong bits of tselect are implemented */ - env->trigger_cur = val; + if (val < RV_MAX_TRIGGERS) { + env->trigger_cur = val; + } } static target_ulong tdata1_validate(CPURISCVState *env, target_ulong val, -- 2.36.1