target/riscv: Generate the GDB XML file for CSR registers dynamically
v2 cover target/riscv: Generate the GDB XML file for CSR registers dynamically
From: Bin Meng <[email protected]>
At present QEMU RISC-V uses a hardcoded XML to report the feature "org.gnu.gdb.riscv.csr" [1]. There are two major issues with the approach being used currently:
- The XML does not specify the "regnum" field of a CSR entry, hence consecutive numbers are used by the remote GDB client to access CSRs. In QEMU we have to maintain a map table to convert the GDB number to the hardware number which is error prone.
- The XML contains some CSRs that QEMU does not implement at all, which causes an "E14" response sent to remote GDB client.
Change to generate the CSR register list dynamically, based on the availability presented in the CSR function table. This new approach will reflect a correct list of CSRs that QEMU actually implements.
[1] https://sourceware.org/gdb/current/onlinedocs/gdb/RISC_002dV-Features.html#RISC_002dV-Features
Changes in v2:
- rebase on top of riscv-to-apply.next branch
- drop the first 2 patches that are already applied on riscv-to-apply.next
Bin Meng (2):
target/riscv: Generate the GDB XML file for CSR registers dynamically target/riscv: Remove built-in GDB XML files for CSRs
.../targets/riscv32-linux-user.mak | 2 +- default-configs/targets/riscv32-softmmu.mak | 2 +- .../targets/riscv64-linux-user.mak | 2 +- default-configs/targets/riscv64-softmmu.mak | 2 +- target/riscv/cpu.h | 2 + target/riscv/cpu.c | 12 + target/riscv/gdbstub.c | 308 +++--------------- gdb-xml/riscv-32bit-csr.xml | 250 -------------- gdb-xml/riscv-64bit-csr.xml | 250 -------------- 9 files changed, 62 insertions(+), 768 deletions(-) delete mode 100644 gdb-xml/riscv-32bit-csr.xml delete mode 100644 gdb-xml/riscv-64bit-csr.xml
Signature · 1 line
2.25.1
PATCH v2 1/2 target/riscv: Generate the GDB XML file for CSR registers dynamically
From: Bin Meng <[email protected]>
At present QEMU RISC-V uses a hardcoded XML to report the feature "org.gnu.gdb.riscv.csr" [1]. There are two major issues with the approach being used currently:
- The XML does not specify the "regnum" field of a CSR entry, hence consecutive numbers are used by the remote GDB client to access CSRs. In QEMU we have to maintain a map table to convert the GDB number to the hardware number which is error prone.
- The XML contains some CSRs that QEMU does not implement at all, which causes an "E14" response sent to remote GDB client.
Change to generate the CSR register list dynamically, based on the availability presented in the CSR function table. This new approach will reflect a correct list of CSRs that QEMU actually implements.
[1] https://sourceware.org/gdb/current/onlinedocs/gdb/RISC_002dV-Features.html#RISC_002dV-Features
---
Changes in v2:
- rebase on top of riscv-to-apply.next branch
- drop the first 2 patches that are already applied on riscv-to-apply.next
target/riscv/cpu.h | 2 + target/riscv/cpu.c | 12 ++ target/riscv/gdbstub.c | 308 ++++++----------------------------------- 3 files changed, 58 insertions(+), 264 deletions(-)
target/riscv/cpu.h +2 -0
@@ -272,6 +272,8 @@ struct RISCVCPU {CPUNegativeOffsetState neg;CPURISCVState env; +char *dyn_csr_xml; +/* Configuration Settings */ struct {bool ext_i;
target/riscv/cpu.c +12 -0
@@ -569,6 +569,17 @@ static gchar *riscv_gdb_arch_name(CPUState *cs) } } +static const char *riscv_gdb_get_dynamic_xml (CPUState *cs,const char *xmlname) +{ +RISCVCPU *cpu =RISCV_CPU (cs); + +if (strcmp (xmlname,"riscv-csr.xml" ) ==0 ) { +return cpu->dyn_csr_xml; + } + +return NULL ; +} +static void riscv_cpu_class_init (ObjectClass *c,void *data) {RISCVCPUClass *mcc =RISCV_CPU_CLASS (c);
@@ -605,6 +616,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->vmsd = &vmstate_riscv_cpu;#endif cc->gdb_arch_name = riscv_gdb_arch_name; + cc->gdb_get_dynamic_xml = riscv_gdb_get_dynamic_xml;#ifdef CONFIG_TCG cc->tcg_initialize = riscv_translate_init; cc->tlb_fill = riscv_cpu_tlb_fill;
target/riscv/gdbstub.c +44 -264
366 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 2/2 target/riscv: Remove built-in GDB XML files for CSRs
In reply to Bin MengFrom: Bin Meng <[email protected]>
Now that we have switched to generate the RISC-V CSR XML dynamically, remove the built-in hardcoded XML files.
---
(no changes since v1)
.../targets/riscv32-linux-user.mak | 2 +- default-configs/targets/riscv32-softmmu.mak | 2 +- .../targets/riscv64-linux-user.mak | 2 +- default-configs/targets/riscv64-softmmu.mak | 2 +- gdb-xml/riscv-32bit-csr.xml | 250 ------------------ gdb-xml/riscv-64bit-csr.xml | 250 ------------------ 6 files changed, 4 insertions(+), 504 deletions(-) delete mode 100644 gdb-xml/riscv-32bit-csr.xml delete mode 100644 gdb-xml/riscv-64bit-csr.xml
default-configs/targets/riscv32-linux-user.mak +1 -1
@@ -1,4 +1,4 @@ TARGET_ARCH=riscv32 TARGET_BASE_ARCH=riscv TARGET_ABI_DIR=riscv -TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-csr.xml gdb-xml/riscv-32bit-virtual.xml +TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xml
default-configs/targets/riscv32-softmmu.mak +1 -1
@@ -1,5 +1,5 @@ TARGET_ARCH=riscv32 TARGET_BASE_ARCH=riscv TARGET_SUPPORTS_MTTCG=y -TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-csr.xml gdb-xml/riscv-32bit-virtual.xml +TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xml TARGET_NEED_FDT=y
default-configs/targets/riscv64-linux-user.mak +1 -1
@@ -1,4 +1,4 @@ TARGET_ARCH=riscv64 TARGET_BASE_ARCH=riscv TARGET_ABI_DIR=riscv -TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-csr.xml gdb-xml/riscv-64bit-virtual.xml +TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml
default-configs/targets/riscv64-softmmu.mak +1 -1
@@ -1,5 +1,5 @@ TARGET_ARCH=riscv64 TARGET_BASE_ARCH=riscv TARGET_SUPPORTS_MTTCG=y -TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-csr.xml gdb-xml/riscv-64bit-virtual.xml +TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml TARGET_NEED_FDT=y
gdb-xml/riscv-32bit-csr.xml deleted +0 -250
250 lines not on this page · raw message
gdb-xml/riscv-64bit-csr.xml deleted +0 -250
250 lines not on this page · raw message
Signature · 1 line
2.25.1
Alistair Francis
AppliedRe: [PATCH v2 2/2] target/riscv: Remove built-in GDB XML files for CSRs
Quoted 8 lines · Bin Meng
From: Bin Meng <[email protected]>
Now that we have switched to generate the RISC-V CSR XML dynamically, remove the built-in hardcoded XML files.
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 573 lines
---
(no changes since v1)
.../targets/riscv32-linux-user.mak | 2 +- default-configs/targets/riscv32-softmmu.mak | 2 +- .../targets/riscv64-linux-user.mak | 2 +- default-configs/targets/riscv64-softmmu.mak | 2 +- gdb-xml/riscv-32bit-csr.xml | 250 ------------------ gdb-xml/riscv-64bit-csr.xml | 250 ------------------ 6 files changed, 4 insertions(+), 504 deletions(-) delete mode 100644 gdb-xml/riscv-32bit-csr.xml delete mode 100644 gdb-xml/riscv-64bit-csr.xmldefault-configs/targets/riscv32-linux-user.mak +1
-1@@ -1,4 +1,4 @@ TARGET_ARCH=riscv32 TARGET_BASE_ARCH=riscv TARGET_ABI_DIR=riscv -TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-csr.xml gdb-xml/riscv-32bit-virtual.xml +TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xmldefault-configs/targets/riscv32-softmmu.mak +1
-1@@ -1,5 +1,5 @@ TARGET_ARCH=riscv32 TARGET_BASE_ARCH=riscv TARGET_SUPPORTS_MTTCG=y -TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-csr.xml gdb-xml/riscv-32bit-virtual.xml +TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xml TARGET_NEED_FDT=ydefault-configs/targets/riscv64-linux-user.mak +1
-1@@ -1,4 +1,4 @@ TARGET_ARCH=riscv64 TARGET_BASE_ARCH=riscv TARGET_ABI_DIR=riscv -TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-csr.xml gdb-xml/riscv-64bit-virtual.xml +TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xmldefault-configs/targets/riscv64-softmmu.mak +1
-1@@ -1,5 +1,5 @@ TARGET_ARCH=riscv64 TARGET_BASE_ARCH=riscv TARGET_SUPPORTS_MTTCG=y -TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-csr.xml gdb-xml/riscv-64bit-virtual.xml +TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml TARGET_NEED_FDT=ygdb-xml/riscv-32bit-csr.xml deleted +0
-250@@ -1,250 +0,0 @@ -<?xml version="1.0"?> -<!-- Copyright (C) 2018-2019 Free Software Foundation, Inc. - - Copying and distribution of this file, with or without modification, - are permitted in any medium without royalty provided the copyright - notice and this notice are preserved. --> - -<!DOCTYPE feature SYSTEM "gdb-target.dtd"> -<feature name="org.gnu.gdb.riscv.csr"> - <reg name="ustatus" bitsize="32"/> - <reg name="uie" bitsize="32"/> - <reg name="utvec" bitsize="32"/> - <reg name="uscratch" bitsize="32"/> - <reg name="uepc" bitsize="32"/> - <reg name="ucause" bitsize="32"/> - <reg name="utval" bitsize="32"/> - <reg name="uip" bitsize="32"/> - <reg name="fflags" bitsize="32"/> - <reg name="frm" bitsize="32"/> - <reg name="fcsr" bitsize="32"/> - <reg name="cycle" bitsize="32"/> - <reg name="time" bitsize="32"/> - <reg name="instret" bitsize="32"/> - <reg name="hpmcounter3" bitsize="32"/> - <reg name="hpmcounter4" bitsize="32"/> - <reg name="hpmcounter5" bitsize="32"/> - <reg name="hpmcounter6" bitsize="32"/> - <reg name="hpmcounter7" bitsize="32"/> - <reg name="hpmcounter8" bitsize="32"/> - <reg name="hpmcounter9" bitsize="32"/> - <reg name="hpmcounter10" bitsize="32"/> - <reg name="hpmcounter11" bitsize="32"/> - <reg name="hpmcounter12" bitsize="32"/> - <reg name="hpmcounter13" bitsize="32"/> - <reg name="hpmcounter14" bitsize="32"/> - <reg name="hpmcounter15" bitsize="32"/> - <reg name="hpmcounter16" bitsize="32"/> - <reg name="hpmcounter17" bitsize="32"/> - <reg name="hpmcounter18" bitsize="32"/> - <reg name="hpmcounter19" bitsize="32"/> - <reg name="hpmcounter20" bitsize="32"/> - <reg name="hpmcounter21" bitsize="32"/> - <reg name="hpmcounter22" bitsize="32"/> - <reg name="hpmcounter23" bitsize="32"/> - <reg name="hpmcounter24" bitsize="32"/> - <reg name="hpmcounter25" bitsize="32"/> - <reg name="hpmcounter26" bitsize="32"/> - <reg name="hpmcounter27" bitsize="32"/> - <reg name="hpmcounter28" bitsize="32"/> - <reg name="hpmcounter29" bitsize="32"/> - <reg name="hpmcounter30" bitsize="32"/> - <reg name="hpmcounter31" bitsize="32"/> - <reg name="cycleh" bitsize="32"/> - <reg name="timeh" bitsize="32"/> - <reg name="instreth" bitsize="32"/> - <reg name="hpmcounter3h" bitsize="32"/> - <reg name="hpmcounter4h" bitsize="32"/> - <reg name="hpmcounter5h" bitsize="32"/> - <reg name="hpmcounter6h" bitsize="32"/> - <reg name="hpmcounter7h" bitsize="32"/> - <reg name="hpmcounter8h" bitsize="32"/> - <reg name="hpmcounter9h" bitsize="32"/> - <reg name="hpmcounter10h" bitsize="32"/> - <reg name="hpmcounter11h" bitsize="32"/> - <reg name="hpmcounter12h" bitsize="32"/> - <reg name="hpmcounter13h" bitsize="32"/> - <reg name="hpmcounter14h" bitsize="32"/> - <reg name="hpmcounter15h" bitsize="32"/> - <reg name="hpmcounter16h" bitsize="32"/> - <reg name="hpmcounter17h" bitsize="32"/> - <reg name="hpmcounter18h" bitsize="32"/> - <reg name="hpmcounter19h" bitsize="32"/> - <reg name="hpmcounter20h" bitsize="32"/> - <reg name="hpmcounter21h" bitsize="32"/> - <reg name="hpmcounter22h" bitsize="32"/> - <reg name="hpmcounter23h" bitsize="32"/> - <reg name="hpmcounter24h" bitsize="32"/> - <reg name="hpmcounter25h" bitsize="32"/> - <reg name="hpmcounter26h" bitsize="32"/> - <reg name="hpmcounter27h" bitsize="32"/> - <reg name="hpmcounter28h" bitsize="32"/> - <reg name="hpmcounter29h" bitsize="32"/> - <reg name="hpmcounter30h" bitsize="32"/> - <reg name="hpmcounter31h" bitsize="32"/> - <reg name="sstatus" bitsize="32"/> - <reg name="sedeleg" bitsize="32"/> - <reg name="sideleg" bitsize="32"/> - <reg name="sie" bitsize="32"/> - <reg name="stvec" bitsize="32"/> - <reg name="scounteren" bitsize="32"/> - <reg name="sscratch" bitsize="32"/> - <reg name="sepc" bitsize="32"/> - <reg name="scause" bitsize="32"/> - <reg name="stval" bitsize="32"/> - <reg name="sip" bitsize="32"/> - <reg name="satp" bitsize="32"/> - <reg name="mvendorid" bitsize="32"/> - <reg name="marchid" bitsize="32"/> - <reg name="mimpid" bitsize="32"/> - <reg name="mhartid" bitsize="32"/> - <reg name="mstatus" bitsize="32"/> - <reg name="misa" bitsize="32"/> - <reg name="medeleg" bitsize="32"/> - <reg name="mideleg" bitsize="32"/> - <reg name="mie" bitsize="32"/> - <reg name="mtvec" bitsize="32"/> - <reg name="mcounteren" bitsize="32"/> - <reg name="mscratch" bitsize="32"/> - <reg name="mepc" bitsize="32"/> - <reg name="mcause" bitsize="32"/> - <reg name="mtval" bitsize="32"/> - <reg name="mip" bitsize="32"/> - <reg name="pmpcfg0" bitsize="32"/> - <reg name="pmpcfg1" bitsize="32"/> - <reg name="pmpcfg2" bitsize="32"/> - <reg name="pmpcfg3" bitsize="32"/> - <reg name="pmpaddr0" bitsize="32"/> - <reg name="pmpaddr1" bitsize="32"/> - <reg name="pmpaddr2" bitsize="32"/> - <reg name="pmpaddr3" bitsize="32"/> - <reg name="pmpaddr4" bitsize="32"/> - <reg name="pmpaddr5" bitsize="32"/> - <reg name="pmpaddr6" bitsize="32"/> - <reg name="pmpaddr7" bitsize="32"/> - <reg name="pmpaddr8" bitsize="32"/> - <reg name="pmpaddr9" bitsize="32"/> - <reg name="pmpaddr10" bitsize="32"/> - <reg name="pmpaddr11" bitsize="32"/> - <reg name="pmpaddr12" bitsize="32"/> - <reg name="pmpaddr13" bitsize="32"/> - <reg name="pmpaddr14" bitsize="32"/> - <reg name="pmpaddr15" bitsize="32"/> - <reg name="mcycle" bitsize="32"/> - <reg name="minstret" bitsize="32"/> - <reg name="mhpmcounter3" bitsize="32"/> - <reg name="mhpmcounter4" bitsize="32"/> - <reg name="mhpmcounter5" bitsize="32"/> - <reg name="mhpmcounter6" bitsize="32"/> - <reg name="mhpmcounter7" bitsize="32"/> - <reg name="mhpmcounter8" bitsize="32"/> - <reg name="mhpmcounter9" bitsize="32"/> - <reg name="mhpmcounter10" bitsize="32"/> - <reg name="mhpmcounter11" bitsize="32"/> - <reg name="mhpmcounter12" bitsize="32"/> - <reg name="mhpmcounter13" bitsize="32"/> - <reg name="mhpmcounter14" bitsize="32"/> - <reg name="mhpmcounter15" bitsize="32"/> - <reg name="mhpmcounter16" bitsize="32"/> - <reg name="mhpmcounter17" bitsize="32"/> - <reg name="mhpmcounter18" bitsize="32"/> - <reg name="mhpmcounter19" bitsize="32"/> - <reg name="mhpmcounter20" bitsize="32"/> - <reg name="mhpmcounter21" bitsize="32"/> - <reg name="mhpmcounter22" bitsize="32"/> - <reg name="mhpmcounter23" bitsize="32"/> - <reg name="mhpmcounter24" bitsize="32"/> - <reg name="mhpmcounter25" bitsize="32"/> - <reg name="mhpmcounter26" bitsize="32"/> - <reg name="mhpmcounter27" bitsize="32"/> - <reg name="mhpmcounter28" bitsize="32"/> - <reg name="mhpmcounter29" bitsize="32"/> - <reg name="mhpmcounter30" bitsize="32"/> - <reg name="mhpmcounter31" bitsize="32"/> - <reg name="mcycleh" bitsize="32"/> - <reg name="minstreth" bitsize="32"/> - <reg name="mhpmcounter3h" bitsize="32"/> - <reg name="mhpmcounter4h" bitsize="32"/> - <reg name="mhpmcounter5h" bitsize="32"/> - <reg name="mhpmcounter6h" bitsize="32"/> - <reg name="mhpmcounter7h" bitsize="32"/> - <reg name="mhpmcounter8h" bitsize="32"/> - <reg name="mhpmcounter9h" bitsize="32"/> - <reg name="mhpmcounter10h" bitsize="32"/> - <reg name="mhpmcounter11h" bitsize="32"/> - <reg name="mhpmcounter12h" bitsize="32"/> - <reg name="mhpmcounter13h" bitsize="32"/> - <reg name="mhpmcounter14h" bitsize="32"/> - <reg name="mhpmcounter15h" bitsize="32"/> - <reg name="mhpmcounter16h" bitsize="32"/> - <reg name="mhpmcounter17h" bitsize="32"/> - <reg name="mhpmcounter18h" bitsize="32"/> - <reg name="mhpmcounter19h" bitsize="32"/> - <reg name="mhpmcounter20h" bitsize="32"/> - <reg name="mhpmcounter21h" bitsize="32"/> - <reg name="mhpmcounter22h" bitsize="32"/> - <reg name="mhpmcounter23h" bitsize="32"/> - <reg name="mhpmcounter24h" bitsize="32"/> - <reg name="mhpmcounter25h" bitsize="32"/> - <reg name="mhpmcounter26h" bitsize="32"/> - <reg name="mhpmcounter27h" bitsize="32"/> - <reg name="mhpmcounter28h" bitsize="32"/> - <reg name="mhpmcounter29h" bitsize="32"/> - <reg name="mhpmcounter30h" bitsize="32"/> - <reg name="mhpmcounter31h" bitsize="32"/> - <reg name="mhpmevent3" bitsize="32"/> - <reg name="mhpmevent4" bitsize="32"/> - <reg name="mhpmevent5" bitsize="32"/> - <reg name="mhpmevent6" bitsize="32"/> - <reg name="mhpmevent7" bitsize="32"/> - <reg name="mhpmevent8" bitsize="32"/> - <reg name="mhpmevent9" bitsize="32"/> - <reg name="mhpmevent10" bitsize="32"/> - <reg name="mhpmevent11" bitsize="32"/> - <reg name="mhpmevent12" bitsize="32"/> - <reg name="mhpmevent13" bitsize="32"/> - <reg name="mhpmevent14" bitsize="32"/> - <reg name="mhpmevent15" bitsize="32"/> - <reg name="mhpmevent16" bitsize="32"/> - <reg name="mhpmevent17" bitsize="32"/> - <reg name="mhpmevent18" bitsize="32"/> - <reg name="mhpmevent19" bitsize="32"/> - <reg name="mhpmevent20" bitsize="32"/> - <reg name="mhpmevent21" bitsize="32"/> - <reg name="mhpmevent22" bitsize="32"/> - <reg name="mhpmevent23" bitsize="32"/> - <reg name="mhpmevent24" bitsize="32"/> - <reg name="mhpmevent25" bitsize="32"/> - <reg name="mhpmevent26" bitsize="32"/> - <reg name="mhpmevent27" bitsize="32"/> - <reg name="mhpmevent28" bitsize="32"/> - <reg name="mhpmevent29" bitsize="32"/> - <reg name="mhpmevent30" bitsize="32"/> - <reg name="mhpmevent31" bitsize="32"/> - <reg name="tselect" bitsize="32"/> - <reg name="tdata1" bitsize="32"/> - <reg name="tdata2" bitsize="32"/> - <reg name="tdata3" bitsize="32"/> - <reg name="dcsr" bitsize="32"/> - <reg name="dpc" bitsize="32"/> - <reg name="dscratch" bitsize="32"/> - <reg name="hstatus" bitsize="32"/> - <reg name="hedeleg" bitsize="32"/> - <reg name="hideleg" bitsize="32"/> - <reg name="hie" bitsize="32"/> - <reg name="htvec" bitsize="32"/> - <reg name="hscratch" bitsize="32"/> - <reg name="hepc" bitsize="32"/> - <reg name="hcause" bitsize="32"/> - <reg name="hbadaddr" bitsize="32"/> - <reg name="hip" bitsize="32"/> - <reg name="mbase" bitsize="32"/> - <reg name="mbound" bitsize="32"/> - <reg name="mibase" bitsize="32"/> - <reg name="mibound" bitsize="32"/> - <reg name="mdbase" bitsize="32"/> - <reg name="mdbound" bitsize="32"/> - <reg name="mucounteren" bitsize="32"/> - <reg name="mscounteren" bitsize="32"/> - <reg name="mhcounteren" bitsize="32"/> -</feature>gdb-xml/riscv-64bit-csr.xml deleted +0
-251@@ -1,250 +0,0 @@ -<?xml version="1.0"?> -<!-- Copyright (C) 2018-2019 Free Software Foundation, Inc. - - Copying and distribution of this file, with or without modification, - are permitted in any medium without royalty provided the copyright - notice and this notice are preserved. --> - -<!DOCTYPE feature SYSTEM "gdb-target.dtd"> -<feature name="org.gnu.gdb.riscv.csr"> - <reg name="ustatus" bitsize="64"/> - <reg name="uie" bitsize="64"/> - <reg name="utvec" bitsize="64"/> - <reg name="uscratch" bitsize="64"/> - <reg name="uepc" bitsize="64"/> - <reg name="ucause" bitsize="64"/> - <reg name="utval" bitsize="64"/> - <reg name="uip" bitsize="64"/> - <reg name="fflags" bitsize="64"/> - <reg name="frm" bitsize="64"/> - <reg name="fcsr" bitsize="64"/> - <reg name="cycle" bitsize="64"/> - <reg name="time" bitsize="64"/> - <reg name="instret" bitsize="64"/> - <reg name="hpmcounter3" bitsize="64"/> - <reg name="hpmcounter4" bitsize="64"/> - <reg name="hpmcounter5" bitsize="64"/> - <reg name="hpmcounter6" bitsize="64"/> - <reg name="hpmcounter7" bitsize="64"/> - <reg name="hpmcounter8" bitsize="64"/> - <reg name="hpmcounter9" bitsize="64"/> - <reg name="hpmcounter10" bitsize="64"/> - <reg name="hpmcounter11" bitsize="64"/> - <reg name="hpmcounter12" bitsize="64"/> - <reg name="hpmcounter13" bitsize="64"/> - <reg name="hpmcounter14" bitsize="64"/> - <reg name="hpmcounter15" bitsize="64"/> - <reg name="hpmcounter16" bitsize="64"/> - <reg name="hpmcounter17" bitsize="64"/> - <reg name="hpmcounter18" bitsize="64"/> - <reg name="hpmcounter19" bitsize="64"/> - <reg name="hpmcounter20" bitsize="64"/> - <reg name="hpmcounter21" bitsize="64"/> - <reg name="hpmcounter22" bitsize="64"/> - <reg name="hpmcounter23" bitsize="64"/> - <reg name="hpmcounter24" bitsize="64"/> - <reg name="hpmcounter25" bitsize="64"/> - <reg name="hpmcounter26" bitsize="64"/> - <reg name="hpmcounter27" bitsize="64"/> - <reg name="hpmcounter28" bitsize="64"/> - <reg name="hpmcounter29" bitsize="64"/> - <reg name="hpmcounter30" bitsize="64"/> - <reg name="hpmcounter31" bitsize="64"/> - <reg name="cycleh" bitsize="64"/> - <reg name="timeh" bitsize="64"/> - <reg name="instreth" bitsize="64"/> - <reg name="hpmcounter3h" bitsize="64"/> - <reg name="hpmcounter4h" bitsize="64"/> - <reg name="hpmcounter5h" bitsize="64"/> - <reg name="hpmcounter6h" bitsize="64"/> - <reg name="hpmcounter7h" bitsize="64"/> - <reg name="hpmcounter8h" bitsize="64"/> - <reg name="hpmcounter9h" bitsize="64"/> - <reg name="hpmcounter10h" bitsize="64"/> - <reg name="hpmcounter11h" bitsize="64"/> - <reg name="hpmcounter12h" bitsize="64"/> - <reg name="hpmcounter13h" bitsize="64"/> - <reg name="hpmcounter14h" bitsize="64"/> - <reg name="hpmcounter15h" bitsize="64"/> - <reg name="hpmcounter16h" bitsize="64"/> - <reg name="hpmcounter17h" bitsize="64"/> - <reg name="hpmcounter18h" bitsize="64"/> - <reg name="hpmcounter19h" bitsize="64"/> - <reg name="hpmcounter20h" bitsize="64"/> - <reg name="hpmcounter21h" bitsize="64"/> - <reg name="hpmcounter22h" bitsize="64"/> - <reg name="hpmcounter23h" bitsize="64"/> - <reg name="hpmcounter24h" bitsize="64"/> - <reg name="hpmcounter25h" bitsize="64"/> - <reg name="hpmcounter26h" bitsize="64"/> - <reg name="hpmcounter27h" bitsize="64"/> - <reg name="hpmcounter28h" bitsize="64"/> - <reg name="hpmcounter29h" bitsize="64"/> - <reg name="hpmcounter30h" bitsize="64"/> - <reg name="hpmcounter31h" bitsize="64"/> - <reg name="sstatus" bitsize="64"/> - <reg name="sedeleg" bitsize="64"/> - <reg name="sideleg" bitsize="64"/> - <reg name="sie" bitsize="64"/> - <reg name="stvec" bitsize="64"/> - <reg name="scounteren" bitsize="64"/> - <reg name="sscratch" bitsize="64"/> - <reg name="sepc" bitsize="64"/> - <reg name="scause" bitsize="64"/> - <reg name="stval" bitsize="64"/> - <reg name="sip" bitsize="64"/> - <reg name="satp" bitsize="64"/> - <reg name="mvendorid" bitsize="64"/> - <reg name="marchid" bitsize="64"/> - <reg name="mimpid" bitsize="64"/> - <reg name="mhartid" bitsize="64"/> - <reg name="mstatus" bitsize="64"/> - <reg name="misa" bitsize="64"/> - <reg name="medeleg" bitsize="64"/> - <reg name="mideleg" bitsize="64"/> - <reg name="mie" bitsize="64"/> - <reg name="mtvec" bitsize="64"/> - <reg name="mcounteren" bitsize="64"/> - <reg name="mscratch" bitsize="64"/> - <reg name="mepc" bitsize="64"/> - <reg name="mcause" bitsize="64"/> - <reg name="mtval" bitsize="64"/> - <reg name="mip" bitsize="64"/> - <reg name="pmpcfg0" bitsize="64"/> - <reg name="pmpcfg1" bitsize="64"/> - <reg name="pmpcfg2" bitsize="64"/> - <reg name="pmpcfg3" bitsize="64"/> - <reg name="pmpaddr0" bitsize="64"/> - <reg name="pmpaddr1" bitsize="64"/> - <reg name="pmpaddr2" bitsize="64"/> - <reg name="pmpaddr3" bitsize="64"/> - <reg name="pmpaddr4" bitsize="64"/> - <reg name="pmpaddr5" bitsize="64"/> - <reg name="pmpaddr6" bitsize="64"/> - <reg name="pmpaddr7" bitsize="64"/> - <reg name="pmpaddr8" bitsize="64"/> - <reg name="pmpaddr9" bitsize="64"/> - <reg name="pmpaddr10" bitsize="64"/> - <reg name="pmpaddr11" bitsize="64"/> - <reg name="pmpaddr12" bitsize="64"/> - <reg name="pmpaddr13" bitsize="64"/> - <reg name="pmpaddr14" bitsize="64"/> - <reg name="pmpaddr15" bitsize="64"/> - <reg name="mcycle" bitsize="64"/> - <reg name="minstret" bitsize="64"/> - <reg name="mhpmcounter3" bitsize="64"/> - <reg name="mhpmcounter4" bitsize="64"/> - <reg name="mhpmcounter5" bitsize="64"/> - <reg name="mhpmcounter6" bitsize="64"/> - <reg name="mhpmcounter7" bitsize="64"/> - <reg name="mhpmcounter8" bitsize="64"/> - <reg name="mhpmcounter9" bitsize="64"/> - <reg name="mhpmcounter10" bitsize="64"/> - <reg name="mhpmcounter11" bitsize="64"/> - <reg name="mhpmcounter12" bitsize="64"/> - <reg name="mhpmcounter13" bitsize="64"/> - <reg name="mhpmcounter14" bitsize="64"/> - <reg name="mhpmcounter15" bitsize="64"/> - <reg name="mhpmcounter16" bitsize="64"/> - <reg name="mhpmcounter17" bitsize="64"/> - <reg name="mhpmcounter18" bitsize="64"/> - <reg name="mhpmcounter19" bitsize="64"/> - <reg name="mhpmcounter20" bitsize="64"/> - <reg name="mhpmcounter21" bitsize="64"/> - <reg name="mhpmcounter22" bitsize="64"/> - <reg name="mhpmcounter23" bitsize="64"/> - <reg name="mhpmcounter24" bitsize="64"/> - <reg name="mhpmcounter25" bitsize="64"/> - <reg name="mhpmcounter26" bitsize="64"/> - <reg name="mhpmcounter27" bitsize="64"/> - <reg name="mhpmcounter28" bitsize="64"/> - <reg name="mhpmcounter29" bitsize="64"/> - <reg name="mhpmcounter30" bitsize="64"/> - <reg name="mhpmcounter31" bitsize="64"/> - <reg name="mcycleh" bitsize="64"/> - <reg name="minstreth" bitsize="64"/> - <reg name="mhpmcounter3h" bitsize="64"/> - <reg name="mhpmcounter4h" bitsize="64"/> - <reg name="mhpmcounter5h" bitsize="64"/> - <reg name="mhpmcounter6h" bitsize="64"/> - <reg name="mhpmcounter7h" bitsize="64"/> - <reg name="mhpmcounter8h" bitsize="64"/> - <reg name="mhpmcounter9h" bitsize="64"/> - <reg name="mhpmcounter10h" bitsize="64"/> - <reg name="mhpmcounter11h" bitsize="64"/> - <reg name="mhpmcounter12h" bitsize="64"/> - <reg name="mhpmcounter13h" bitsize="64"/> - <reg name="mhpmcounter14h" bitsize="64"/> - <reg name="mhpmcounter15h" bitsize="64"/> - <reg name="mhpmcounter16h" bitsize="64"/> - <reg name="mhpmcounter17h" bitsize="64"/> - <reg name="mhpmcounter18h" bitsize="64"/> - <reg name="mhpmcounter19h" bitsize="64"/> - <reg name="mhpmcounter20h" bitsize="64"/> - <reg name="mhpmcounter21h" bitsize="64"/> - <reg name="mhpmcounter22h" bitsize="64"/> - <reg name="mhpmcounter23h" bitsize="64"/> - <reg name="mhpmcounter24h" bitsize="64"/> - <reg name="mhpmcounter25h" bitsize="64"/> - <reg name="mhpmcounter26h" bitsize="64"/> - <reg name="mhpmcounter27h" bitsize="64"/> - <reg name="mhpmcounter28h" bitsize="64"/> - <reg name="mhpmcounter29h" bitsize="64"/> - <reg name="mhpmcounter30h" bitsize="64"/> - <reg name="mhpmcounter31h" bitsize="64"/> - <reg name="mhpmevent3" bitsize="64"/> - <reg name="mhpmevent4" bitsize="64"/> - <reg name="mhpmevent5" bitsize="64"/> - <reg name="mhpmevent6" bitsize="64"/> - <reg name="mhpmevent7" bitsize="64"/> - <reg name="mhpmevent8" bitsize="64"/> - <reg name="mhpmevent9" bitsize="64"/> - <reg name="mhpmevent10" bitsize="64"/> - <reg name="mhpmevent11" bitsize="64"/> - <reg name="mhpmevent12" bitsize="64"/> - <reg name="mhpmevent13" bitsize="64"/> - <reg name="mhpmevent14" bitsize="64"/> - <reg name="mhpmevent15" bitsize="64"/> - <reg name="mhpmevent16" bitsize="64"/> - <reg name="mhpmevent17" bitsize="64"/> - <reg name="mhpmevent18" bitsize="64"/> - <reg name="mhpmevent19" bitsize="64"/> - <reg name="mhpmevent20" bitsize="64"/> - <reg name="mhpmevent21" bitsize="64"/> - <reg name="mhpmevent22" bitsize="64"/> - <reg name="mhpmevent23" bitsize="64"/> - <reg name="mhpmevent24" bitsize="64"/> - <reg name="mhpmevent25" bitsize="64"/> - <reg name="mhpmevent26" bitsize="64"/> - <reg name="mhpmevent27" bitsize="64"/> - <reg name="mhpmevent28" bitsize="64"/> - <reg name="mhpmevent29" bitsize="64"/> - <reg name="mhpmevent30" bitsize="64"/> - <reg name="mhpmevent31" bitsize="64"/> - <reg name="tselect" bitsize="64"/> - <reg name="tdata1" bitsize="64"/> - <reg name="tdata2" bitsize="64"/> - <reg name="tdata3" bitsize="64"/> - <reg name="dcsr" bitsize="64"/> - <reg name="dpc" bitsize="64"/> - <reg name="dscratch" bitsize="64"/> - <reg name="hstatus" bitsize="64"/> - <reg name="hedeleg" bitsize="64"/> - <reg name="hideleg" bitsize="64"/> - <reg name="hie" bitsize="64"/> - <reg name="htvec" bitsize="64"/> - <reg name="hscratch" bitsize="64"/> - <reg name="hepc" bitsize="64"/> - <reg name="hcause" bitsize="64"/> - <reg name="hbadaddr" bitsize="64"/> - <reg name="hip" bitsize="64"/> - <reg name="mbase" bitsize="64"/> - <reg name="mbound" bitsize="64"/> - <reg name="mibase" bitsize="64"/> - <reg name="mibound" bitsize="64"/> - <reg name="mdbase" bitsize="64"/> - <reg name="mdbound" bitsize="64"/> - <reg name="mucounteren" bitsize="64"/> - <reg name="mscounteren" bitsize="64"/> - <reg name="mhcounteren" bitsize="64"/> -</feature> --2.25.1