target/riscv: Expose "priv" register for GDB
PATCH 1/1 target/riscv: Expose "priv" register for GDB
This patch enables a debugger to read and write the current privilege level via a special "priv" register. When compiled with CONFIG_USER_ONLY the register is still visible but is hardwired to zero.
--- gdb-xml/riscv-32bit-cpu.xml | 1 + gdb-xml/riscv-64bit-cpu.xml | 1 + target/riscv/cpu.c | 2 +- target/riscv/gdbstub.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 1 deletion(-)
gdb-xml/riscv-32bit-cpu.xml +1 -0
@@ -44,4 +44,5 @@ <reg name="t5" bitsize="32" type="int"/> <reg name="t6" bitsize="32" type="int"/> <reg name="pc" bitsize="32" type="code_ptr"/> + <reg name="priv" bitsize="32" type="int"/> </feature>
gdb-xml/riscv-64bit-cpu.xml +1 -0
@@ -44,4 +44,5 @@ <reg name="t5" bitsize="64" type="int"/> <reg name="t6" bitsize="64" type="int"/> <reg name="pc" bitsize="64" type="code_ptr"/> + <reg name="priv" bitsize="64" type="int" /> </feature>
target/riscv/cpu.c +1 -1
@@ -475,7 +475,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->synchronize_from_tb = riscv_cpu_synchronize_from_tb; cc->gdb_read_register = riscv_cpu_gdb_read_register; cc->gdb_write_register = riscv_cpu_gdb_write_register; - cc->gdb_num_core_regs =33 ; + cc->gdb_num_core_regs =34 ;#if defined(TARGET_RISCV32 ) cc->gdb_core_xml_file ="riscv-32bit-cpu.xml" ;#elif defined(TARGET_RISCV64 )
target/riscv/gdbstub.c +14 -0
@@ -278,6 +278,12 @@ int riscv_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)return gdb_get_regl (mem_buf, env->gpr[n]); }else if (n ==32 ) {return gdb_get_regl (mem_buf, env->pc); + }else if (n ==33 ) { +#ifdef CONFIG_USER_ONLY +return gdb_get_regl (mem_buf,0 ); +#else +return gdb_get_regl (mem_buf, env->priv); +#endif }return 0 ; }
@@ -296,6 +302,14 @@ int riscv_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) }else if (n ==32 ) { env->pc =ldtul_p (mem_buf);return sizeof (target_ulong); + }else if (n ==33 ) { +#ifndef CONFIG_USER_ONLY + env->priv =ldtul_p (mem_buf) &0x3 ; +if (env->priv ==2 ) { + env->priv =1 ; + } +#endif +return sizeof (target_ulong); }return 0 ; }
Signature · 1 line
2.23.0
Quoted 64 lines · Jonathan Behrens
This patch enables a debugger to read and write the current privilege level via a special "priv" register. When compiled with
CONFIG_USER_ONLYthe register is still visible but is hardwired to zero.Signed-off-by Jonathan Behrens <[email protected]>--- gdb-xml/riscv-32bit-cpu.xml | 1 + gdb-xml/riscv-64bit-cpu.xml | 1 + target/riscv/cpu.c | 2 +- target/riscv/gdbstub.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 1 deletion(-)gdb-xml/riscv-32bit-cpu.xml +1
-0@@ -44,4 +44,5 @@ <reg name="t5" bitsize="32" type="int"/> <reg name="t6" bitsize="32" type="int"/> <reg name="pc" bitsize="32" type="code_ptr"/> + <reg name="priv" bitsize="32" type="int"/> </feature>gdb-xml/riscv-64bit-cpu.xml +1
-0@@ -44,4 +44,5 @@ <reg name="t5" bitsize="64" type="int"/> <reg name="t6" bitsize="64" type="int"/> <reg name="pc" bitsize="64" type="code_ptr"/> + <reg name="priv" bitsize="64" type="int" /> </feature>target/riscv/cpu.c +1
-1@@ -475,7 +475,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->synchronize_from_tb = riscv_cpu_synchronize_from_tb; cc->gdb_read_register = riscv_cpu_gdb_read_register; cc->gdb_write_register = riscv_cpu_gdb_write_register; - cc->gdb_num_core_regs =33 ; + cc->gdb_num_core_regs =34 ;#if defined(TARGET_RISCV32 ) cc->gdb_core_xml_file ="riscv-32bit-cpu.xml" ;#elif defined(TARGET_RISCV64 )target/riscv/gdbstub.c +6
-0@@ -278,6 +278,12 @@ int riscv_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)return gdb_get_regl (mem_buf, env->gpr[n]); }else if (n ==32 ) {return gdb_get_regl (mem_buf, env->pc); + }else if (n ==33 ) { +#ifdef CONFIG_USER_ONLY +return gdb_get_regl (mem_buf,0 ); +#else +return gdb_get_regl (mem_buf, env->priv); +#endif }return 0 ; }
target/riscv/gdbstub.c int riscv_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) · line 308
Quoted 7 lines
target/riscv/gdbstub.c +4
-0@@ -296,6 +302,14 @@ int riscv_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) }else if (n ==32 ) { env->pc =ldtul_p (mem_buf);return sizeof (target_ulong); + }else if (n ==33 ) { +#ifndef CONFIG_USER_ONLY + env->priv =ldtul_p (mem_buf) &0x3 ; +if (env->priv ==2 ) {
Please use PRV_H
target/riscv/gdbstub.c int riscv_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) · line 309
Quoted 1 line
target/riscv/gdbstub.c +1
-0+ env->priv =1 ;
and PRV_S here
target/riscv/gdbstub.c int riscv_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
Quoted 7 lines
target/riscv/gdbstub.c +3
-1+ } +#endif +return sizeof (target_ulong); }return 0 ; } --
Regards,
Bin