[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/9] target/riscv: debug: Determine the trigger type from tda
|
From: |
Bin Meng |
|
Subject: |
Re: [PATCH 1/9] target/riscv: debug: Determine the trigger type from tdata1.type |
|
Date: |
Wed, 15 Jun 2022 13:33:02 +0800 |
On Fri, Jun 10, 2022 at 1:20 PM <frank.chang@sifive.com> wrote:
>
> From: Frank Chang <frank.chang@sifive.com>
>
> Current RISC-V debug assumes that only type 2 trigger is supported.
> To allow more types of triggers to be supported in the future
> (e.g. type 6 trigger, which is similar to type 2 trigger with additional
> functionality), we should determine the trigger type from tdata1.type.
>
> RV_MAX_TRIGGERS is also introduced in replacement of TRIGGER_TYPE2_NUM.
>
> Signed-off-by: Frank Chang <frank.chang@sifive.com>
> ---
> target/riscv/cpu.h | 2 +-
> target/riscv/csr.c | 2 +-
> target/riscv/debug.c | 183 ++++++++++++++++++++++++++++-------------
> target/riscv/debug.h | 15 ++--
> target/riscv/machine.c | 2 +-
> 5 files changed, 137 insertions(+), 67 deletions(-)
>
> diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
> index 7d6397acdf..535123a989 100644
> --- a/target/riscv/cpu.h
> +++ b/target/riscv/cpu.h
> @@ -289,7 +289,7 @@ struct CPUArchState {
>
> /* trigger module */
> target_ulong trigger_cur;
> - type2_trigger_t type2_trig[TRIGGER_TYPE2_NUM];
> + type2_trigger_t type2_trig[RV_MAX_TRIGGERS];
>
> /* machine specific rdtime callback */
> uint64_t (*rdtime_fn)(void *);
> diff --git a/target/riscv/csr.c b/target/riscv/csr.c
> index 6dbe9b541f..005ae31a01 100644
> --- a/target/riscv/csr.c
> +++ b/target/riscv/csr.c
> @@ -2776,7 +2776,7 @@ static RISCVException read_tdata(CPURISCVState *env,
> int csrno,
> target_ulong *val)
> {
> /* return 0 in tdata1 to end the trigger enumeration */
> - if (env->trigger_cur >= TRIGGER_NUM && csrno == CSR_TDATA1) {
> + if (env->trigger_cur >= RV_MAX_TRIGGERS && csrno == CSR_TDATA1) {
> *val = 0;
> return RISCV_EXCP_NONE;
> }
> diff --git a/target/riscv/debug.c b/target/riscv/debug.c
> index fc6e13222f..abbcd38a17 100644
> --- a/target/riscv/debug.c
> +++ b/target/riscv/debug.c
> @@ -52,8 +52,15 @@
> /* tdata availability of a trigger */
> typedef bool tdata_avail[TDATA_NUM];
>
> -static tdata_avail tdata_mapping[TRIGGER_NUM] = {
> - [TRIGGER_TYPE2_IDX_0 ... TRIGGER_TYPE2_IDX_1] = { true, true, false },
> +static tdata_avail tdata_mapping[TRIGGER_TYPE_NUM] = {
> + [TRIGGER_TYPE_NO_EXIST] = { false, false, false },
> + [TRIGGER_TYPE_AD_MATCH] = { true, true, true },
> + [TRIGGER_TYPE_INST_CNT] = { true, false, true },
> + [TRIGGER_TYPE_INT] = { true, true, true },
> + [TRIGGER_TYPE_EXCP] = { true, true, true },
> + [TRIGGER_TYPE_AD_MATCH6] = { true, true, true },
> + [TRIGGER_TYPE_EXT_SRC] = { true, false, false },
> + [TRIGGER_TYPE_UNAVAIL] = { true, true, true }
> };
>
> /* only breakpoint size 1/2/4/8 supported */
> @@ -67,6 +74,26 @@ static int access_size[SIZE_NUM] = {
> [6 ... 15] = -1,
> };
>
> +static inline target_ulong extract_trigger_type(CPURISCVState *env,
> + target_ulong tdata1)
> +{
> + switch (riscv_cpu_mxl(env)) {
> + case MXL_RV32:
> + return extract32(tdata1, 28, 4);
> + case MXL_RV64:
> + return extract64(tdata1, 60, 4);
> + default:
> + g_assert_not_reached();
> + }
> +}
> +
> +static inline target_ulong get_trigger_type(CPURISCVState *env,
> + target_ulong trigger_index)
> +{
> + target_ulong tdata1 = env->type2_trig[trigger_index].mcontrol;
> + return extract_trigger_type(env, tdata1);
> +}
> +
> static inline target_ulong trigger_type(CPURISCVState *env,
> trigger_type_t type)
> {
> @@ -89,15 +116,17 @@ static inline target_ulong trigger_type(CPURISCVState
> *env,
>
> bool tdata_available(CPURISCVState *env, int tdata_index)
> {
> + int trigger_type = get_trigger_type(env, env->trigger_cur);
> +
> if (unlikely(tdata_index >= TDATA_NUM)) {
> return false;
> }
>
> - if (unlikely(env->trigger_cur >= TRIGGER_NUM)) {
> + if (unlikely(env->trigger_cur >= RV_MAX_TRIGGERS)) {
> return false;
> }
>
> - return tdata_mapping[env->trigger_cur][tdata_index];
> + return tdata_mapping[trigger_type][tdata_index];
> }
>
> target_ulong tselect_csr_read(CPURISCVState *env)
> @@ -137,6 +166,7 @@ static target_ulong tdata1_validate(CPURISCVState *env,
> target_ulong val,
> qemu_log_mask(LOG_GUEST_ERROR,
> "ignoring type write to tdata1 register\n");
> }
> +
> if (dmode != 0) {
> qemu_log_mask(LOG_UNIMP, "debug mode is not supported\n");
> }
> @@ -261,9 +291,8 @@ static void type2_breakpoint_remove(CPURISCVState *env,
> target_ulong index)
> }
>
> static target_ulong type2_reg_read(CPURISCVState *env,
> - target_ulong trigger_index, int
> tdata_index)
> + target_ulong index, int tdata_index)
> {
> - uint32_t index = trigger_index - TRIGGER_TYPE2_IDX_0;
> target_ulong tdata;
>
> switch (tdata_index) {
> @@ -280,10 +309,9 @@ static target_ulong type2_reg_read(CPURISCVState *env,
> return tdata;
> }
>
> -static void type2_reg_write(CPURISCVState *env, target_ulong trigger_index,
> +static void type2_reg_write(CPURISCVState *env, target_ulong index,
> int tdata_index, target_ulong val)
> {
> - uint32_t index = trigger_index - TRIGGER_TYPE2_IDX_0;
> target_ulong new_val;
>
> switch (tdata_index) {
> @@ -309,35 +337,60 @@ static void type2_reg_write(CPURISCVState *env,
> target_ulong trigger_index,
> return;
> }
>
> -typedef target_ulong (*tdata_read_func)(CPURISCVState *env,
> - target_ulong trigger_index,
> - int tdata_index);
> -
> -static tdata_read_func trigger_read_funcs[TRIGGER_NUM] = {
> - [TRIGGER_TYPE2_IDX_0 ... TRIGGER_TYPE2_IDX_1] = type2_reg_read,
> -};
> -
> -typedef void (*tdata_write_func)(CPURISCVState *env,
> - target_ulong trigger_index,
> - int tdata_index,
> - target_ulong val);
> -
> -static tdata_write_func trigger_write_funcs[TRIGGER_NUM] = {
> - [TRIGGER_TYPE2_IDX_0 ... TRIGGER_TYPE2_IDX_1] = type2_reg_write,
> -};
> -
> target_ulong tdata_csr_read(CPURISCVState *env, int tdata_index)
> {
> - tdata_read_func read_func = trigger_read_funcs[env->trigger_cur];
> + int trigger_type = get_trigger_type(env, env->trigger_cur);
>
> - return read_func(env, env->trigger_cur, tdata_index);
> + switch (trigger_type) {
> + case TRIGGER_TYPE_AD_MATCH:
> + return type2_reg_read(env, env->trigger_cur, tdata_index);
> + break;
> + case TRIGGER_TYPE_INST_CNT:
> + case TRIGGER_TYPE_INT:
> + case TRIGGER_TYPE_EXCP:
> + case TRIGGER_TYPE_AD_MATCH6:
> + case TRIGGER_TYPE_EXT_SRC:
> + qemu_log_mask(LOG_UNIMP, "trigger type: %d is not supported\n",
> + trigger_type);
> + break;
> + case TRIGGER_TYPE_NO_EXIST:
> + case TRIGGER_TYPE_UNAVAIL:
> + break;
Should we log guest errors for these 2 types?
> + default:
> + g_assert_not_reached();
> + }
> +
> + return 0;
> }
>
> void tdata_csr_write(CPURISCVState *env, int tdata_index, target_ulong val)
> {
> - tdata_write_func write_func = trigger_write_funcs[env->trigger_cur];
> + int trigger_type;
> +
> + if (tdata_index == TDATA1) {
> + trigger_type = extract_trigger_type(env, val);
> + } else {
> + trigger_type = get_trigger_type(env, env->trigger_cur);
> + }
>
> - return write_func(env, env->trigger_cur, tdata_index, val);
> + switch (trigger_type) {
> + case TRIGGER_TYPE_AD_MATCH:
> + type2_reg_write(env, env->trigger_cur, tdata_index, val);
> + break;
> + case TRIGGER_TYPE_INST_CNT:
> + case TRIGGER_TYPE_INT:
> + case TRIGGER_TYPE_EXCP:
> + case TRIGGER_TYPE_AD_MATCH6:
> + case TRIGGER_TYPE_EXT_SRC:
> + qemu_log_mask(LOG_UNIMP, "trigger type: %d is not supported\n",
> + trigger_type);
> + break;
> + case TRIGGER_TYPE_NO_EXIST:
> + case TRIGGER_TYPE_UNAVAIL:
> + break;
> + default:
> + g_assert_not_reached();
> + }
> }
>
> void riscv_cpu_debug_excp_handler(CPUState *cs)
> @@ -364,18 +417,28 @@ bool riscv_cpu_debug_check_breakpoint(CPUState *cs)
> CPUBreakpoint *bp;
> target_ulong ctrl;
> target_ulong pc;
> + int trigger_type;
> int i;
>
> QTAILQ_FOREACH(bp, &cs->breakpoints, entry) {
> - for (i = 0; i < TRIGGER_TYPE2_NUM; i++) {
> - ctrl = env->type2_trig[i].mcontrol;
> - pc = env->type2_trig[i].maddress;
> -
> - if ((ctrl & TYPE2_EXEC) && (bp->pc == pc)) {
> - /* check U/S/M bit against current privilege level */
> - if ((ctrl >> 3) & BIT(env->priv)) {
> - return true;
> + for (i = 0; i < RV_MAX_TRIGGERS; i++) {
> + trigger_type = get_trigger_type(env, i);
> +
> + switch (trigger_type) {
> + case TRIGGER_TYPE_AD_MATCH:
> + ctrl = env->type2_trig[i].mcontrol;
> + pc = env->type2_trig[i].maddress;
> +
> + if ((ctrl & TYPE2_EXEC) && (bp->pc == pc)) {
> + /* check U/S/M bit against current privilege level */
> + if ((ctrl >> 3) & BIT(env->priv)) {
> + return true;
> + }
> }
> + break;
> + default:
> + /* other trigger types are not supported or irrelevant */
> + break;
> }
> }
> }
> @@ -389,26 +452,36 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs,
> CPUWatchpoint *wp)
> CPURISCVState *env = &cpu->env;
> target_ulong ctrl;
> target_ulong addr;
> + int trigger_type;
> int flags;
> int i;
>
> - for (i = 0; i < TRIGGER_TYPE2_NUM; i++) {
> - ctrl = env->type2_trig[i].mcontrol;
> - addr = env->type2_trig[i].maddress;
> - flags = 0;
> + for (i = 0; i < RV_MAX_TRIGGERS; i++) {
> + trigger_type = get_trigger_type(env, i);
>
> - if (ctrl & TYPE2_LOAD) {
> - flags |= BP_MEM_READ;
> - }
> - if (ctrl & TYPE2_STORE) {
> - flags |= BP_MEM_WRITE;
> - }
> + switch (trigger_type) {
> + case TRIGGER_TYPE_AD_MATCH:
> + ctrl = env->type2_trig[i].mcontrol;
> + addr = env->type2_trig[i].maddress;
> + flags = 0;
> +
> + if (ctrl & TYPE2_LOAD) {
> + flags |= BP_MEM_READ;
> + }
> + if (ctrl & TYPE2_STORE) {
> + flags |= BP_MEM_WRITE;
> + }
>
> - if ((wp->flags & flags) && (wp->vaddr == addr)) {
> - /* check U/S/M bit against current privilege level */
> - if ((ctrl >> 3) & BIT(env->priv)) {
> - return true;
> + if ((wp->flags & flags) && (wp->vaddr == addr)) {
> + /* check U/S/M bit against current privilege level */
> + if ((ctrl >> 3) & BIT(env->priv)) {
> + return true;
> + }
> }
> + break;
> + default:
> + /* other trigger types are not supported */
> + break;
> }
> }
>
> @@ -417,11 +490,11 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs,
> CPUWatchpoint *wp)
>
> void riscv_trigger_init(CPURISCVState *env)
> {
> - target_ulong type2 = trigger_type(env, TRIGGER_TYPE_AD_MATCH);
> + target_ulong tdata1 = trigger_type(env, TRIGGER_TYPE_AD_MATCH);
> int i;
>
> - /* type 2 triggers */
> - for (i = 0; i < TRIGGER_TYPE2_NUM; i++) {
> + /* init to type 2 triggers */
> + for (i = 0; i < RV_MAX_TRIGGERS; i++) {
> /*
> * type = TRIGGER_TYPE_AD_MATCH
> * dmode = 0 (both debug and M-mode can write tdata)
> @@ -435,7 +508,7 @@ void riscv_trigger_init(CPURISCVState *env)
> * chain = 0 (unimplemented, always 0)
> * match = 0 (always 0, when any compare value equals tdata2)
> */
> - env->type2_trig[i].mcontrol = type2;
> + env->type2_trig[i].mcontrol = tdata1;
> env->type2_trig[i].maddress = 0;
> env->type2_trig[i].bp = NULL;
> env->type2_trig[i].wp = NULL;
> diff --git a/target/riscv/debug.h b/target/riscv/debug.h
> index 27b9cac6b4..c422553c27 100644
> --- a/target/riscv/debug.h
> +++ b/target/riscv/debug.h
> @@ -22,13 +22,7 @@
> #ifndef RISCV_DEBUG_H
> #define RISCV_DEBUG_H
>
> -/* trigger indexes implemented */
> -enum {
> - TRIGGER_TYPE2_IDX_0 = 0,
> - TRIGGER_TYPE2_IDX_1,
> - TRIGGER_TYPE2_NUM,
> - TRIGGER_NUM = TRIGGER_TYPE2_NUM
> -};
> +#define RV_MAX_TRIGGERS 2
>
> /* register index of tdata CSRs */
> enum {
> @@ -46,7 +40,8 @@ typedef enum {
> TRIGGER_TYPE_EXCP = 5, /* exception trigger */
> TRIGGER_TYPE_AD_MATCH6 = 6, /* new address/data match trigger */
> TRIGGER_TYPE_EXT_SRC = 7, /* external source trigger */
> - TRIGGER_TYPE_UNAVAIL = 15 /* trigger exists, but unavailable */
> + TRIGGER_TYPE_UNAVAIL = 15, /* trigger exists, but unavailable */
> + TRIGGER_TYPE_NUM
> } trigger_type_t;
>
> typedef struct {
> @@ -56,14 +51,16 @@ typedef struct {
> struct CPUWatchpoint *wp;
> } type2_trigger_t;
>
> -/* tdata field masks */
> +/* tdata1 field masks */
>
> #define RV32_TYPE(t) ((uint32_t)(t) << 28)
> #define RV32_TYPE_MASK (0xf << 28)
> #define RV32_DMODE BIT(27)
> +#define RV32_DATA_MASK 0x7ffffff
> #define RV64_TYPE(t) ((uint64_t)(t) << 60)
> #define RV64_TYPE_MASK (0xfULL << 60)
> #define RV64_DMODE BIT_ULL(59)
> +#define RV64_DATA_MASK 0x7ffffffffffffff
>
> /* mcontrol field masks */
>
> diff --git a/target/riscv/machine.c b/target/riscv/machine.c
> index 2a437b29a1..54e523c26c 100644
> --- a/target/riscv/machine.c
> +++ b/target/riscv/machine.c
> @@ -246,7 +246,7 @@ static const VMStateDescription vmstate_debug = {
> .needed = debug_needed,
> .fields = (VMStateField[]) {
> VMSTATE_UINTTL(env.trigger_cur, RISCVCPU),
> - VMSTATE_STRUCT_ARRAY(env.type2_trig, RISCVCPU, TRIGGER_TYPE2_NUM,
> + VMSTATE_STRUCT_ARRAY(env.type2_trig, RISCVCPU, RV_MAX_TRIGGERS,
> 0, vmstate_debug_type2, type2_trigger_t),
> VMSTATE_END_OF_LIST()
> }
> --
Overall LGTM,
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
- [PATCH 0/9] Improve RISC-V Debug support, frank . chang, 2022/06/10
- [PATCH 4/9] target/riscv: debug: Restrict the range of tselect value can be written, frank . chang, 2022/06/10
- [PATCH 2/9] target/riscv: debug: Introduce build_tdata1() to build tdata1 register content, frank . chang, 2022/06/10
- [PATCH 1/9] target/riscv: debug: Determine the trigger type from tdata1.type, frank . chang, 2022/06/10
- [PATCH 8/9] target/riscv: debug: Return 0 if previous value written to tselect >= number of triggers, frank . chang, 2022/06/10
- [PATCH 3/9] target/riscv: debug: Introduce tdata1, tdata2, and tdata3 CSRs, frank . chang, 2022/06/10
- [PATCH 5/9] target/riscv: debug: Introduce tinfo CSR, frank . chang, 2022/06/10
- [PATCH 6/9] target/riscv: debug: Create common trigger actions function, frank . chang, 2022/06/10
- [PATCH 7/9] target/riscv: debug: Check VU/VS modes for type 2 trigger, frank . chang, 2022/06/10