Re: [RFC v4 68/70] target/riscv: gdb: modify gdb csr xml file to align with csr register map

[Richard Henderson]

On 8/17/20 1:49 AM, frank.ch...@sifive.com wrote:
> From: Hsiangkai Wang 
> 
> Signed-off-by: Hsiangkai Wang 
> Signed-off-by: Frank Chang 
> ---
>  gdb-xml/riscv-32bit-csr.xml | 11 ++-
>  gdb-xml/riscv-64bit-csr.xml | 11 ++-
>  target/riscv/gdbstub.c  |  4 ++--
>  3 files changed, 14 insertions(+), 12 deletions(-)

Looks ok, from a quick glance.

I do think that this could stand to be auto-generated as well, from an extended
csr_ops table.  Extended in that you'd want to include the name and the isa bit
to which the register applies.

I'll let Alistair weigh in on this.  But either way,
Acked-by: Richard Henderson 


r~

[RFC v4 68/70] target/riscv: gdb: modify gdb csr xml file to align with csr register map

[frank . chang]

From: Hsiangkai Wang 

Signed-off-by: Hsiangkai Wang 
Signed-off-by: Frank Chang 
---
 gdb-xml/riscv-32bit-csr.xml | 11 ++-
 gdb-xml/riscv-64bit-csr.xml | 11 ++-
 target/riscv/gdbstub.c  |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gdb-xml/riscv-32bit-csr.xml b/gdb-xml/riscv-32bit-csr.xml
index da1bf19e2f4..3d2031da7dc 100644
--- a/gdb-xml/riscv-32bit-csr.xml
+++ b/gdb-xml/riscv-32bit-csr.xml
@@ -110,6 +110,8 @@
   
   
   
+  
+  
   
   
   
@@ -232,12 +234,11 @@
   
   
   
-  
-  
-  
-  
-  
+  
+  
   
+  
+  
   
   
   
diff --git a/gdb-xml/riscv-64bit-csr.xml b/gdb-xml/riscv-64bit-csr.xml
index 6aa4bed9f50..90394562930 100644
--- a/gdb-xml/riscv-64bit-csr.xml
+++ b/gdb-xml/riscv-64bit-csr.xml
@@ -110,6 +110,8 @@
   
   
   
+  
+  
   
   
   
@@ -232,12 +234,11 @@
   
   
   
-  
-  
-  
-  
-  
+  
+  
   
+  
+  
   
   
   
diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c
index eba12a86f2e..f7c5212e274 100644
--- a/target/riscv/gdbstub.c
+++ b/target/riscv/gdbstub.c
@@ -418,13 +418,13 @@ void riscv_cpu_register_gdb_regs_for_features(CPUState 
*cs)
 }
 #if defined(TARGET_RISCV32)
 gdb_register_coprocessor(cs, riscv_gdb_get_csr, riscv_gdb_set_csr,
- 240, "riscv-32bit-csr.xml", 0);
+ 241, "riscv-32bit-csr.xml", 0);
 
 gdb_register_coprocessor(cs, riscv_gdb_get_virtual, riscv_gdb_set_virtual,
  1, "riscv-32bit-virtual.xml", 0);
 #elif defined(TARGET_RISCV64)
 gdb_register_coprocessor(cs, riscv_gdb_get_csr, riscv_gdb_set_csr,
- 240, "riscv-64bit-csr.xml", 0);
+ 241, "riscv-64bit-csr.xml", 0);
 
 gdb_register_coprocessor(cs, riscv_gdb_get_virtual, riscv_gdb_set_virtual,
  1, "riscv-64bit-virtual.xml", 0);
-- 
2.17.1