riscv: add initial sdext support
v2 cover riscv: add initial sdext support
Hi,
Per Daniel's review feedback, this v2 series focuses only on the Sdext implementation in RISC-V QEMU.
It is based on RISC-V Debug Specification 1.0:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0
It introduces the sdext/sdtrig config bits, DCSR/DPC/DSCRATCH state, Debug Mode enter/leave helpers, DRET, EBREAK entry, single-step, and trigger action=debug mode.
To reduce review load, this series focuses on the Sdext features first. The Debug Module (DM) and related flows will follow in a later series.
Changes in v2:
- Drop the RHCT expected AML update from this series.
- Replace the split sdext/sdtrig config bits patch with deprecating the 'debug' CPU property.
- Rebase and update patch subjects to target/riscv prefix.
Changes in v1:
- Debug Mode entry/exit updates DCSR/DPC and restores execution via DRET.
- EBREAK honors DCSR ebreak bits and enters Debug Mode when enabled.
- Single-step uses DCSR.STEP with a TB flag and a helper at TB exit. It references Max Chou's patch "target/riscv: Use the tb->cs_bqse as the extend tb flags.":
https://lore.kernel.org/qemu-devel/[email protected]/
- Sdtrig supports action=debug mode for mcontrol/mcontrol6 and reports inst-count triggers in tinfo.
Differences vs Debug Spec (known gaps):
- No Debug Module (no DMI, dmcontrol/dmstatus, haltreq/resumereq).
- No debug ROM, program buffer, abstract commands, or SBA.
- Resume is modeled by leaving Debug Mode at cpu_exec_enter.
- Step/exception ordering is simplified: if the stepped instruction traps, the normal exception is taken and Debug Mode is not forced.
- Several DCSR fields are not fully modeled (stopcount/stoptime, etc).
Roadmap (next stage, DM focus):
1) Add a DM core with DMI access and hart state tracking.
2) Implement halt/resume handshake and move Debug Mode transitions under DM control.
3) Add debug ROM, program buffer, and abstract commands for GPR/CSR and memory access.
4) Add SBA if required by tooling.
5) Tighten ordering rules for step/exception/trigger priorities.
Thanks,
Chao
Chao Liu (6):
target/riscv: add sdext debug CSRs state target/riscv: add sdext Debug Mode helpers target/riscv: add dret instruction target/riscv: add sdext enter Debug Mode on ebreak target/riscv: add sdext single-step support target/riscv: add sdtrig trigger action=debug mode
Daniel Henrique Barboza (1):
target/riscv: deprecate 'debug' CPU property
docs/about/deprecated.rst | 7 + include/exec/translation-block.h | 4 +- target/riscv/cpu.c | 60 +++++++- target/riscv/cpu.h | 9 ++ target/riscv/cpu_bits.h | 33 +++++ target/riscv/cpu_cfg_fields.h.inc | 3 +- target/riscv/cpu_helper.c | 93 +++++++++++++ target/riscv/csr.c | 128 +++++++++++++++++- target/riscv/debug.c | 58 +++++++- target/riscv/helper.h | 3 + target/riscv/insn32.decode | 1 + .../riscv/insn_trans/trans_privileged.c.inc | 24 +++- target/riscv/machine.c | 44 ++++-- target/riscv/op_helper.c | 72 ++++++++++ target/riscv/tcg/tcg-cpu.c | 21 ++- target/riscv/translate.c | 15 +- 16 files changed, 547 insertions(+), 28 deletions(-)
Signature · 1 line
2.52.0
RFC PATCH v2 1/7 target/riscv: deprecate 'debug' CPU property
From: Daniel Henrique Barboza <[email protected]>
Starting on commit f31ba686a9 ("target/riscv/cpu.c: add 'sdtrig' in riscv,isa') the 'debug' flag has been used as an alias for 'sdtrig'.
We're going to add more debug trigger extensions, e.g. 'sdext' [1]. And all of a sudden the existence of this flag is now weird. Do we keep it as a 'sdtrig' only or do we add 'sdext'?
The solution proposed here is to deprecate it. The flag was introduced a long time ago as a way to encapsulate support for all debug related CSRs. Today we have specific debug trigger extensions and there's no more use for a generic 'debug' flag. Users should be encouraged to enable/disable extensions directly instead of using "made-up" flags that exists only in a QEMU context.
The following changes are made:
- 'ext_sdtrig' flag was added in cpu->cfg. 'debug' flag was removed from cpu->cfg;
- All occurrences of cpu->cfg.debug were replaced to 'ext_sdtrig';
- Two explicit getters and setters for the 'debug' property were added. The property will simply get/set ext_sdtrig;
- vmstate_debug was renamed to vmstate_sdtrig. We're aware that this will impact migration between QEMU 10.2 to newer versions, but we're still in a point where the migration break cost isn't big enough to justify adding migration compatibility scaffolding.
Finally, deprecated.rst was updated to deprecate 'debug' and encourage users to use 'ext_sdtrig' instead.
[1] https://lore.kernel.org/qemu-devel/[email protected]/
--- docs/about/deprecated.rst | 7 +++++ target/riscv/cpu.c | 51 ++++++++++++++++++++++++++++--- target/riscv/cpu_cfg_fields.h.inc | 2 +- target/riscv/csr.c | 2 +- target/riscv/machine.c | 24 +++++++-------- target/riscv/tcg/tcg-cpu.c | 2 +- 6 files changed, 69 insertions(+), 19 deletions(-)
docs/about/deprecated.rst +7 -0
@@ -478,6 +478,13 @@ It was implemented as a no-op instruction in TCG up to QEMU 9.0, but only with ``-cpu max`` (which does not guarantee migration compatibility across versions). +``debug=true|false`` on RISC-V CPUs (since 11.0) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This option, since QEMU 10.1, has been a simple alias to the ``sdtrig`` +extension. Users are advised to enable/disable ``sdtrig`` directly instead +of using ``debug``. + Backwards compatibility -----------------------
target/riscv/cpu.c +47 -4
88 lines not on this page · raw message
target/riscv/cpu_cfg_fields.h.inc +1 -1
@@ -46,6 +46,7 @@ BOOL_FIELD(ext_zilsd) BOOL_FIELD(ext_zimop) BOOL_FIELD(ext_zcmop) BOOL_FIELD(ext_ztso) +BOOL_FIELD(ext_sdtrig) BOOL_FIELD(ext_smstateen) BOOL_FIELD(ext_sstc) BOOL_FIELD(ext_smcdeleg)
@@ -159,7 +160,6 @@ BOOL_FIELD(ext_xmipslsp) BOOL_FIELD(mmu) BOOL_FIELD(pmp) -BOOL_FIELD(debug) BOOL_FIELD(misa_w) BOOL_FIELD(short_isa_string)
target/riscv/csr.c +1 -1
@@ -777,7 +777,7 @@ static RISCVException have_mseccfg(CPURISCVState *env, int csrno)static RISCVException debug (CPURISCVState *env,int csrno) { -if (riscv_cpu_cfg (env)->debug) { +if (riscv_cpu_cfg (env)->ext_sdtrig) {return RISCV_EXCP_NONE ; }
target/riscv/machine.c +12 -12
@@ -218,14 +218,14 @@ static const VMStateDescription vmstate_kvmtimer = { };#endif -static bool debug_needed (void *opaque) +static bool sdtrig_needed (void *opaque) {RISCVCPU *cpu = opaque; -return cpu->cfg.debug; +return cpu->cfg.ext_sdtrig; } -static int debug_post_load (void *opaque,int version_id) +static int sdtrig_post_load (void *opaque,int version_id) {RISCVCPU *cpu = opaque;CPURISCVState *env = &cpu->env;
@@ -237,12 +237,12 @@ static int debug_post_load(void *opaque, int version_id)return 0 ; } -static const VMStateDescription vmstate_debug = { - .name ="cpu/debug" , - .version_id =2 , - .minimum_version_id =2 , - .needed = debug_needed, - .post_load = debug_post_load, +static const VMStateDescription vmstate_sdtrig = { + .name ="cpu/sdtrig" , + .version_id =1 , + .minimum_version_id =1 , + .needed = sdtrig_needed, + .post_load = sdtrig_post_load, .fields = (const VMStateField []) {VMSTATE_UINTTL (env.trigger_cur,RISCVCPU ),VMSTATE_UINTTL_ARRAY (env.tdata1,RISCVCPU ,RV_MAX_TRIGGERS ),
@@ -425,8 +425,8 @@ static const VMStateDescription vmstate_sstc = {const VMStateDescription vmstate_riscv_cpu = { .name ="cpu" , - .version_id =11 , - .minimum_version_id =11 , + .version_id =12 , + .minimum_version_id =12 , .post_load = riscv_cpu_post_load, .fields = (const VMStateField []) {VMSTATE_UINTTL_ARRAY (env.gpr,RISCVCPU ,32 ),
@@ -492,13 +492,13 @@ const VMStateDescription vmstate_riscv_cpu = { &vmstate_kvmtimer, #endif &vmstate_envcfg, - &vmstate_debug, &vmstate_smstateen, &vmstate_jvt, &vmstate_elp, &vmstate_ssp, &vmstate_ctr, &vmstate_sstc, + &vmstate_sdtrig,NULL } };
target/riscv/tcg/tcg-cpu.c +1 -1
@@ -180,7 +180,7 @@ static TCGTBCPUState riscv_get_tb_cpu_state(CPUState *cs) ? EXT_STATUS_DIRTY : EXT_STATUS_DISABLED; } -if (cpu->cfg.debug && !icount_enabled ()) { +if (cpu->cfg.ext_sdtrig && !icount_enabled ()) { flags =FIELD_DP32 (flags,TB_FLAGS ,ITRIGGER , env->itrigger_enabled); }#endif
Signature · 1 line
2.52.0
RFC PATCH v2 2/7 target/riscv: add sdext debug CSRs state
In reply to Chao LiuRISC-V Debug Specification:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0
Add architectural state for Sdext Debug Mode: debug_mode, dcsr, dpc and dscratch0/1. Wire up CSR access for dcsr/dpc/dscratch and gate them to Debug Mode (or host debugger access).
--- target/riscv/cpu.c | 9 +++ target/riscv/cpu.h | 4 + target/riscv/cpu_bits.h | 33 ++++++++ target/riscv/cpu_cfg_fields.h.inc | 1 + target/riscv/csr.c | 126 ++++++++++++++++++++++++++++++ target/riscv/machine.c | 20 +++++ 6 files changed, 193 insertions(+)
target/riscv/cpu.c +9 -0
@@ -211,6 +211,7 @@ const RISCVIsaExtData isa_edata_arr[] = {ISA_EXT_DATA_ENTRY (zvkt,PRIV_VERSION_1_12_0 , ext_zvkt),ISA_EXT_DATA_ENTRY (zhinx,PRIV_VERSION_1_12_0 , ext_zhinx),ISA_EXT_DATA_ENTRY (zhinxmin,PRIV_VERSION_1_12_0 , ext_zhinxmin), +ISA_EXT_DATA_ENTRY (sdext,PRIV_VERSION_1_12_0 , ext_sdext),ISA_EXT_DATA_ENTRY (sdtrig,PRIV_VERSION_1_12_0 , ext_sdtrig),ISA_EXT_DATA_ENTRY (shcounterenw,PRIV_VERSION_1_12_0 , has_priv_1_12), ISA_EXT_DATA_ENTRY(sha, PRIV_VERSION_1_12_0, ext_sha),
@@ -788,6 +789,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type)set_ocp_fp8_same_canonical_nan (true, &env->fp_status);set_ocp_fp8e5m2_no_signal_nan (true, &env->fp_status); env->vill = true; + env->debug_mode = false; + env->dcsr =DCSR_DEBUGVER (4 ); + env->dpc =0 ; + env->dscratch[0 ] =0 ; + env->dscratch[1 ] =0 ;#ifndef CONFIG_USER_ONLY if (cpu->cfg.ext_sdtrig) {
@@ -1140,6 +1146,9 @@ static void riscv_cpu_init(Object *obj)*/ cpu->cfg.ext_sdtrig = true; +/* sdext is not fully implemented, so it is disabled by default. */ + cpu->cfg.ext_sdext = false; +if (mcc->def->profile) { mcc->def->profile->enabled = true; }
target/riscv/cpu.h +4 -0
@@ -476,6 +476,10 @@ struct CPUArchState {/* True if in debugger mode. */ bool debugger; +bool debug_mode; +target_ulong dcsr; +target_ulong dpc; +target_ulong dscratch[2 ];uint64_t mstateen[SMSTATEEN_MAX_COUNT ];uint64_t hstateen[SMSTATEEN_MAX_COUNT ];
target/riscv/cpu_bits.h +33 -0
@@ -467,6 +467,39 @@#define CSR_DCSR 0x7b0#define CSR_DPC 0x7b1#define CSR_DSCRATCH 0x7b2 +#define CSR_DSCRATCH1 0x7b3 + +/* DCSR fields */ +#define DCSR_XDEBUGVER_SHIFT 28 +#define DCSR_XDEBUGVER_MASK (0xfu << DCSR_XDEBUGVER_SHIFT) +#define DCSR_DEBUGVER (val) ((target_ulong)(val) << DCSR_XDEBUGVER_SHIFT) +#define DCSR_EXTCAUSE_SHIFT 24 +#define DCSR_EXTCAUSE_MASK (0x7u << DCSR_EXTCAUSE_SHIFT) +#define DCSR_CETRIG BIT(19) +#define DCSR_PELP BIT(18) +#define DCSR_EBREAKVS BIT(17) +#define DCSR_EBREAKVU BIT(16) +#define DCSR_EBREAKM BIT(15) +#define DCSR_EBREAKS BIT(13) +#define DCSR_EBREAKU BIT(12) +#define DCSR_STEPIE BIT(11) +#define DCSR_STOPCOUNT BIT(10) +#define DCSR_STOPTIME BIT(9) +#define DCSR_CAUSE_SHIFT 6 +#define DCSR_CAUSE_MASK (0x7u << DCSR_CAUSE_SHIFT) +#define DCSR_V BIT(5) +#define DCSR_MPRVEN BIT(4) +#define DCSR_NMIP BIT(3) +#define DCSR_STEP BIT(2) +#define DCSR_PRV_MASK 0x3u + +#define DCSR_CAUSE_EBREAK 1 +#define DCSR_CAUSE_TRIGGER 2 +#define DCSR_CAUSE_HALTREQ 3 +#define DCSR_CAUSE_STEP 4 +#define DCSR_CAUSE_RESET 5 +#define DCSR_CAUSE_GROUP 6 +#define DCSR_CAUSE_OTHER 7/* Performance Counters */ #define CSR_MHPMCOUNTER3 0xb03
target/riscv/cpu_cfg_fields.h.inc +1 -0
@@ -46,6 +46,7 @@ BOOL_FIELD(ext_zilsd) BOOL_FIELD(ext_zimop) BOOL_FIELD(ext_zcmop) BOOL_FIELD(ext_ztso) +BOOL_FIELD(ext_sdext) BOOL_FIELD(ext_sdtrig) BOOL_FIELD(ext_smstateen) BOOL_FIELD(ext_sstc)
target/riscv/csr.c +126 -0
138 lines not on this page · raw message
target/riscv/machine.c +20 -0
@@ -248,6 +248,25 @@ static const VMStateDescription vmstate_sdtrig = {VMSTATE_UINTTL_ARRAY (env.tdata1,RISCVCPU ,RV_MAX_TRIGGERS ),VMSTATE_UINTTL_ARRAY (env.tdata2,RISCVCPU ,RV_MAX_TRIGGERS ),VMSTATE_UINTTL_ARRAY (env.tdata3,RISCVCPU ,RV_MAX_TRIGGERS ), +VMSTATE_BOOL_V (env.debug_mode,RISCVCPU ,3 ), +VMSTATE_UINTTL_V (env.dcsr,RISCVCPU ,3 ), +VMSTATE_UINTTL_V (env.dpc,RISCVCPU ,3 ), +VMSTATE_UINTTL_ARRAY_V (env.dscratch,RISCVCPU ,2 ,3 ), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_sdext = { + .name ="cpu/sdext" , + .version_id =1 , + .minimum_version_id =1 , + .needed = sdtrig_needed, + .post_load = sdtrig_post_load, + .fields = (const VMStateField []) { +VMSTATE_BOOL_V (env.debug_mode,RISCVCPU ,3 ), +VMSTATE_UINTTL_V (env.dcsr,RISCVCPU ,3 ), +VMSTATE_UINTTL_V (env.dpc,RISCVCPU ,3 ), +VMSTATE_UINTTL_ARRAY_V (env.dscratch,RISCVCPU ,2 ,3 ),VMSTATE_END_OF_LIST () } };
@@ -499,6 +518,7 @@ const VMStateDescription vmstate_riscv_cpu = { &vmstate_ctr, &vmstate_sstc, &vmstate_sdtrig, + &vmstate_sdext, NULL } };
Signature · 1 line
2.52.0
Re: [RFC PATCH v2 2/7] target/riscv: add sdext debug CSRs state
Hi Chao,
I wasn't able to apply this patch. Applied all Max's series first, then tried to apply yours.
The conflict in target/riscv/cpu.c seems to indicate you're basing the patches on top of something that we don't have upstream:
diff a/target/riscv/cpu.c b/target/riscv/cpu.c (rejected hunks)
@@ -788,6 +789,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type)
set_ocp_fp8_same_canonical_nan(true, &env->fp_status);
set_ocp_fp8e5m2_no_signal_nan(true, &env->fp_status);
env->vill = true;
+ env->debug_mode = false;
+ env->dcsr = DCSR_DEBUGVER(4);
+ env->dpc = 0;
+ env->dscratch[0] = 0;
+ env->dscratch[1] = 0; #ifndef CONFIG_USER_ONLY
if (cpu->cfg.ext_sdtrig) {The 'set_ocp_fp8*' lines over here can't be find anywhere else in QEMU, so I suppose you're basing the patches on top of something else.
If you could base the patches on top of alistair/riscv-to-apply.next tree, plus Max's patches, that would be great.
Thanks,
Daniel
Quoted 304 lines · Chao Liu
RISC-V Debug Specification:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0Add architectural state for Sdext Debug Mode:
debug_mode, dcsr, dpc and dscratch0/1. Wire up CSR access for dcsr/dpc/dscratch and gate them to Debug Mode (or host debugger access).Signed-off-by Chao Liu <[email protected]>--- target/riscv/cpu.c | 9 +++ target/riscv/cpu.h | 4 + target/riscv/cpu_bits.h | 33 ++++++++ target/riscv/cpu_cfg_fields.h.inc | 1 + target/riscv/csr.c | 126 ++++++++++++++++++++++++++++++ target/riscv/machine.c | 20 +++++ 6 files changed, 193 insertions(+)target/riscv/cpu.c +9
-0@@ -211,6 +211,7 @@ const RISCVIsaExtData isa_edata_arr[] = {ISA_EXT_DATA_ENTRY (zvkt,PRIV_VERSION_1_12_0 , ext_zvkt),ISA_EXT_DATA_ENTRY (zhinx,PRIV_VERSION_1_12_0 , ext_zhinx),ISA_EXT_DATA_ENTRY (zhinxmin,PRIV_VERSION_1_12_0 , ext_zhinxmin), +ISA_EXT_DATA_ENTRY (sdext,PRIV_VERSION_1_12_0 , ext_sdext),ISA_EXT_DATA_ENTRY (sdtrig,PRIV_VERSION_1_12_0 , ext_sdtrig),ISA_EXT_DATA_ENTRY (shcounterenw,PRIV_VERSION_1_12_0 , has_priv_1_12), ISA_EXT_DATA_ENTRY(sha, PRIV_VERSION_1_12_0, ext_sha),@@ -788,6 +789,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type)set_ocp_fp8_same_canonical_nan (true, &env->fp_status);set_ocp_fp8e5m2_no_signal_nan (true, &env->fp_status); env->vill = true; + env->debug_mode = false; + env->dcsr =DCSR_DEBUGVER (4 ); + env->dpc =0 ; + env->dscratch[0 ] =0 ; + env->dscratch[1 ] =0 ;#ifndef CONFIG_USER_ONLY if (cpu->cfg.ext_sdtrig) {@@ -1140,6 +1146,9 @@ static void riscv_cpu_init(Object *obj)*/ cpu->cfg.ext_sdtrig = true; +/* sdext is not fully implemented, so it is disabled by default. */ + cpu->cfg.ext_sdext = false; +if (mcc->def->profile) { mcc->def->profile->enabled = true; }target/riscv/cpu.h +4
-0@@ -476,6 +476,10 @@ struct CPUArchState {/* True if in debugger mode. */ bool debugger; +bool debug_mode; +target_ulong dcsr; +target_ulong dpc; +target_ulong dscratch[2 ];uint64_t mstateen[SMSTATEEN_MAX_COUNT ];uint64_t hstateen[SMSTATEEN_MAX_COUNT ];target/riscv/cpu_bits.h +33
-0@@ -467,6 +467,39 @@#define CSR_DCSR 0x7b0#define CSR_DPC 0x7b1#define CSR_DSCRATCH 0x7b2 +#define CSR_DSCRATCH1 0x7b3 + +/* DCSR fields */ +#define DCSR_XDEBUGVER_SHIFT 28 +#define DCSR_XDEBUGVER_MASK (0xfu << DCSR_XDEBUGVER_SHIFT) +#define DCSR_DEBUGVER (val) ((target_ulong)(val) << DCSR_XDEBUGVER_SHIFT) +#define DCSR_EXTCAUSE_SHIFT 24 +#define DCSR_EXTCAUSE_MASK (0x7u << DCSR_EXTCAUSE_SHIFT) +#define DCSR_CETRIG BIT(19) +#define DCSR_PELP BIT(18) +#define DCSR_EBREAKVS BIT(17) +#define DCSR_EBREAKVU BIT(16) +#define DCSR_EBREAKM BIT(15) +#define DCSR_EBREAKS BIT(13) +#define DCSR_EBREAKU BIT(12) +#define DCSR_STEPIE BIT(11) +#define DCSR_STOPCOUNT BIT(10) +#define DCSR_STOPTIME BIT(9) +#define DCSR_CAUSE_SHIFT 6 +#define DCSR_CAUSE_MASK (0x7u << DCSR_CAUSE_SHIFT) +#define DCSR_V BIT(5) +#define DCSR_MPRVEN BIT(4) +#define DCSR_NMIP BIT(3) +#define DCSR_STEP BIT(2) +#define DCSR_PRV_MASK 0x3u + +#define DCSR_CAUSE_EBREAK 1 +#define DCSR_CAUSE_TRIGGER 2 +#define DCSR_CAUSE_HALTREQ 3 +#define DCSR_CAUSE_STEP 4 +#define DCSR_CAUSE_RESET 5 +#define DCSR_CAUSE_GROUP 6 +#define DCSR_CAUSE_OTHER 7/* Performance Counters */ #define CSR_MHPMCOUNTER3 0xb03target/riscv/cpu_cfg_fields.h.inc +1
-0@@ -46,6 +46,7 @@ BOOL_FIELD(ext_zilsd) BOOL_FIELD(ext_zimop) BOOL_FIELD(ext_zcmop) BOOL_FIELD(ext_ztso) +BOOL_FIELD(ext_sdext) BOOL_FIELD(ext_sdtrig) BOOL_FIELD(ext_smstateen) BOOL_FIELD(ext_sstc)target/riscv/csr.c +126
-0@@ -3136,6 +3136,126 @@ static RISCVException write_mtval(CPURISCVState *env, int csrno,return RISCV_EXCP_NONE ; } +#if !defined(CONFIG_USER_ONLY ) +static RISCVException sdext (CPURISCVState *env,int csrno) +{ +if (!riscv_cpu_cfg (env)->ext_sdext) { +return RISCV_EXCP_ILLEGAL_INST ; + } + +if (!env->debug_mode && !env->debugger) { +return RISCV_EXCP_ILLEGAL_INST ; + } + +return RISCV_EXCP_NONE ; +} + +static target_ulong dcsr_visible_mask (CPURISCVState *env) +{ +target_ulong mask = (target_ulong)-1 ; +RISCVCPU *cpu =env_archcpu (env); + +if (!riscv_has_ext (env,RVH )) { + mask &= ~(DCSR_EBREAKVS |DCSR_EBREAKVU |DCSR_V ); + } +if (!riscv_has_ext (env,RVS )) { + mask &= ~DCSR_EBREAKS ; + } +if (!riscv_has_ext (env,RVU )) { + mask &= ~DCSR_EBREAKU ; + } +if (!cpu->cfg.ext_zicfilp) { + mask &= ~DCSR_PELP ; + } +if (!cpu->cfg.ext_smdbltrp) { + mask &= ~DCSR_CETRIG ; + } + +return mask; +} + +static RISCVException read_dcsr (CPURISCVState *env,int csrno, +target_ulong *val) +{ + *val = env->dcsr &dcsr_visible_mask (env); +return RISCV_EXCP_NONE ; +} + +static target_ulong dcsr_writable_mask (CPURISCVState *env) +{ +target_ulong mask =DCSR_EBREAKM |DCSR_EBREAKS |DCSR_EBREAKU | +DCSR_STEPIE |DCSR_STOPCOUNT |DCSR_STOPTIME | +DCSR_STEP |DCSR_PRV_MASK ; +RISCVCPU *cpu =env_archcpu (env); + + mask |=DCSR_MPRVEN ; + +if (riscv_has_ext (env,RVH )) { + mask |=DCSR_EBREAKVS |DCSR_EBREAKVU |DCSR_V ; + } +if (riscv_has_ext (env,RVS )) { + mask |=DCSR_EBREAKS ; + } +if (riscv_has_ext (env,RVU )) { + mask |=DCSR_EBREAKU ; + } +if (cpu->cfg.ext_zicfilp) { + mask |=DCSR_PELP ; + } +if (cpu->cfg.ext_smdbltrp) { + mask |=DCSR_CETRIG ; + } + +return mask; +} + +static RISCVException write_dcsr (CPURISCVState *env,int csrno, +target_ulong val,uintptr_t ra) +{ +target_ulong mask =dcsr_writable_mask (env); +target_ulong new_val = env->dcsr; + + new_val &= ~mask; + new_val |= val & mask; + new_val &= ~DCSR_XDEBUGVER_MASK ; + new_val |=DCSR_DEBUGVER (4 ); + env->dcsr = new_val; +return RISCV_EXCP_NONE ; +} + +static RISCVException read_dpc (CPURISCVState *env,int csrno, +target_ulong *val) +{ + *val = env->dpc &get_xepc_mask (env); +return RISCV_EXCP_NONE ; +} + +static RISCVException write_dpc (CPURISCVState *env,int csrno, +target_ulong val,uintptr_t ra) +{ + env->dpc = val &get_xepc_mask (env); +return RISCV_EXCP_NONE ; +} + +static RISCVException read_dscratch (CPURISCVState *env,int csrno, +target_ulong *val) +{ +int index = (csrno ==CSR_DSCRATCH1 ) ?1 :0 ; + + *val = env->dscratch[index]; +return RISCV_EXCP_NONE ; +} + +static RISCVException write_dscratch (CPURISCVState *env,int csrno, +target_ulong val,uintptr_t ra) +{ +int index = (csrno ==CSR_DSCRATCH1 ) ?1 :0 ; + + env->dscratch[index] = val; +return RISCV_EXCP_NONE ; +} +#endif /* !CONFIG_USER_ONLY */ +/* Execution environment configuration setup */ static RISCVException read_menvcfg (CPURISCVState *env,int csrno,target_ulong *val)@@ -6297,6 +6417,12 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_TDATA3] = { "tdata3", debug, read_tdata, write_tdata }, [CSR_TINFO] = { "tinfo", debug, read_tinfo, write_ignore }, [CSR_MCONTEXT] = { "mcontext", debug, read_mcontext, write_mcontext }, +#if !defined(CONFIG_USER_ONLY) + [CSR_DCSR] = { "dcsr", sdext, read_dcsr, write_dcsr }, + [CSR_DPC] = { "dpc", sdext, read_dpc, write_dpc }, + [CSR_DSCRATCH] = { "dscratch0", sdext, read_dscratch, write_dscratch }, + [CSR_DSCRATCH1] = { "dscratch1", sdext, read_dscratch, write_dscratch }, +#endif [CSR_MCTRCTL] = { "mctrctl", ctr_mmode, NULL, NULL, rmw_xctrctl }, [CSR_SCTRCTL] = { "sctrctl", ctr_smode, NULL, NULL, rmw_xctrctl },target/riscv/machine.c +20
-0@@ -248,6 +248,25 @@ static const VMStateDescription vmstate_sdtrig = {VMSTATE_UINTTL_ARRAY (env.tdata1,RISCVCPU ,RV_MAX_TRIGGERS ),VMSTATE_UINTTL_ARRAY (env.tdata2,RISCVCPU ,RV_MAX_TRIGGERS ),VMSTATE_UINTTL_ARRAY (env.tdata3,RISCVCPU ,RV_MAX_TRIGGERS ), +VMSTATE_BOOL_V (env.debug_mode,RISCVCPU ,3 ), +VMSTATE_UINTTL_V (env.dcsr,RISCVCPU ,3 ), +VMSTATE_UINTTL_V (env.dpc,RISCVCPU ,3 ), +VMSTATE_UINTTL_ARRAY_V (env.dscratch,RISCVCPU ,2 ,3 ), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_sdext = { + .name ="cpu/sdext" , + .version_id =1 , + .minimum_version_id =1 , + .needed = sdtrig_needed, + .post_load = sdtrig_post_load, + .fields = (const VMStateField []) { +VMSTATE_BOOL_V (env.debug_mode,RISCVCPU ,3 ), +VMSTATE_UINTTL_V (env.dcsr,RISCVCPU ,3 ), +VMSTATE_UINTTL_V (env.dpc,RISCVCPU ,3 ), +VMSTATE_UINTTL_ARRAY_V (env.dscratch,RISCVCPU ,2 ,3 ),VMSTATE_END_OF_LIST () } };@@ -499,6 +518,7 @@ const VMStateDescription vmstate_riscv_cpu = { &vmstate_ctr, &vmstate_sstc, &vmstate_sdtrig, + &vmstate_sdext, NULL } };
Re: [RFC PATCH v2 2/7] target/riscv: add sdext debug CSRs state
Hi Daniel,
On 1/26/2026 8:47 PM, Daniel Henrique Barboza wrote:
Hi Chao,
I wasn't able to apply this patch. Applied all Max's series first, then tried to apply yours.
The conflict in target/riscv/cpu.c seems to indicate you're basing the patches on top of something that we don't have upstream:
diff a/target/riscv/cpu.c b/target/riscv/cpu.c (rejected hunks)
@@ -788,6 +789,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type)
set_ocp_fp8_same_canonical_nan(true, &env->fp_status);
set_ocp_fp8e5m2_no_signal_nan(true, &env->fp_status);
env->vill = true;
+ env->debug_mode = false;
+ env->dcsr = DCSR_DEBUGVER(4);
+ env->dpc = 0;
+ env->dscratch[0] = 0;
+ env->dscratch[1] = 0; #ifndef CONFIG_USER_ONLY
if (cpu->cfg.ext_sdtrig) {The 'set_ocp_fp8*' lines over here can't be find anywhere else in QEMU, so I suppose you're basing the patches on top of something else.
If you could base the patches on top of alistair/riscv-to-apply.next tree, plus Max's patches, that would be great.
This series is based on the master commit: 06a24591: "disas/riscv: Add support of Zvfofp4min extension".
Max's patches have been merged into the master branch. Thanks,
Chao
On 1/20/2026 5:23 AM, Chao Liu wrote:
RISC-V Debug Specification:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0
Add architectural state for Sdext Debug Mode: debug_mode, dcsr, dpc and dscratch0/1. Wire up CSR access for dcsr/dpc/dscratch and gate them to Debug Mode (or host debugger access).
--- target/riscv/cpu.c | 9 +++ target/riscv/cpu.h | 4 + target/riscv/cpu_bits.h | 33 ++++++++ target/riscv/cpu_cfg_fields.h.inc | 1 + target/riscv/csr.c | 126 ++++++++++++++++++++++++++++++ target/riscv/machine.c | 20 +++++ 6 files changed, 193 insertions(+)
target/riscv/cpu.c +1 -0
@@ -211,6 +211,7 @@ const RISCVIsaExtData isa_edata_arr[] = {ISA_EXT_DATA_ENTRY (zvkt,PRIV_VERSION_1_12_0 , ext_zvkt),ISA_EXT_DATA_ENTRY (zhinx,PRIV_VERSION_1_12_0 , ext_zhinx),ISA_EXT_DATA_ENTRY (zhinxmin,PRIV_VERSION_1_12_0 , ext_zhinxmin), +ISA_EXT_DATA_ENTRY (sdext,PRIV_VERSION_1_12_0 , ext_sdext),ISA_EXT_DATA_ENTRY (sdtrig,PRIV_VERSION_1_12_0 , ext_sdtrig),ISA_EXT_DATA_ENTRY (shcounterenw,PRIV_VERSION_1_12_0 , has_priv_1_12), ISA_EXT_DATA_ENTRY(sha, PRIV_VERSION_1_12_0, ext_sha),
@@ -788,6 +789,11 @@ static void riscv_cpu_reset_hold(Object *obj,
ResetType type)
set_ocp_fp8_same_canonical_nan(true, &env->fp_status);
set_ocp_fp8e5m2_no_signal_nan(true, &env->fp_status);
env->vill = true;
+ env->debug_mode = false;
+ env->dcsr = DCSR_DEBUGVER(4);
+ env->dpc = 0;
+ env->dscratch[0] = 0;
+ env->dscratch[1] = 0;
#ifndef CONFIG_USER_ONLY
if (cpu->cfg.ext_sdtrig) {
@@ -1140,6 +1146,9 @@ static void riscv_cpu_init(Object *obj)
*/
cpu->cfg.ext_sdtrig = true;
+ /* sdext is not fully implemented, so it is disabled by default. */
+ cpu->cfg.ext_sdext = false;
+
if (mcc->def->profile) {
mcc->def->profile->enabled = true;
}target/riscv/cpu.h +4 -0
@@ -476,6 +476,10 @@ struct CPUArchState {/* True if in debugger mode. */ bool debugger; +bool debug_mode; +target_ulong dcsr; +target_ulong dpc; +target_ulong dscratch[2 ];uint64_t mstateen[SMSTATEEN_MAX_COUNT ];uint64_t hstateen[SMSTATEEN_MAX_COUNT ];
target/riscv/cpu_bits.h +6 -0
@@ -467,6 +467,39 @@#define CSR_DCSR 0x7b0#define CSR_DPC 0x7b1#define CSR_DSCRATCH 0x7b2 +#define CSR_DSCRATCH1 0x7b3 + +/* DCSR fields */ +#define DCSR_XDEBUGVER_SHIFT 28 +#define DCSR_XDEBUGVER_MASK (0xfu << DCSR_XDEBUGVER_SHIFT) +#define DCSR_DEBUGVER (val) ((target_ulong)(val) <<
DCSR_XDEBUGVER_SHIFT)
+#define DCSR_EXTCAUSE_SHIFT 24
+#define DCSR_EXTCAUSE_MASK (0x7u << DCSR_EXTCAUSE_SHIFT)
+#define DCSR_CETRIG BIT(19)
+#define DCSR_PELP BIT(18)
+#define DCSR_EBREAKVS BIT(17)
+#define DCSR_EBREAKVU BIT(16)
+#define DCSR_EBREAKM BIT(15)
+#define DCSR_EBREAKS BIT(13)
+#define DCSR_EBREAKU BIT(12)
+#define DCSR_STEPIE BIT(11)
+#define DCSR_STOPCOUNT BIT(10)
+#define DCSR_STOPTIME BIT(9)
+#define DCSR_CAUSE_SHIFT 6
+#define DCSR_CAUSE_MASK (0x7u << DCSR_CAUSE_SHIFT)
+#define DCSR_V BIT(5)
+#define DCSR_MPRVEN BIT(4)
+#define DCSR_NMIP BIT(3)
+#define DCSR_STEP BIT(2)
+#define DCSR_PRV_MASK 0x3u
+
+#define DCSR_CAUSE_EBREAK 1
+#define DCSR_CAUSE_TRIGGER 2
+#define DCSR_CAUSE_HALTREQ 3
+#define DCSR_CAUSE_STEP 4
+#define DCSR_CAUSE_RESET 5
+#define DCSR_CAUSE_GROUP 6
+#define DCSR_CAUSE_OTHER 7
/* Performance Counters */ #define CSR_MHPMCOUNTER3 0xb03
(quoted diff) +0 -0
b/target/riscv/cpu_cfg_fields.h.inc
index a8c133d663..99b5529161 100644
target/riscv/cpu_cfg_fields.h.inc +1 -0
@@ -46,6 +46,7 @@ BOOL_FIELD(ext_zilsd) BOOL_FIELD(ext_zimop) BOOL_FIELD(ext_zcmop) BOOL_FIELD(ext_ztso) +BOOL_FIELD(ext_sdext) BOOL_FIELD(ext_sdtrig) BOOL_FIELD(ext_smstateen) BOOL_FIELD(ext_sstc)
target/riscv/csr.c +0 -0
@@ -3136,6 +3136,126 @@ static RISCVException write_mtval(CPURISCVState
*env, int csrno,
return RISCV_EXCP_NONE;
}
+#if !defined(CONFIG_USER_ONLY)
+static RISCVException sdext(CPURISCVState *env, int csrno) +{
+ if (!riscv_cpu_cfg(env)->ext_sdext) {
+ return RISCV_EXCP_ILLEGAL_INST;
+ }
+
+ if (!env->debug_mode && !env->debugger) {
+ return RISCV_EXCP_ILLEGAL_INST;
+ }
+
+ return RISCV_EXCP_NONE;
+}
+
+static target_ulong dcsr_visible_mask(CPURISCVState *env) +{
+ target_ulong mask = (target_ulong)-1;
+ RISCVCPU *cpu = env_archcpu(env);
+
+ if (!riscv_has_ext(env, RVH)) {
+ mask &= ~(DCSR_EBREAKVS | DCSR_EBREAKVU | DCSR_V);
+ }
+ if (!riscv_has_ext(env, RVS)) {
+ mask &= ~DCSR_EBREAKS;
+ }
+ if (!riscv_has_ext(env, RVU)) {
+ mask &= ~DCSR_EBREAKU;
+ }
+ if (!cpu->cfg.ext_zicfilp) {
+ mask &= ~DCSR_PELP;
+ }
+ if (!cpu->cfg.ext_smdbltrp) {
+ mask &= ~DCSR_CETRIG;
+ }
+
+ return mask;
+}
+
+static RISCVException read_dcsr(CPURISCVState *env, int csrno,
+ target_ulong *val)
+{
+ *val = env->dcsr & dcsr_visible_mask(env);
+ return RISCV_EXCP_NONE;
+}
+
+static target_ulong dcsr_writable_mask(CPURISCVState *env) +{
+ target_ulong mask = DCSR_EBREAKM | DCSR_EBREAKS | DCSR_EBREAKU |
+ DCSR_STEPIE | DCSR_STOPCOUNT | DCSR_STOPTIME |
+ DCSR_STEP | DCSR_PRV_MASK;
+ RISCVCPU *cpu = env_archcpu(env);
+
+ mask |= DCSR_MPRVEN;
+
+ if (riscv_has_ext(env, RVH)) {
+ mask |= DCSR_EBREAKVS | DCSR_EBREAKVU | DCSR_V;
+ }
+ if (riscv_has_ext(env, RVS)) {
+ mask |= DCSR_EBREAKS;
+ }
+ if (riscv_has_ext(env, RVU)) {
+ mask |= DCSR_EBREAKU;
+ }
+ if (cpu->cfg.ext_zicfilp) {
+ mask |= DCSR_PELP;
+ }
+ if (cpu->cfg.ext_smdbltrp) {
+ mask |= DCSR_CETRIG;
+ }
+
+ return mask;
+}
+
+static RISCVException write_dcsr(CPURISCVState *env, int csrno,
+ target_ulong val, uintptr_t ra)
+{
+ target_ulong mask = dcsr_writable_mask(env);
+ target_ulong new_val = env->dcsr;
+
+ new_val &= ~mask; + new_val |= val & mask; + new_val &= ~DCSR_XDEBUGVER_MASK; + new_val |= DCSR_DEBUGVER(4); + env->dcsr = new_val; + return RISCV_EXCP_NONE;
+}
+
+static RISCVException read_dpc(CPURISCVState *env, int csrno,
+ target_ulong *val)
+{
+ *val = env->dpc & get_xepc_mask(env);
+ return RISCV_EXCP_NONE;
+}
+
+static RISCVException write_dpc(CPURISCVState *env, int csrno,
+ target_ulong val, uintptr_t ra)
+{
+ env->dpc = val & get_xepc_mask(env);
+ return RISCV_EXCP_NONE;
+}
+
+static RISCVException read_dscratch(CPURISCVState *env, int csrno,
+ target_ulong *val)
+{
+ int index = (csrno == CSR_DSCRATCH1) ? 1 : 0;
+
+ *val = env->dscratch[index];
+ return RISCV_EXCP_NONE;
+}
+
+static RISCVException write_dscratch(CPURISCVState *env, int csrno,
+ target_ulong val, uintptr_t ra)
+{
+ int index = (csrno == CSR_DSCRATCH1) ? 1 : 0;
+
+ env->dscratch[index] = val;
+ return RISCV_EXCP_NONE;
+}
+#endif /* !CONFIG_USER_ONLY */
+
/* Execution environment configuration setup */
static RISCVException read_menvcfg(CPURISCVState *env, int csrno,
target_ulong *val)
@@ -6297,6 +6417,12 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = {
[CSR_TDATA3] = { "tdata3", debug, read_tdata, write_tdata
},
[CSR_TINFO] = { "tinfo", debug, read_tinfo, write_ignore
},
[CSR_MCONTEXT] = { "mcontext", debug, read_mcontext, write_mcontext
},
+#if !defined(CONFIG_USER_ONLY)
+ [CSR_DCSR] = { "dcsr", sdext, read_dcsr, write_dcsr },
+ [CSR_DPC] = { "dpc", sdext, read_dpc, write_dpc },
+ [CSR_DSCRATCH] = { "dscratch0", sdext, read_dscratch, write_dscratch},
+ [CSR_DSCRATCH1] = { "dscratch1", sdext, read_dscratch, write_dscratch
},
+#endif
[CSR_MCTRCTL] = { "mctrctl", ctr_mmode, NULL, NULL,rmw_xctrctl },
[CSR_SCTRCTL] = { "sctrctl", ctr_smode, NULL, NULL,rmw_xctrctl },
target/riscv/machine.c +20 -0
@@ -248,6 +248,25 @@ static const VMStateDescription vmstate_sdtrig = {VMSTATE_UINTTL_ARRAY (env.tdata1,RISCVCPU ,RV_MAX_TRIGGERS ),VMSTATE_UINTTL_ARRAY (env.tdata2,RISCVCPU ,RV_MAX_TRIGGERS ),VMSTATE_UINTTL_ARRAY (env.tdata3,RISCVCPU ,RV_MAX_TRIGGERS ), +VMSTATE_BOOL_V (env.debug_mode,RISCVCPU ,3 ), +VMSTATE_UINTTL_V (env.dcsr,RISCVCPU ,3 ), +VMSTATE_UINTTL_V (env.dpc,RISCVCPU ,3 ), +VMSTATE_UINTTL_ARRAY_V (env.dscratch,RISCVCPU ,2 ,3 ), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_sdext = { + .name ="cpu/sdext" , + .version_id =1 , + .minimum_version_id =1 , + .needed = sdtrig_needed, + .post_load = sdtrig_post_load, + .fields = (const VMStateField []) { +VMSTATE_BOOL_V (env.debug_mode,RISCVCPU ,3 ), +VMSTATE_UINTTL_V (env.dcsr,RISCVCPU ,3 ), +VMSTATE_UINTTL_V (env.dpc,RISCVCPU ,3 ), +VMSTATE_UINTTL_ARRAY_V (env.dscratch,RISCVCPU ,2 ,3 ),VMSTATE_END_OF_LIST () } };
@@ -499,6 +518,7 @@ const VMStateDescription vmstate_riscv_cpu = { &vmstate_ctr, &vmstate_sstc, &vmstate_sdtrig, + &vmstate_sdext, NULL } };
Re: [RFC PATCH v2 2/7] target/riscv: add sdext debug CSRs state
Quoted 28 lines · Chao Liu
__
Hi Daniel,
Quoted 22 lines · Daniel Henrique Barboza
Hi Chao,
I wasn't able to apply this patch. Applied all Max's series first, then tried to apply yours.
The conflict in
target/riscv/cpu.cseems to indicate you're basing the patches on top of something that we don't have upstream:diff
a/target/riscv/cpu.cb/target/riscv/cpu.c (rejected hunks)(quoted diff) +5
-0@@ -788,6 +789,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type) set_ocp_fp8_same_canonical_nan(true, &env->fp_status); set_ocp_fp8e5m2_no_signal_nan(true, &env->fp_status); env->vill = true; + env->debug_mode = false; + env->dcsr = DCSR_DEBUGVER(4); + env->dpc = 0; + env->dscratch[0] = 0; + env->dscratch[1] = 0; #ifndef CONFIG_USER_ONLYif (
cpu->cfg.ext_sdtrig) {
Quoted 6 lines
Quoted 4 lines
The 'set_ocp_fp8*' lines over here can't be find anywhere else in QEMU, so I suppose you're basing the patches on top of something else.
If you could base the patches on top of alistair/riscv-to-apply.next tree, plus Max's patches, that would be great.
This series is based on the master commit:
06a24591: "disas/riscv: Add support of Zvfofp4min extension". Max's patches have been merged into the master branch.
I'm afraid there's some confusion ...
$ git checkout master Already on 'master' Your branch is up to date with 'origin/master'. $ git pull Already up to date. $ git log --grep="Zvfofp4min" $
You can also check out here:
https://gitlab.com/qemu-project/qemu/-/commits/master?search=Zvfofp4min
There's no "Zvfofp4min" in QEMU master. In fact, if you're referring to these patches:
[PATCH 00/18] Add OCP FP8/FP4 and RISC-V Zvfofp8min/Zvfofp4min extension support
They're still under review. Thanks,
Daniel
Quoted 308 lines
Thanks,
ChaoQuoted 306 lines · Chao Liu
Quoted 302 lines
RISC-V Debug Specification:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0 <https:// github.com/riscv/riscv-debug-spec/releases/tag/1.0>Add architectural state for Sdext Debug Mode:
debug_mode, dcsr, dpc and dscratch0/1. Wire up CSR access for dcsr/dpc/dscratch and gate them to Debug Mode (or host debugger access).Signed-off-by Chao Liu <[email protected]> <mailto:[email protected]>---
target/riscv/cpu.c | 9 +++ target/riscv/cpu.h | 4 + target/riscv/cpu_bits.h | 33 ++++++++ target/riscv/cpu_cfg_fields.h.inc | 1 + target/riscv/csr.c | 126 ++++++++++++++++++++++++++++++ target/riscv/machine.c | 20 +++++6 files changed, 193 insertions(+)target/riscv/cpu.c +6
-0@@ -211,6 +211,7 @@ const RISCVIsaExtData isa_edata_arr[] = { ISA_EXT_DATA_ENTRY(zvkt, PRIV_VERSION_1_12_0, ext_zvkt), ISA_EXT_DATA_ENTRY(zhinx, PRIV_VERSION_1_12_0, ext_zhinx), ISA_EXT_DATA_ENTRY(zhinxmin, PRIV_VERSION_1_12_0, ext_zhinxmin), + ISA_EXT_DATA_ENTRY(sdext, PRIV_VERSION_1_12_0, ext_sdext), ISA_EXT_DATA_ENTRY(sdtrig, PRIV_VERSION_1_12_0, ext_sdtrig), ISA_EXT_DATA_ENTRY(shcounterenw, PRIV_VERSION_1_12_0, has_priv_1_12), ISA_EXT_DATA_ENTRY(sha, PRIV_VERSION_1_12_0, ext_sha),@@ -788,6 +789,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type) set_ocp_fp8_same_canonical_nan(true, &env->fp_status); set_ocp_fp8e5m2_no_signal_nan(true, &env->fp_status); env->vill = true; + env->debug_mode = false; + env->dcsr = DCSR_DEBUGVER(4); + env->dpc = 0; + env->dscratch[0] = 0; + env->dscratch[1] = 0; #ifndef CONFIG_USER_ONLY if (cpu->cfg.ext_sdtrig) {@@ -1140,6 +1146,9 @@ static void riscv_cpu_init(Object *obj)*/ cpu->cfg.ext_sdtrig = true;+ /* sdext is not fully implemented, so it is disabled by default. */ +
cpu->cfg.ext_sdext= false;
+
if (mcc->def->profile) {
mcc->def->profile->enabled= true;
}target/riscv/cpu.h +4
-0@@ -476,6 +476,10 @@ struct CPUArchState { /* True if in debugger mode. */ bool debugger; + bool debug_mode; + target_ulong dcsr; + target_ulong dpc; + target_ulong dscratch[2]; uint64_t mstateen[SMSTATEEN_MAX_COUNT]; uint64_t hstateen[SMSTATEEN_MAX_COUNT];target/riscv/cpu_bits.h +33
-0@@ -467,6 +467,39 @@ #define CSR_DCSR 0x7b0 #define CSR_DPC 0x7b1 #define CSR_DSCRATCH 0x7b2 +#define CSR_DSCRATCH1 0x7b3 + +/* DCSR fields */ +#define DCSR_XDEBUGVER_SHIFT 28 +#define DCSR_XDEBUGVER_MASK (0xfu << DCSR_XDEBUGVER_SHIFT) +#define DCSR_DEBUGVER (val) ((target_ulong)(val) << DCSR_XDEBUGVER_SHIFT) +#define DCSR_EXTCAUSE_SHIFT 24 +#define DCSR_EXTCAUSE_MASK (0x7u << DCSR_EXTCAUSE_SHIFT) +#define DCSR_CETRIG BIT(19) +#define DCSR_PELP BIT(18) +#define DCSR_EBREAKVS BIT(17) +#define DCSR_EBREAKVU BIT(16) +#define DCSR_EBREAKM BIT(15) +#define DCSR_EBREAKS BIT(13) +#define DCSR_EBREAKU BIT(12) +#define DCSR_STEPIE BIT(11) +#define DCSR_STOPCOUNT BIT(10) +#define DCSR_STOPTIME BIT(9) +#define DCSR_CAUSE_SHIFT 6 +#define DCSR_CAUSE_MASK (0x7u << DCSR_CAUSE_SHIFT) +#define DCSR_V BIT(5) +#define DCSR_MPRVEN BIT(4) +#define DCSR_NMIP BIT(3) +#define DCSR_STEP BIT(2) +#define DCSR_PRV_MASK 0x3u + +#define DCSR_CAUSE_EBREAK 1 +#define DCSR_CAUSE_TRIGGER 2 +#define DCSR_CAUSE_HALTREQ 3 +#define DCSR_CAUSE_STEP 4 +#define DCSR_CAUSE_RESET 5 +#define DCSR_CAUSE_GROUP 6 +#define DCSR_CAUSE_OTHER 7 /* Performance Counters */ #define CSR_MHPMCOUNTER3 0xb03target/riscv/cpu_cfg_fields.h.inc +1
-0@@ -46,6 +46,7 @@ BOOL_FIELD(ext_zilsd) BOOL_FIELD(ext_zimop) BOOL_FIELD(ext_zcmop) BOOL_FIELD(ext_ztso) +BOOL_FIELD(ext_sdext) BOOL_FIELD(ext_sdtrig) BOOL_FIELD(ext_smstateen) BOOL_FIELD(ext_sstc)target/riscv/csr.c +119
-0@@ -3136,6 +3136,126 @@ static RISCVException write_mtval(CPURISCVState *env, int csrno, return RISCV_EXCP_NONE; } +#if !defined(CONFIG_USER_ONLY) +static RISCVException sdext(CPURISCVState *env, int csrno) +{ + if (!riscv_cpu_cfg(env)->ext_sdext) { + return RISCV_EXCP_ILLEGAL_INST; + } + + if (!env->debug_mode && !env->debugger) { + return RISCV_EXCP_ILLEGAL_INST; + } + + return RISCV_EXCP_NONE; +} + +static target_ulong dcsr_visible_mask (CPURISCVState *env) +{ + target_ulong mask = (target_ulong)-1; + RISCVCPU *cpu = env_archcpu(env); + + if (!riscv_has_ext(env, RVH)) { + mask &= ~(DCSR_EBREAKVS | DCSR_EBREAKVU | DCSR_V); + } + if (!riscv_has_ext(env, RVS)) { + mask &= ~DCSR_EBREAKS; + } + if (!riscv_has_ext(env, RVU)) { + mask &= ~DCSR_EBREAKU; + } + if (!cpu->cfg.ext_zicfilp) { + mask &= ~DCSR_PELP; + } + if (!cpu->cfg.ext_smdbltrp) { + mask &= ~DCSR_CETRIG; + } + + return mask; +} + +static RISCVException read_dcsr (CPURISCVState *env,int csrno, + target_ulong *val) +{ + *val = env->dcsr & dcsr_visible_mask(env); + return RISCV_EXCP_NONE; +} + +static target_ulong dcsr_writable_mask (CPURISCVState *env) +{ + target_ulong mask = DCSR_EBREAKM | DCSR_EBREAKS | DCSR_EBREAKU | + DCSR_STEPIE | DCSR_STOPCOUNT | DCSR_STOPTIME | + DCSR_STEP | DCSR_PRV_MASK; + RISCVCPU *cpu = env_archcpu(env); + + mask |= DCSR_MPRVEN; + + if (riscv_has_ext(env, RVH)) { + mask |= DCSR_EBREAKVS | DCSR_EBREAKVU | DCSR_V; + } + if (riscv_has_ext(env, RVS)) { + mask |= DCSR_EBREAKS; + } + if (riscv_has_ext(env, RVU)) { + mask |= DCSR_EBREAKU; + } + if (cpu->cfg.ext_zicfilp) { + mask |= DCSR_PELP; + } + if (cpu->cfg.ext_smdbltrp) { + mask |= DCSR_CETRIG; + } + + return mask; +} + +static RISCVException write_dcsr (CPURISCVState *env,int csrno, + target_ulong val, uintptr_t ra) +{ + target_ulong mask = dcsr_writable_mask(env); + target_ulong new_val = env->dcsr; + + new_val &= ~mask; + new_val |= val & mask; + new_val &= ~DCSR_XDEBUGVER_MASK; + new_val |= DCSR_DEBUGVER(4); + env->dcsr = new_val; + return RISCV_EXCP_NONE; +} + +static RISCVException read_dpc (CPURISCVState *env,int csrno, + target_ulong *val) +{ + *val = env->dpc & get_xepc_mask(env); + return RISCV_EXCP_NONE; +} + +static RISCVException write_dpc (CPURISCVState *env,int csrno, + target_ulong val, uintptr_t ra) +{ + env->dpc = val & get_xepc_mask(env); + return RISCV_EXCP_NONE; +} + +static RISCVException read_dscratch (CPURISCVState *env,int csrno, + target_ulong *val) +{ + int index = (csrno == CSR_DSCRATCH1) ? 1 : 0; + + *val = env->dscratch[index]; + return RISCV_EXCP_NONE; +} + +static RISCVException write_dscratch (CPURISCVState *env,int csrno, + target_ulong val, uintptr_t ra) +{ + int index = (csrno == CSR_DSCRATCH1) ? 1 : 0; + + env->dscratch[index] = val; + return RISCV_EXCP_NONE; +} +#endif /* !CONFIG_USER_ONLY */ + /* Execution environment configuration setup */ static RISCVException read_menvcfg(CPURISCVState *env, int csrno,
target_ulong*val)target/riscv/csr.c +6
-0@@ -6297,6 +6417,12 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_TDATA3] = { "tdata3", debug, read_tdata, write_tdata }, [CSR_TINFO] = { "tinfo", debug, read_tinfo, write_ignore }, [CSR_MCONTEXT] = { "mcontext", debug, read_mcontext, write_mcontext }, +#if !defined(CONFIG_USER_ONLY) + [CSR_DCSR] = { "dcsr", sdext, read_dcsr, write_dcsr }, + [CSR_DPC] = { "dpc", sdext, read_dpc, write_dpc }, + [CSR_DSCRATCH] = { "dscratch0", sdext, read_dscratch, write_dscratch }, + [CSR_DSCRATCH1] = { "dscratch1", sdext, read_dscratch, write_dscratch }, +#endif [CSR_MCTRCTL] = { "mctrctl", ctr_mmode, NULL, NULL, rmw_xctrctl },[CSR_SCTRCTL] = { "sctrctl", ctr_smode, NULL, NULL, rmw_xctrctl },
target/riscv/machine.c +20
-0@@ -248,6 +248,25 @@ static const VMStateDescription vmstate_sdtrig = { VMSTATE_UINTTL_ARRAY(env.tdata1, RISCVCPU, RV_MAX_TRIGGERS), VMSTATE_UINTTL_ARRAY(env.tdata2, RISCVCPU, RV_MAX_TRIGGERS), VMSTATE_UINTTL_ARRAY(env.tdata3, RISCVCPU, RV_MAX_TRIGGERS), + VMSTATE_BOOL_V(env.debug_mode, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dcsr, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dpc, RISCVCPU, 3), + VMSTATE_UINTTL_ARRAY_V(env.dscratch, RISCVCPU, 2, 3), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_sdext = { + .name = "cpu/sdext", + .version_id = 1, + .minimum_version_id = 1, + .needed = sdtrig_needed, + .post_load = sdtrig_post_load, + .fields = (const VMStateField[]) { + VMSTATE_BOOL_V(env.debug_mode, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dcsr, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dpc, RISCVCPU, 3), + VMSTATE_UINTTL_ARRAY_V(env.dscratch, RISCVCPU, 2, 3), VMSTATE_END_OF_LIST() } };@@ -499,6 +518,7 @@ const VMStateDescription vmstate_riscv_cpu = { &vmstate_ctr, &vmstate_sstc, &vmstate_sdtrig, + &vmstate_sdext,NULL
}
};
Re: [RFC PATCH v2 2/7] target/riscv: add sdext debug CSRs state
Quoted 54 lines · Daniel Henrique Barboza
Quoted 27 lines · Chao Liu
__
Hi Daniel,
Quoted 21 lines · Daniel Henrique Barboza
Hi Chao,
I wasn't able to apply this patch. Applied all Max's series first, then tried to apply yours.
The conflict in
target/riscv/cpu.cseems to indicate you're basing the patches on top of something that we don't have upstream:diff
a/target/riscv/cpu.cb/target/riscv/cpu.c (rejected hunks)(quoted diff) +5
-0@@ -788,6 +789,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type) set_ocp_fp8_same_canonical_nan(true, &env->fp_status); set_ocp_fp8e5m2_no_signal_nan(true, &env->fp_status); env->vill = true; + env->debug_mode = false; + env->dcsr = DCSR_DEBUGVER(4); + env->dpc = 0; + env->dscratch[0] = 0; + env->dscratch[1] = 0; #ifndef CONFIG_USER_ONLY if (cpu->cfg.ext_sdtrig) {Quoted 6 lines
Quoted 4 lines
The 'set_ocp_fp8*' lines over here can't be find anywhere else in QEMU, so I suppose you're basing the patches on top of something else.
If you could base the patches on top of alistair/riscv-to-apply.next tree, plus Max's patches, that would be great.
This series is based on the master commit:
06a24591: "disas/riscv: Add support of Zvfofp4min extension". Max's patches have been merged into the master branch.I'm afraid there's some confusion ...
$ git checkout master Already on 'master' Your branch is up to date with 'origin/master'. $ git pull Already up to date. $ git log --grep="Zvfofp4min" $You can also check out here:
https://gitlab.com/qemu-project/qemu/-/commits/master?search=Zvfofp4min
Quoted 10 lines
There's no "Zvfofp4min" in QEMU master. In fact, if you're referring to these patches:
[PATCH 00/18] Add OCP FP8/FP4 and RISC-V Zvfofp8min/Zvfofp4min extension support
They're still under review. Thanks,
Daniel
Thanks to Daniel for pointing this out. I will rebase this series of sdext patches on the alistair/riscv-to-apply.next tree and Max’s patches for resubmission.
Thanks,
Chao
Quoted 304 lines
Quoted 303 lines
Thanks,
ChaoQuoted 301 lines · Chao Liu
Quoted 297 lines
RISC-V Debug Specification:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0 <https:// github.com/riscv/riscv-debug-spec/releases/tag/1.0>Add architectural state for Sdext Debug Mode:
debug_mode, dcsr, dpc and dscratch0/1. Wire up CSR access for dcsr/dpc/dscratch and gate them to Debug Mode (or host debugger access).Signed-off-by Chao Liu <[email protected]> <mailto:[email protected]>---
target/riscv/cpu.c | 9 +++ target/riscv/cpu.h | 4 + target/riscv/cpu_bits.h | 33 ++++++++ target/riscv/cpu_cfg_fields.h.inc | 1 + target/riscv/csr.c | 126 ++++++++++++++++++++++++++++++ target/riscv/machine.c | 20 +++++6 files changed, 193 insertions(+)target/riscv/cpu.c +6
-0@@ -211,6 +211,7 @@ const RISCVIsaExtData isa_edata_arr[] = { ISA_EXT_DATA_ENTRY(zvkt, PRIV_VERSION_1_12_0, ext_zvkt), ISA_EXT_DATA_ENTRY(zhinx, PRIV_VERSION_1_12_0, ext_zhinx), ISA_EXT_DATA_ENTRY(zhinxmin, PRIV_VERSION_1_12_0, ext_zhinxmin), + ISA_EXT_DATA_ENTRY(sdext, PRIV_VERSION_1_12_0, ext_sdext), ISA_EXT_DATA_ENTRY(sdtrig, PRIV_VERSION_1_12_0, ext_sdtrig), ISA_EXT_DATA_ENTRY(shcounterenw, PRIV_VERSION_1_12_0, has_priv_1_12), ISA_EXT_DATA_ENTRY(sha, PRIV_VERSION_1_12_0, ext_sha),@@ -788,6 +789,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type) set_ocp_fp8_same_canonical_nan(true, &env->fp_status); set_ocp_fp8e5m2_no_signal_nan(true, &env->fp_status); env->vill = true; + env->debug_mode = false; + env->dcsr = DCSR_DEBUGVER(4); + env->dpc = 0; + env->dscratch[0] = 0; + env->dscratch[1] = 0; #ifndef CONFIG_USER_ONLY if (cpu->cfg.ext_sdtrig) {@@ -1140,6 +1146,9 @@ static void riscv_cpu_init(Object *obj)*/ cpu->cfg.ext_sdtrig = true;+ /* sdext is not fully implemented, so it is disabled by default. */ +
cpu->cfg.ext_sdext= false;
+
if (mcc->def->profile) {
mcc->def->profile->enabled= true;
}target/riscv/cpu.h +4
-0@@ -476,6 +476,10 @@ struct CPUArchState { /* True if in debugger mode. */ bool debugger; + bool debug_mode; + target_ulong dcsr; + target_ulong dpc; + target_ulong dscratch[2]; uint64_t mstateen[SMSTATEEN_MAX_COUNT]; uint64_t hstateen[SMSTATEEN_MAX_COUNT];target/riscv/cpu_bits.h +33
-0@@ -467,6 +467,39 @@ #define CSR_DCSR 0x7b0 #define CSR_DPC 0x7b1 #define CSR_DSCRATCH 0x7b2 +#define CSR_DSCRATCH1 0x7b3 + +/* DCSR fields */ +#define DCSR_XDEBUGVER_SHIFT 28 +#define DCSR_XDEBUGVER_MASK (0xfu << DCSR_XDEBUGVER_SHIFT) +#define DCSR_DEBUGVER (val) ((target_ulong)(val) << DCSR_XDEBUGVER_SHIFT) +#define DCSR_EXTCAUSE_SHIFT 24 +#define DCSR_EXTCAUSE_MASK (0x7u << DCSR_EXTCAUSE_SHIFT) +#define DCSR_CETRIG BIT(19) +#define DCSR_PELP BIT(18) +#define DCSR_EBREAKVS BIT(17) +#define DCSR_EBREAKVU BIT(16) +#define DCSR_EBREAKM BIT(15) +#define DCSR_EBREAKS BIT(13) +#define DCSR_EBREAKU BIT(12) +#define DCSR_STEPIE BIT(11) +#define DCSR_STOPCOUNT BIT(10) +#define DCSR_STOPTIME BIT(9) +#define DCSR_CAUSE_SHIFT 6 +#define DCSR_CAUSE_MASK (0x7u << DCSR_CAUSE_SHIFT) +#define DCSR_V BIT(5) +#define DCSR_MPRVEN BIT(4) +#define DCSR_NMIP BIT(3) +#define DCSR_STEP BIT(2) +#define DCSR_PRV_MASK 0x3u + +#define DCSR_CAUSE_EBREAK 1 +#define DCSR_CAUSE_TRIGGER 2 +#define DCSR_CAUSE_HALTREQ 3 +#define DCSR_CAUSE_STEP 4 +#define DCSR_CAUSE_RESET 5 +#define DCSR_CAUSE_GROUP 6 +#define DCSR_CAUSE_OTHER 7 /* Performance Counters */ #define CSR_MHPMCOUNTER3 0xb03target/riscv/cpu_cfg_fields.h.inc +1
-0@@ -46,6 +46,7 @@ BOOL_FIELD(ext_zilsd) BOOL_FIELD(ext_zimop) BOOL_FIELD(ext_zcmop) BOOL_FIELD(ext_ztso) +BOOL_FIELD(ext_sdext) BOOL_FIELD(ext_sdtrig) BOOL_FIELD(ext_smstateen) BOOL_FIELD(ext_sstc)target/riscv/csr.c +125
-0@@ -3136,6 +3136,126 @@ static RISCVException write_mtval(CPURISCVState *env, int csrno, return RISCV_EXCP_NONE; } +#if !defined(CONFIG_USER_ONLY) +static RISCVException sdext (CPURISCVState *env,int csrno) +{ + if (!riscv_cpu_cfg(env)->ext_sdext) { + return RISCV_EXCP_ILLEGAL_INST; + } + + if (!env->debug_mode && !env->debugger) { + return RISCV_EXCP_ILLEGAL_INST; + } + + return RISCV_EXCP_NONE; +} + +static target_ulong dcsr_visible_mask (CPURISCVState *env) +{ + target_ulong mask = (target_ulong)-1; + RISCVCPU *cpu = env_archcpu(env); + + if (!riscv_has_ext(env, RVH)) { + mask &= ~(DCSR_EBREAKVS | DCSR_EBREAKVU | DCSR_V); + } + if (!riscv_has_ext(env, RVS)) { + mask &= ~DCSR_EBREAKS; + } + if (!riscv_has_ext(env, RVU)) { + mask &= ~DCSR_EBREAKU; + } + if (!cpu->cfg.ext_zicfilp) { + mask &= ~DCSR_PELP; + } + if (!cpu->cfg.ext_smdbltrp) { + mask &= ~DCSR_CETRIG; + } + + return mask; +} + +static RISCVException read_dcsr (CPURISCVState *env,int csrno, + target_ulong *val) +{ + *val = env->dcsr & dcsr_visible_mask(env); + return RISCV_EXCP_NONE; +} + +static target_ulong dcsr_writable_mask (CPURISCVState *env) +{ + target_ulong mask = DCSR_EBREAKM | DCSR_EBREAKS | DCSR_EBREAKU | + DCSR_STEPIE | DCSR_STOPCOUNT | DCSR_STOPTIME | + DCSR_STEP | DCSR_PRV_MASK; + RISCVCPU *cpu = env_archcpu(env); + + mask |= DCSR_MPRVEN; + + if (riscv_has_ext(env, RVH)) { + mask |= DCSR_EBREAKVS | DCSR_EBREAKVU | DCSR_V; + } + if (riscv_has_ext(env, RVS)) { + mask |= DCSR_EBREAKS; + } + if (riscv_has_ext(env, RVU)) { + mask |= DCSR_EBREAKU; + } + if (cpu->cfg.ext_zicfilp) { + mask |= DCSR_PELP; + } + if (cpu->cfg.ext_smdbltrp) { + mask |= DCSR_CETRIG; + } + + return mask; +} + +static RISCVException write_dcsr (CPURISCVState *env,int csrno, + target_ulong val, uintptr_t ra) +{ + target_ulong mask = dcsr_writable_mask(env); + target_ulong new_val = env->dcsr; + + new_val &= ~mask; + new_val |= val & mask; + new_val &= ~DCSR_XDEBUGVER_MASK; + new_val |= DCSR_DEBUGVER(4); + env->dcsr = new_val; + return RISCV_EXCP_NONE; +} + +static RISCVException read_dpc (CPURISCVState *env,int csrno, + target_ulong *val) +{ + *val = env->dpc & get_xepc_mask(env); + return RISCV_EXCP_NONE; +} + +static RISCVException write_dpc (CPURISCVState *env,int csrno, + target_ulong val, uintptr_t ra) +{ + env->dpc = val & get_xepc_mask(env); + return RISCV_EXCP_NONE; +} + +static RISCVException read_dscratch (CPURISCVState *env,int csrno, + target_ulong *val) +{ + int index = (csrno == CSR_DSCRATCH1) ? 1 : 0; + + *val = env->dscratch[index]; + return RISCV_EXCP_NONE; +} + +static RISCVException write_dscratch (CPURISCVState *env,int csrno, + target_ulong val, uintptr_t ra) +{ + int index = (csrno == CSR_DSCRATCH1) ? 1 : 0; + + env->dscratch[index] = val; + return RISCV_EXCP_NONE; +} +#endif /* !CONFIG_USER_ONLY */ + /* Execution environment configuration setup */ static RISCVException read_menvcfg(CPURISCVState *env, int csrno, target_ulong *val)@@ -6297,6 +6417,12 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_TDATA3] = { "tdata3", debug, read_tdata, write_tdata }, [CSR_TINFO] = { "tinfo", debug, read_tinfo, write_ignore }, [CSR_MCONTEXT] = { "mcontext", debug, read_mcontext, write_mcontext }, +#if !defined(CONFIG_USER_ONLY) + [CSR_DCSR] = { "dcsr", sdext, read_dcsr, write_dcsr }, + [CSR_DPC] = { "dpc", sdext, read_dpc, write_dpc }, + [CSR_DSCRATCH] = { "dscratch0", sdext, read_dscratch, write_dscratch }, + [CSR_DSCRATCH1] = { "dscratch1", sdext, read_dscratch, write_dscratch }, +#endif [CSR_MCTRCTL] = { "mctrctl", ctr_mmode, NULL, NULL, rmw_xctrctl }, [CSR_SCTRCTL] = { "sctrctl", ctr_smode, NULL, NULL, rmw_xctrctl },target/riscv/machine.c +20
-0@@ -248,6 +248,25 @@ static const VMStateDescription vmstate_sdtrig = { VMSTATE_UINTTL_ARRAY(env.tdata1, RISCVCPU, RV_MAX_TRIGGERS), VMSTATE_UINTTL_ARRAY(env.tdata2, RISCVCPU, RV_MAX_TRIGGERS), VMSTATE_UINTTL_ARRAY(env.tdata3, RISCVCPU, RV_MAX_TRIGGERS), + VMSTATE_BOOL_V(env.debug_mode, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dcsr, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dpc, RISCVCPU, 3), + VMSTATE_UINTTL_ARRAY_V(env.dscratch, RISCVCPU, 2, 3), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_sdext = { + .name = "cpu/sdext", + .version_id = 1, + .minimum_version_id = 1, + .needed = sdtrig_needed, + .post_load = sdtrig_post_load, + .fields = (const VMStateField[]) { + VMSTATE_BOOL_V(env.debug_mode, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dcsr, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dpc, RISCVCPU, 3), + VMSTATE_UINTTL_ARRAY_V(env.dscratch, RISCVCPU, 2, 3), VMSTATE_END_OF_LIST() } };@@ -499,6 +518,7 @@ const VMStateDescription vmstate_riscv_cpu = { &vmstate_ctr, &vmstate_sstc, &vmstate_sdtrig, + &vmstate_sdext,NULL
}
};
Re: [RFC PATCH v2 2/7] target/riscv: add sdext debug CSRs state
In reply to Daniel Henrique BarbozaQuoted 54 lines · Daniel Henrique Barboza
Quoted 27 lines · Chao Liu
__
Hi Daniel,
Quoted 21 lines · Daniel Henrique Barboza
Hi Chao,
I wasn't able to apply this patch. Applied all Max's series first, then tried to apply yours.
The conflict in
target/riscv/cpu.cseems to indicate you're basing the patches on top of something that we don't have upstream:diff
a/target/riscv/cpu.cb/target/riscv/cpu.c (rejected hunks)(quoted diff) +5
-0@@ -788,6 +789,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type) set_ocp_fp8_same_canonical_nan(true, &env->fp_status); set_ocp_fp8e5m2_no_signal_nan(true, &env->fp_status); env->vill = true; + env->debug_mode = false; + env->dcsr = DCSR_DEBUGVER(4); + env->dpc = 0; + env->dscratch[0] = 0; + env->dscratch[1] = 0; #ifndef CONFIG_USER_ONLY if (cpu->cfg.ext_sdtrig) {Quoted 6 lines
Quoted 4 lines
The 'set_ocp_fp8*' lines over here can't be find anywhere else in QEMU, so I suppose you're basing the patches on top of something else.
If you could base the patches on top of alistair/riscv-to-apply.next tree, plus Max's patches, that would be great.
This series is based on the master commit:
06a24591: "disas/riscv: Add support of Zvfofp4min extension". Max's patches have been merged into the master branch.I'm afraid there's some confusion ...
$ git checkout master Already on 'master' Your branch is up to date with 'origin/master'. $ git pull Already up to date. $ git log --grep="Zvfofp4min" $You can also check out here:
https://gitlab.com/qemu-project/qemu/-/commits/master?search=Zvfofp4min
Quoted 10 lines
There's no "Zvfofp4min" in QEMU master. In fact, if you're referring to these patches:
[PATCH 00/18] Add OCP FP8/FP4 and RISC-V Zvfofp8min/Zvfofp4min extension support
They're still under review. Thanks,
Daniel
Thanks to Daniel for pointing this out. I will rebase this series of sdext patches on the alistair/riscv-to-apply.next tree and Max's patches for resubmission.
Thanks,
Chao
Quoted 304 lines
Quoted 303 lines
Thanks,
ChaoQuoted 301 lines · Chao Liu
Quoted 297 lines
RISC-V Debug Specification:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0 <https:// github.com/riscv/riscv-debug-spec/releases/tag/1.0>Add architectural state for Sdext Debug Mode:
debug_mode, dcsr, dpc and dscratch0/1. Wire up CSR access for dcsr/dpc/dscratch and gate them to Debug Mode (or host debugger access).Signed-off-by Chao Liu <[email protected]> <mailto:[email protected]>---
target/riscv/cpu.c | 9 +++ target/riscv/cpu.h | 4 + target/riscv/cpu_bits.h | 33 ++++++++ target/riscv/cpu_cfg_fields.h.inc | 1 + target/riscv/csr.c | 126 ++++++++++++++++++++++++++++++ target/riscv/machine.c | 20 +++++6 files changed, 193 insertions(+)target/riscv/cpu.c +6
-0@@ -211,6 +211,7 @@ const RISCVIsaExtData isa_edata_arr[] = { ISA_EXT_DATA_ENTRY(zvkt, PRIV_VERSION_1_12_0, ext_zvkt), ISA_EXT_DATA_ENTRY(zhinx, PRIV_VERSION_1_12_0, ext_zhinx), ISA_EXT_DATA_ENTRY(zhinxmin, PRIV_VERSION_1_12_0, ext_zhinxmin), + ISA_EXT_DATA_ENTRY(sdext, PRIV_VERSION_1_12_0, ext_sdext), ISA_EXT_DATA_ENTRY(sdtrig, PRIV_VERSION_1_12_0, ext_sdtrig), ISA_EXT_DATA_ENTRY(shcounterenw, PRIV_VERSION_1_12_0, has_priv_1_12), ISA_EXT_DATA_ENTRY(sha, PRIV_VERSION_1_12_0, ext_sha),@@ -788,6 +789,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type) set_ocp_fp8_same_canonical_nan(true, &env->fp_status); set_ocp_fp8e5m2_no_signal_nan(true, &env->fp_status); env->vill = true; + env->debug_mode = false; + env->dcsr = DCSR_DEBUGVER(4); + env->dpc = 0; + env->dscratch[0] = 0; + env->dscratch[1] = 0; #ifndef CONFIG_USER_ONLY if (cpu->cfg.ext_sdtrig) {@@ -1140,6 +1146,9 @@ static void riscv_cpu_init(Object *obj)*/ cpu->cfg.ext_sdtrig = true;+ /* sdext is not fully implemented, so it is disabled by default. */ +
cpu->cfg.ext_sdext= false;
+
if (mcc->def->profile) {
mcc->def->profile->enabled= true;
}target/riscv/cpu.h +4
-0@@ -476,6 +476,10 @@ struct CPUArchState { /* True if in debugger mode. */ bool debugger; + bool debug_mode; + target_ulong dcsr; + target_ulong dpc; + target_ulong dscratch[2]; uint64_t mstateen[SMSTATEEN_MAX_COUNT]; uint64_t hstateen[SMSTATEEN_MAX_COUNT];target/riscv/cpu_bits.h +33
-0@@ -467,6 +467,39 @@ #define CSR_DCSR 0x7b0 #define CSR_DPC 0x7b1 #define CSR_DSCRATCH 0x7b2 +#define CSR_DSCRATCH1 0x7b3 + +/* DCSR fields */ +#define DCSR_XDEBUGVER_SHIFT 28 +#define DCSR_XDEBUGVER_MASK (0xfu << DCSR_XDEBUGVER_SHIFT) +#define DCSR_DEBUGVER (val) ((target_ulong)(val) << DCSR_XDEBUGVER_SHIFT) +#define DCSR_EXTCAUSE_SHIFT 24 +#define DCSR_EXTCAUSE_MASK (0x7u << DCSR_EXTCAUSE_SHIFT) +#define DCSR_CETRIG BIT(19) +#define DCSR_PELP BIT(18) +#define DCSR_EBREAKVS BIT(17) +#define DCSR_EBREAKVU BIT(16) +#define DCSR_EBREAKM BIT(15) +#define DCSR_EBREAKS BIT(13) +#define DCSR_EBREAKU BIT(12) +#define DCSR_STEPIE BIT(11) +#define DCSR_STOPCOUNT BIT(10) +#define DCSR_STOPTIME BIT(9) +#define DCSR_CAUSE_SHIFT 6 +#define DCSR_CAUSE_MASK (0x7u << DCSR_CAUSE_SHIFT) +#define DCSR_V BIT(5) +#define DCSR_MPRVEN BIT(4) +#define DCSR_NMIP BIT(3) +#define DCSR_STEP BIT(2) +#define DCSR_PRV_MASK 0x3u + +#define DCSR_CAUSE_EBREAK 1 +#define DCSR_CAUSE_TRIGGER 2 +#define DCSR_CAUSE_HALTREQ 3 +#define DCSR_CAUSE_STEP 4 +#define DCSR_CAUSE_RESET 5 +#define DCSR_CAUSE_GROUP 6 +#define DCSR_CAUSE_OTHER 7 /* Performance Counters */ #define CSR_MHPMCOUNTER3 0xb03target/riscv/cpu_cfg_fields.h.inc +1
-0@@ -46,6 +46,7 @@ BOOL_FIELD(ext_zilsd) BOOL_FIELD(ext_zimop) BOOL_FIELD(ext_zcmop) BOOL_FIELD(ext_ztso) +BOOL_FIELD(ext_sdext) BOOL_FIELD(ext_sdtrig) BOOL_FIELD(ext_smstateen) BOOL_FIELD(ext_sstc)target/riscv/csr.c +125
-0@@ -3136,6 +3136,126 @@ static RISCVException write_mtval(CPURISCVState *env, int csrno, return RISCV_EXCP_NONE; } +#if !defined(CONFIG_USER_ONLY) +static RISCVException sdext (CPURISCVState *env,int csrno) +{ + if (!riscv_cpu_cfg(env)->ext_sdext) { + return RISCV_EXCP_ILLEGAL_INST; + } + + if (!env->debug_mode && !env->debugger) { + return RISCV_EXCP_ILLEGAL_INST; + } + + return RISCV_EXCP_NONE; +} + +static target_ulong dcsr_visible_mask (CPURISCVState *env) +{ + target_ulong mask = (target_ulong)-1; + RISCVCPU *cpu = env_archcpu(env); + + if (!riscv_has_ext(env, RVH)) { + mask &= ~(DCSR_EBREAKVS | DCSR_EBREAKVU | DCSR_V); + } + if (!riscv_has_ext(env, RVS)) { + mask &= ~DCSR_EBREAKS; + } + if (!riscv_has_ext(env, RVU)) { + mask &= ~DCSR_EBREAKU; + } + if (!cpu->cfg.ext_zicfilp) { + mask &= ~DCSR_PELP; + } + if (!cpu->cfg.ext_smdbltrp) { + mask &= ~DCSR_CETRIG; + } + + return mask; +} + +static RISCVException read_dcsr (CPURISCVState *env,int csrno, + target_ulong *val) +{ + *val = env->dcsr & dcsr_visible_mask(env); + return RISCV_EXCP_NONE; +} + +static target_ulong dcsr_writable_mask (CPURISCVState *env) +{ + target_ulong mask = DCSR_EBREAKM | DCSR_EBREAKS | DCSR_EBREAKU | + DCSR_STEPIE | DCSR_STOPCOUNT | DCSR_STOPTIME | + DCSR_STEP | DCSR_PRV_MASK; + RISCVCPU *cpu = env_archcpu(env); + + mask |= DCSR_MPRVEN; + + if (riscv_has_ext(env, RVH)) { + mask |= DCSR_EBREAKVS | DCSR_EBREAKVU | DCSR_V; + } + if (riscv_has_ext(env, RVS)) { + mask |= DCSR_EBREAKS; + } + if (riscv_has_ext(env, RVU)) { + mask |= DCSR_EBREAKU; + } + if (cpu->cfg.ext_zicfilp) { + mask |= DCSR_PELP; + } + if (cpu->cfg.ext_smdbltrp) { + mask |= DCSR_CETRIG; + } + + return mask; +} + +static RISCVException write_dcsr (CPURISCVState *env,int csrno, + target_ulong val, uintptr_t ra) +{ + target_ulong mask = dcsr_writable_mask(env); + target_ulong new_val = env->dcsr; + + new_val &= ~mask; + new_val |= val & mask; + new_val &= ~DCSR_XDEBUGVER_MASK; + new_val |= DCSR_DEBUGVER(4); + env->dcsr = new_val; + return RISCV_EXCP_NONE; +} + +static RISCVException read_dpc (CPURISCVState *env,int csrno, + target_ulong *val) +{ + *val = env->dpc & get_xepc_mask(env); + return RISCV_EXCP_NONE; +} + +static RISCVException write_dpc (CPURISCVState *env,int csrno, + target_ulong val, uintptr_t ra) +{ + env->dpc = val & get_xepc_mask(env); + return RISCV_EXCP_NONE; +} + +static RISCVException read_dscratch (CPURISCVState *env,int csrno, + target_ulong *val) +{ + int index = (csrno == CSR_DSCRATCH1) ? 1 : 0; + + *val = env->dscratch[index]; + return RISCV_EXCP_NONE; +} + +static RISCVException write_dscratch (CPURISCVState *env,int csrno, + target_ulong val, uintptr_t ra) +{ + int index = (csrno == CSR_DSCRATCH1) ? 1 : 0; + + env->dscratch[index] = val; + return RISCV_EXCP_NONE; +} +#endif /* !CONFIG_USER_ONLY */ + /* Execution environment configuration setup */ static RISCVException read_menvcfg(CPURISCVState *env, int csrno, target_ulong *val)@@ -6297,6 +6417,12 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_TDATA3] = { "tdata3", debug, read_tdata, write_tdata }, [CSR_TINFO] = { "tinfo", debug, read_tinfo, write_ignore }, [CSR_MCONTEXT] = { "mcontext", debug, read_mcontext, write_mcontext }, +#if !defined(CONFIG_USER_ONLY) + [CSR_DCSR] = { "dcsr", sdext, read_dcsr, write_dcsr }, + [CSR_DPC] = { "dpc", sdext, read_dpc, write_dpc }, + [CSR_DSCRATCH] = { "dscratch0", sdext, read_dscratch, write_dscratch }, + [CSR_DSCRATCH1] = { "dscratch1", sdext, read_dscratch, write_dscratch }, +#endif [CSR_MCTRCTL] = { "mctrctl", ctr_mmode, NULL, NULL, rmw_xctrctl }, [CSR_SCTRCTL] = { "sctrctl", ctr_smode, NULL, NULL, rmw_xctrctl },target/riscv/machine.c +20
-0@@ -248,6 +248,25 @@ static const VMStateDescription vmstate_sdtrig = { VMSTATE_UINTTL_ARRAY(env.tdata1, RISCVCPU, RV_MAX_TRIGGERS), VMSTATE_UINTTL_ARRAY(env.tdata2, RISCVCPU, RV_MAX_TRIGGERS), VMSTATE_UINTTL_ARRAY(env.tdata3, RISCVCPU, RV_MAX_TRIGGERS), + VMSTATE_BOOL_V(env.debug_mode, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dcsr, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dpc, RISCVCPU, 3), + VMSTATE_UINTTL_ARRAY_V(env.dscratch, RISCVCPU, 2, 3), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_sdext = { + .name = "cpu/sdext", + .version_id = 1, + .minimum_version_id = 1, + .needed = sdtrig_needed, + .post_load = sdtrig_post_load, + .fields = (const VMStateField[]) { + VMSTATE_BOOL_V(env.debug_mode, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dcsr, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dpc, RISCVCPU, 3), + VMSTATE_UINTTL_ARRAY_V(env.dscratch, RISCVCPU, 2, 3), VMSTATE_END_OF_LIST() } };@@ -499,6 +518,7 @@ const VMStateDescription vmstate_riscv_cpu = { &vmstate_ctr, &vmstate_sstc, &vmstate_sdtrig, + &vmstate_sdext,NULL
}
};
RFC PATCH v2 3/7 target/riscv: add sdext Debug Mode helpers
In reply to Chao LiuRISC-V Debug Specification:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0
Add helpers to enter/leave Debug Mode and to update dpc/dcsr. Model resume without a Debug Module by leaving Debug Mode at cpu_exec_enter and continuing from dpc.
--- target/riscv/cpu.h | 3 ++ target/riscv/cpu_helper.c | 87 ++++++++++++++++++++++++++++++++++++++ target/riscv/debug.c | 5 +++ target/riscv/tcg/tcg-cpu.c | 14 ++++++ 4 files changed, 109 insertions(+)
target/riscv/cpu.h +3 -0
@@ -624,6 +624,9 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,char *riscv_isa_string (RISCVCPU *cpu);int riscv_cpu_max_xlen (RISCVCPUClass *mcc);bool riscv_cpu_option_set (const char *optname); +void riscv_cpu_enter_debug_mode (CPURISCVState *env,target_ulong pc, +uint32_t cause); +void riscv_cpu_leave_debug_mode (CPURISCVState *env);#ifndef CONFIG_USER_ONLY void riscv_cpu_do_interrupt (CPUState *cpu);
target/riscv/cpu_helper.c +87 -0
93 lines not on this page · raw message
target/riscv/debug.c +5 -0
@@ -927,6 +927,11 @@ void riscv_cpu_debug_excp_handler(CPUState *cs)RISCVCPU *cpu =RISCV_CPU (cs);CPURISCVState *env = &cpu->env; +/* Triggers must not match or fire while in Debug Mode. */ +if (env->debug_mode) { +return ; + } +if (cs->watchpoint_hit) {if (cs->watchpoint_hit->flags &BP_CPU ) {do_trigger_action (env,DBG_ACTION_BP );
target/riscv/tcg/tcg-cpu.c +14 -0
@@ -266,6 +266,19 @@ static vaddr riscv_pointer_wrap(CPUState *cs, int mmu_idx, }return extract64 (result,0 ,64 - pm_len); } + +static void riscv_cpu_exec_enter (CPUState *cs) +{ +RISCVCPU *cpu =RISCV_CPU (cs); +CPURISCVState *env = &cpu->env; + +if (!cpu->cfg.ext_sdext || !env->debug_mode) { +return ; + } +target_ulong pc = env->dpc; +riscv_cpu_leave_debug_mode (env); + env->pc = pc; +}#endif const TCGCPUOps riscv_tcg_ops = {
@@ -282,6 +295,7 @@ const TCGCPUOps riscv_tcg_ops = {#ifndef CONFIG_USER_ONLY .tlb_fill = riscv_cpu_tlb_fill, .pointer_wrap = riscv_pointer_wrap, + .cpu_exec_enter = riscv_cpu_exec_enter, .cpu_exec_interrupt = riscv_cpu_exec_interrupt, .cpu_exec_halt = riscv_cpu_has_work, .cpu_exec_reset = cpu_reset,
Signature · 1 line
2.52.0
RFC PATCH v2 4/7 target/riscv: add dret instruction
In reply to Chao LiuRISC-V Debug Specification:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0
Add DRET decode/translate and a helper to leave Debug Mode and return to dpc. Executing DRET outside Debug Mode raises illegal instruction.
--- target/riscv/helper.h | 1 + target/riscv/insn32.decode | 1 + target/riscv/insn_trans/trans_privileged.c.inc | 18 ++++++++++++++++++ target/riscv/op_helper.c | 16 ++++++++++++++++ 4 files changed, 36 insertions(+)
target/riscv/helper.h +1 -0
@@ -131,6 +131,7 @@ DEF_HELPER_6(csrrw_i128, tl, env, int, tl, tl, tl, tl)#ifndef CONFIG_USER_ONLY DEF_HELPER_1(sret, tl, env) DEF_HELPER_1(mret, tl, env) +DEF_HELPER_1(dret, tl, env) DEF_HELPER_1(mnret, tl, env) DEF_HELPER_1(ctr_clear, void, env)DEF_HELPER_1 (wfi, void, env)
target/riscv/insn32.decode +1 -0
@@ -118,6 +118,7 @@ sctrclr 000100000100 00000 000 00000 1110011 uret 0000000 00010 00000 000 00000 1110011 sret 0001000 00010 00000 000 00000 1110011 mret 0011000 00010 00000 000 00000 1110011 +dret 0111101 10010 00000 000 00000 1110011 wfi 0001000 00101 00000 000 00000 1110011 sfence_vma 0001001 ..... ..... 000 00000 1110011 @sfence_vma
target/riscv/insn_trans/trans_privileged.c.inc +18 -0
@@ -125,6 +125,24 @@ static bool trans_mret(DisasContext *ctx, arg_mret *a) #endif } +static bool trans_dret(DisasContext *ctx, arg_dret *a) +{ +#ifndef CONFIG_USER_ONLY + if (!ctx->cfg_ptr->ext_sdext) { + return false; + } + decode_save_opc(ctx, 0); + translator_io_start(&ctx->base); + gen_update_pc(ctx, 0); + gen_helper_dret(cpu_pc, tcg_env); + exit_tb(ctx); /* no chaining */ + ctx->base.is_jmp = DISAS_NORETURN; + return true; +#else + return false; +#endif +} + static bool trans_mnret(DisasContext *ctx, arg_mnret *a) { #ifndef CONFIG_USER_ONLY
target/riscv/op_helper.c +16 -0
@@ -454,6 +454,22 @@ target_ulong helper_mret(CPURISCVState *env)return retpc; } +target_ulong helper_dret (CPURISCVState *env) +{ +uintptr_t ra =GETPC (); +#ifdef CONFIG_USER_ONLY +riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST , ra); +return 0 ; +#else +if (!riscv_cpu_cfg (env)->ext_sdext || !env->debug_mode) { +riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST , ra); + } +target_ulong retpc = env->dpc &get_xepc_mask (env); +riscv_cpu_leave_debug_mode (env); +return retpc; +#endif +} +target_ulong helper_mnret (CPURISCVState *env) {target_ulong retpc = env->mnepc;
Signature · 1 line
2.52.0
RFC PATCH v2 5/7 target/riscv: add sdext enter Debug Mode on ebreak
In reply to Chao LiuRISC-V Debug Specification:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0
Route EBREAK via helper_sdext_ebreak. If Sdext is enabled and the matching dcsr.ebreak* bit is set, enter Debug Mode with cause=ebreak and stop with EXCP_DEBUG. Otherwise keep the normal breakpoint trap.
--- target/riscv/helper.h | 1 + .../riscv/insn_trans/trans_privileged.c.inc | 6 ++-- target/riscv/op_helper.c | 36 +++++++++++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-)
target/riscv/helper.h +1 -0
@@ -141,6 +141,7 @@ DEF_HELPER_1(tlb_flush_all, void, env)DEF_HELPER_4 (ctr_add_entry, void, env, tl, tl, tl) /* Native Debug */ DEF_HELPER_1(itrigger_match, void, env) +DEF_HELPER_2(sdext_ebreak, void, env, tl)#endif /* Hypervisor functions */
target/riscv/insn_trans/trans_privileged.c.inc +3 -3
@@ -68,9 +68,9 @@ static bool trans_ebreak(DisasContext *ctx, arg_ebreak *a) if (pre == 0x01f01013 && ebreak == 0x00100073 && post == 0x40705013) { generate_exception(ctx, RISCV_EXCP_SEMIHOST); } else { - tcg_gen_st_tl(tcg_constant_tl(ebreak_addr), tcg_env, - offsetof(CPURISCVState, badaddr)); - generate_exception(ctx, RISCV_EXCP_BREAKPOINT); + gen_update_pc(ctx, 0); + gen_helper_sdext_ebreak(tcg_env, tcg_constant_tl(ebreak_addr)); + ctx->base.is_jmp = DISAS_NORETURN; } return true; }
target/riscv/op_helper.c +36 -0
@@ -470,6 +470,42 @@ target_ulong helper_dret(CPURISCVState *env)#endif } +void helper_sdext_ebreak (CPURISCVState *env,target_ulong pc) +{ +#ifndef CONFIG_USER_ONLY +CPUState *cs =env_cpu (env); +bool enter_debug = false; + +if (riscv_cpu_cfg (env)->ext_sdext && !env->debug_mode) { +if (env->virt_enabled) { +if (env->priv ==PRV_S ) { + enter_debug = env->dcsr &DCSR_EBREAKVS ; + }else if (env->priv ==PRV_U ) { + enter_debug = env->dcsr &DCSR_EBREAKVU ; + } + }else { +if (env->priv ==PRV_M ) { + enter_debug = env->dcsr &DCSR_EBREAKM ; + }else if (env->priv ==PRV_S ) { + enter_debug = env->dcsr &DCSR_EBREAKS ; + }else if (env->priv ==PRV_U ) { + enter_debug = env->dcsr &DCSR_EBREAKU ; + } + } + } + + env->badaddr = pc; + +if (enter_debug) { +riscv_cpu_enter_debug_mode (env, pc,DCSR_CAUSE_EBREAK ); + cs->exception_index =EXCP_DEBUG ; +cpu_loop_exit_restore (cs,GETPC ()); + } + +riscv_raise_exception (env,RISCV_EXCP_BREAKPOINT ,GETPC ()); +#endif +} +target_ulong helper_mnret (CPURISCVState *env) {target_ulong retpc = env->mnepc;
Signature · 1 line
2.52.0
RFC PATCH v2 6/7 target/riscv: add sdext single-step support
In reply to Chao LiuRISC-V Debug Specification:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0
Use a TB flag when dcsr.step is set (and we are not in Debug Mode). When the flag is on, build 1-insn TBs and do not chain to the next TB. Add a TB-exit helper that enters Debug Mode with cause=step and sets dpc to the next pc, then stops with EXCP_DEBUG.
If dcsr.stepie is 0, do not take interrupts while stepping. Treat WFI as a nop so the hart does not sleep during a step.
PS: This patch references Max Chou's handling of ext_tb_flags.
https://lore.kernel.org/qemu-devel/[email protected]/
--- include/exec/translation-block.h | 4 ++-- target/riscv/cpu.h | 2 ++ target/riscv/cpu_helper.c | 6 ++++++ target/riscv/helper.h | 1 + target/riscv/op_helper.c | 20 ++++++++++++++++++++ target/riscv/tcg/tcg-cpu.c | 5 +++++ target/riscv/translate.c | 15 +++++++++++++-- 7 files changed, 49 insertions(+), 4 deletions(-)
include/exec/translation-block.h +2 -2
@@ -64,8 +64,8 @@ struct TranslationBlock {* x86: the original user, the Code Segment virtual base, * arm: an extension of tb->flags, * s390x: instruction data for EXECUTE, -* sparc: the next pc of the instruction queue (for delay slots). -* riscv: an extension of tb->flags, +* sparc: the next pc of the instruction queue (for delay slots), +* riscv: an extension of tb->flags. */ uint64_t cs_base;
target/riscv/cpu.h +2 -0
@@ -712,6 +712,8 @@ FIELD(TB_FLAGS, PM_SIGNEXTEND, 31, 1) FIELD(EXT_TB_FLAGS, MISA_EXT, 0, 32)FIELD (EXT_TB_FLAGS ,ALTFMT ,32 ,1 ) +/* sdext single-step needs a TB flag to build 1-insn TBs */ +FIELD(EXT_TB_FLAGS, SDEXT_STEP, 33, 1)#ifdef TARGET_RISCV32 #define riscv_cpu_mxl (env) ((void)(env), MXL_RV32)
target/riscv/cpu_helper.c +6 -0
@@ -638,6 +638,12 @@ bool riscv_cpu_exec_interrupt(CPUState *cs, int interrupt_request)if (interrupt_request & mask) {RISCVCPU *cpu =RISCV_CPU (cs);CPURISCVState *env = &cpu->env; + +if (cpu->cfg.ext_sdext && !env->debug_mode && + (env->dcsr &DCSR_STEP ) && !(env->dcsr &DCSR_STEPIE )) { +return false; + } +int interruptno =riscv_cpu_local_irq_pending (env);if (interruptno >=0 ) { cs->exception_index =RISCV_EXCP_INT_FLAG | interruptno;
target/riscv/helper.h +1 -0
@@ -141,6 +141,7 @@ DEF_HELPER_1(tlb_flush_all, void, env)DEF_HELPER_4 (ctr_add_entry, void, env, tl, tl, tl) /* Native Debug */ DEF_HELPER_1(itrigger_match, void, env) +DEF_HELPER_1(sdext_step, void, env) DEF_HELPER_2(sdext_ebreak, void, env, tl)#endif
target/riscv/op_helper.c +20 -0
@@ -470,6 +470,22 @@ target_ulong helper_dret(CPURISCVState *env)#endif } +void helper_sdext_step (CPURISCVState *env) +{ +#ifndef CONFIG_USER_ONLY +CPUState *cs =env_cpu (env); + +if (!riscv_cpu_cfg (env)->ext_sdext || env->debug_mode || + !(env->dcsr &DCSR_STEP )) { +return ; + } + +riscv_cpu_enter_debug_mode (env, env->pc,DCSR_CAUSE_STEP ); + cs->exception_index =EXCP_DEBUG ; +cpu_loop_exit_restore (cs,GETPC ()); +#endif +} +void helper_sdext_ebreak (CPURISCVState *env,target_ulong pc) {#ifndef CONFIG_USER_ONLY
@@ -604,6 +620,10 @@ void helper_wfi(CPURISCVState *env) (prv_u || (prv_s && get_field(env->hstatus, HSTATUS_VTW)))) { riscv_raise_exception(env, RISCV_EXCP_VIRT_INSTRUCTION_FAULT, GETPC()); } else { +if (riscv_cpu_cfg (env)->ext_sdext && !env->debug_mode && + (env->dcsr &DCSR_STEP )) { +return ; + } cs->halted =1 ; cs->exception_index =EXCP_HLT ;cpu_loop_exit (cs);
target/riscv/tcg/tcg-cpu.c +5 -0
@@ -193,6 +193,11 @@ static TCGTBCPUState riscv_get_tb_cpu_state(CPUState *cs) flags =FIELD_DP32 (flags,TB_FLAGS ,PM_SIGNEXTEND , pm_signext); ext_flags =FIELD_DP64 (ext_flags,EXT_TB_FLAGS ,MISA_EXT , env->misa_ext); +#ifndef CONFIG_USER_ONLY +if (cpu->cfg.ext_sdext && !env->debug_mode && (env->dcsr &DCSR_STEP )) { + ext_flags =FIELD_DP64 (ext_flags,EXT_TB_FLAGS ,SDEXT_STEP ,1 ); + } +#endif return (TCGTBCPUState ){ .pc = env->xl ==MXL_RV32 ? env->pc &UINT32_MAX : env->pc,
target/riscv/translate.c +13 -2
@@ -111,6 +111,8 @@ typedef struct DisasContext {bool ztso;/* Use icount trigger for native debug */ bool itrigger; +/* Enter Debug Mode after next instruction (sdext single-step). */ +bool sdext_step;/* FRM is known to contain a valid value. */ bool frm_valid;bool insn_start_updated;
@@ -293,6 +295,9 @@ static void lookup_and_goto_ptr(DisasContext *ctx)if (ctx->itrigger) {gen_helper_itrigger_match (tcg_env); } +if (ctx->sdext_step) { +gen_helper_sdext_step (tcg_env); + }#endif tcg_gen_lookup_and_goto_ptr (); }
@@ -303,6 +308,9 @@ static void exit_tb(DisasContext *ctx)if (ctx->itrigger) {gen_helper_itrigger_match (tcg_env); } +if (ctx->sdext_step) { +gen_helper_sdext_step (tcg_env); + }#endif tcg_gen_exit_tb (NULL ,0 ); }
@@ -316,7 +324,8 @@ static void gen_goto_tb(DisasContext *ctx, unsigned tb_slot_idx,* Under itrigger, instruction executes one by one like singlestep, * direct block chain benefits will be small. */ -if (translator_use_goto_tb (&ctx->base, dest) && !ctx->itrigger) { +if (translator_use_goto_tb (&ctx->base, dest) && + !ctx->itrigger && !ctx->sdext_step) {/* * For pcrel, the pc must always be up-to-date on entry to * the linked TB, so that it can use simple additions for all
@@ -1351,6 +1360,7 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) ctx->bcfi_enabled =FIELD_EX32 (tb_flags,TB_FLAGS ,BCFI_ENABLED ); ctx->fcfi_lp_expected =FIELD_EX32 (tb_flags,TB_FLAGS ,FCFI_LP_EXPECTED ); ctx->fcfi_enabled =FIELD_EX32 (tb_flags,TB_FLAGS ,FCFI_ENABLED ); + ctx->sdext_step =FIELD_EX64 (ext_tb_flags,EXT_TB_FLAGS ,SDEXT_STEP ); ctx->zero =tcg_constant_tl (0 ); ctx->virt_inst_excp = false; ctx->decoders = cpu->decoders;
@@ -1401,7 +1411,8 @@ static void riscv_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)/* Only the first insn within a TB is allowed to cross a page boundary. */ if (ctx->base.is_jmp ==DISAS_NEXT ) { -if (ctx->itrigger || !translator_is_same_page (&ctx->base, ctx->base.pc_next)) { +if (ctx->itrigger || ctx->sdext_step || + !translator_is_same_page (&ctx->base, ctx->base.pc_next)) { ctx->base.is_jmp =DISAS_TOO_MANY ; }else {unsigned page_ofs = ctx->base.pc_next & ~TARGET_PAGE_MASK ;
Signature · 1 line
2.52.0
RFC PATCH v2 7/7 target/riscv: add sdtrig trigger action=debug mode
In reply to Chao LiuRISC-V Debug Specification:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0
Allow mcontrol/mcontrol6 action=1 when Sdext is enabled. When such a trigger hits, enter Debug Mode with cause=trigger and stop with EXCP_DEBUG.
Also report inst-count triggers in tinfo and read their action field.
--- target/riscv/debug.c | 53 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-)
target/riscv/debug.c +51 -2
@@ -110,6 +110,8 @@ static trigger_action_t get_trigger_action(CPURISCVState *env, action = (tdata1 &TYPE6_ACTION ) >>12 ;break ;case TRIGGER_TYPE_INST_CNT : + action = tdata1 &ITRIGGER_ACTION ; +break ;case TRIGGER_TYPE_INT :case TRIGGER_TYPE_EXCP :case TRIGGER_TYPE_EXT_SRC :
@@ -280,6 +282,7 @@ static target_ulong textra_validate(CPURISCVState *env, target_ulong tdata3)static void do_trigger_action (CPURISCVState *env,target_ulong trigger_index) { +CPUState *cs =env_cpu (env);trigger_action_t action =get_trigger_action (env, trigger_index);switch (action) {
@@ -289,6 +292,21 @@ static void do_trigger_action(CPURISCVState *env, target_ulong trigger_index)riscv_raise_exception (env,RISCV_EXCP_BREAKPOINT ,0 );break ;case DBG_ACTION_DBG_MODE : +if (!env_archcpu (env)->cfg.ext_sdext) { +qemu_log_mask (LOG_UNIMP , +"trigger action=debug mode requires Sdext\n" ); +riscv_raise_exception (env,RISCV_EXCP_BREAKPOINT ,0 ); + } +riscv_cpu_enter_debug_mode (env, env->pc,DCSR_CAUSE_TRIGGER ); +/* +* If this came from the Trigger Module's CPU breakpoint/watchpoint, +* we're already returning via EXCP_DEBUG. Otherwise, stop now. +*/ +if (cs->exception_index !=EXCP_DEBUG ) { + cs->exception_index =EXCP_DEBUG ; +cpu_loop_exit_restore (cs,GETPC ()); + } +break ;case DBG_ACTION_TRACE0 :case DBG_ACTION_TRACE1 :case DBG_ACTION_TRACE2 :
@@ -441,6 +459,7 @@ static target_ulong type2_mcontrol_validate(CPURISCVState *env, {target_ulong val;uint32_t size; +uint32_t action;/* validate the generic part first */ val =tdata1_validate (env, ctrl,TRIGGER_TYPE_AD_MATCH );
@@ -448,11 +467,25 @@ static target_ulong type2_mcontrol_validate(CPURISCVState *env,/* validate unimplemented (always zero) bits */ warn_always_zero_bit (ctrl,TYPE2_MATCH ,"match" );warn_always_zero_bit (ctrl,TYPE2_CHAIN ,"chain" ); -warn_always_zero_bit (ctrl,TYPE2_ACTION ,"action" );warn_always_zero_bit (ctrl,TYPE2_TIMING ,"timing" );warn_always_zero_bit (ctrl,TYPE2_SELECT ,"select" );warn_always_zero_bit (ctrl,TYPE2_HIT ,"hit" ); + action = (ctrl &TYPE2_ACTION ) >>12 ; +if (action ==DBG_ACTION_BP ) { + val |= ctrl &TYPE2_ACTION ; + }else if (action ==DBG_ACTION_DBG_MODE ) { +if (env_archcpu (env)->cfg.ext_sdext) { + val |= ctrl &TYPE2_ACTION ; + }else { +qemu_log_mask (LOG_UNIMP , +"trigger action=debug mode requires Sdext\n" ); + } + }else { +qemu_log_mask (LOG_UNIMP ,"trigger action: %u is not supported\n" , + action); + } +/* validate size encoding */ size =type2_breakpoint_size (env, ctrl);if (access_size[size] ==-1 ) {
@@ -569,6 +602,7 @@ static target_ulong type6_mcontrol6_validate(CPURISCVState *env, {target_ulong val;uint32_t size; +uint32_t action;/* validate the generic part first */ val =tdata1_validate (env, ctrl,TRIGGER_TYPE_AD_MATCH6 );
@@ -576,11 +610,25 @@ static target_ulong type6_mcontrol6_validate(CPURISCVState *env,/* validate unimplemented (always zero) bits */ warn_always_zero_bit (ctrl,TYPE6_MATCH ,"match" );warn_always_zero_bit (ctrl,TYPE6_CHAIN ,"chain" ); -warn_always_zero_bit (ctrl,TYPE6_ACTION ,"action" );warn_always_zero_bit (ctrl,TYPE6_TIMING ,"timing" );warn_always_zero_bit (ctrl,TYPE6_SELECT ,"select" );warn_always_zero_bit (ctrl,TYPE6_HIT ,"hit" ); + action = (ctrl &TYPE6_ACTION ) >>12 ; +if (action ==DBG_ACTION_BP ) { + val |= ctrl &TYPE6_ACTION ; + }else if (action ==DBG_ACTION_DBG_MODE ) { +if (env_archcpu (env)->cfg.ext_sdext) { + val |= ctrl &TYPE6_ACTION ; + }else { +qemu_log_mask (LOG_UNIMP , +"trigger action=debug mode requires Sdext\n" ); + } + }else { +qemu_log_mask (LOG_UNIMP ,"trigger action: %u is not supported\n" , + action); + } +/* validate size encoding */ size =extract32 (ctrl,16 ,4 );if (access_size[size] ==-1 ) {
@@ -919,6 +967,7 @@ target_ulong tinfo_csr_read(CPURISCVState *env) {/* assume all triggers support the same types of triggers */ return BIT (TRIGGER_TYPE_AD_MATCH ) | +BIT (TRIGGER_TYPE_INST_CNT ) |BIT (TRIGGER_TYPE_AD_MATCH6 ); }
Signature · 1 line
2.52.0