On Tue, Jul 11, 2023 at 10:16 PM Philippe Mathieu-Daudé <phi...@linaro.org> wrote: > > We want to extract TCG-specific code from debug.c, but some > functions call get_trigger_type() / do_trigger_action(). > Expose these prototypes in "debug.h". > > Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
Acked-by: Alistair Francis <alistair.fran...@wdc.com> Alistair > --- > target/riscv/debug.h | 4 ++++ > target/riscv/debug.c | 5 ++--- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/target/riscv/debug.h b/target/riscv/debug.h > index c471748d5a..65cd45b8f3 100644 > --- a/target/riscv/debug.h > +++ b/target/riscv/debug.h > @@ -147,4 +147,8 @@ void riscv_trigger_init(CPURISCVState *env); > > bool riscv_itrigger_enabled(CPURISCVState *env); > void riscv_itrigger_update_priv(CPURISCVState *env); > + > +target_ulong get_trigger_type(CPURISCVState *env, target_ulong > trigger_index); > +void do_trigger_action(CPURISCVState *env, target_ulong trigger_index); > + > #endif /* RISCV_DEBUG_H */ > diff --git a/target/riscv/debug.c b/target/riscv/debug.c > index 75ee1c4971..5676f2c57e 100644 > --- a/target/riscv/debug.c > +++ b/target/riscv/debug.c > @@ -88,8 +88,7 @@ static inline target_ulong > extract_trigger_type(CPURISCVState *env, > } > } > > -static inline target_ulong get_trigger_type(CPURISCVState *env, > - target_ulong trigger_index) > +target_ulong get_trigger_type(CPURISCVState *env, target_ulong trigger_index) > { > return extract_trigger_type(env, env->tdata1[trigger_index]); > } > @@ -217,7 +216,7 @@ static inline void warn_always_zero_bit(target_ulong val, > target_ulong mask, > } > } > > -static void do_trigger_action(CPURISCVState *env, target_ulong trigger_index) > +void do_trigger_action(CPURISCVState *env, target_ulong trigger_index) > { > trigger_action_t action = get_trigger_action(env, trigger_index); > > -- > 2.38.1 > >