target/microblaze: Add GDB XML files for Microblaze
PATCH 1/1 target/microblaze: Add GDB XML files for Microblaze
This adds the Microblaze core and stack protect XML files, and also modifies the configuration to build those files.
--- configure | 1 + gdb-xml/microblaze-core.xml | 62 ++++++++++++++++++++++++++++++++++++ gdb-xml/microblaze-stack-protect.xml | 12 +++++++ target/microblaze/cpu.c | 1 + 4 files changed, 76 insertions(+) create mode 100644 gdb-xml/microblaze-core.xml create mode 100644 gdb-xml/microblaze-stack-protect.xml
configure +1 -0
@@ -7832,6 +7832,7 @@ case "$target_name" in TARGET_ARCH=microblaze TARGET_SYSTBL_ABI=common bflt="yes" + gdb_xml_files="microblaze-core.xml microblaze-stack-protect.xml" echo "TARGET_ABI32=y" >> $config_target_mak ;; mips|mipsel)
gdb-xml/microblaze-core.xml new file +62 -0
62 lines not on this page · raw message
gdb-xml/microblaze-stack-protect.xml new file +12 -0
@@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<!-- Copyright (C) 2014-2020 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.microblaze.stack-protect"> + <reg name="rslr" bitsize="32"/> + <reg name="rshr" bitsize="32"/> +</feature>
target/microblaze/cpu.c +1 -0
@@ -330,6 +330,7 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data) dc->vmsd = &vmstate_mb_cpu;device_class_set_props (dc, mb_properties); cc->gdb_num_core_regs =32 +27 ; + cc->gdb_core_xml_file ="microblaze-core.xml" ; cc->disas_set_info = mb_disas_set_info; cc->tcg_initialize = mb_tcg_init;
Signature · 1 line
2.7.4
cover target/microblaze: Add GDB XML files
Hi all,
This adds GDB XML files for Microblaze CPUs.
For Microblaze, it's split up into core and stack protect XML files.
Thanks!
Joe
Joe Komlodi (1):
target/microblaze: Add GDB XML files for Microblaze
configure | 1 + gdb-xml/microblaze-core.xml | 62 ++++++++++++++++++++++++++++++++++++ gdb-xml/microblaze-stack-protect.xml | 12 +++++++ target/microblaze/cpu.c | 1 + 4 files changed, 76 insertions(+) create mode 100644 gdb-xml/microblaze-core.xml create mode 100644 gdb-xml/microblaze-stack-protect.xml
Signature · 1 line
2.7.4
Re: [PATCH v1 0/1] target/microblaze: Add GDB XML files
Quoted 4 lines · Joe Komlodi
Hi all,
This adds GDB XML files for Microblaze CPUs.
For Microblaze, it's split up into core and stack protect XML files.
Hi Joe,
Can you please add a license header to microblaze-core.xml? I think you wrote this on your own but in case you took it from GDB (or if they actually are identical) we can keep GDB's permissive license?
We also need to register the stackprot xml withgdb_register_coprocessor().
I think you were right about lowering gdb_num_core_regs back to:
cc->gdb_num_core_regs = 32 + 25;
Things work even if we keep 32 + 27 but I think it's a little confusing. I've tried a version that uses:
cc->gdb_num_core_regs = 32 + 25;
And registers stack-prot:
gdb_register_coprocessor(cs, mb_sp_gdb_get_reg, mb_sp_gdb_set_reg,
2, "microblaze-stack-protect.xml", 32 + 25);
That works with GDB from upstream and with Xilinx XSDB. Vitis 2019.2 microblaze gdb thinks SLR/SHR are 64bit for some reason and doesn't handle them well with any QEMU version. We should probably talk to the Vitis folks about changing their version to match upstream GDB and XSDB.
I'm attaching the diff I used as reference.
Thanks,
Edgar
target/microblaze/cpu.h +2 -0
@@ -321,6 +321,8 @@ void mb_cpu_dump_state(CPUState *cpu, FILE *f, int flags);hwaddr mb_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr);int mb_cpu_gdb_read_register (CPUState *cpu,GByteArray *buf,int reg);int mb_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); +int mb_sp_gdb_get_reg (CPUMBState *env,GByteArray *buf,int n); +int mb_sp_gdb_set_reg (CPUMBState *env,uint8_t *buf,int n);void mb_tcg_init (void );/* you can call this signal handler from your SIGBUS and SIGSEGV
target/microblaze/cpu.c +5 -1
@@ -28,6 +28,7 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "exec/exec-all.h" +#include "exec/gdbstub.h" #include "fpu/softfloat-helpers.h" static const struct {
@@ -226,6 +227,9 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) env->pvr.regs[11 ] = (cpu->cfg.use_mmu ?PVR11_USE_MMU :0 ) |16 <<17 ; +gdb_register_coprocessor (cs, mb_sp_gdb_get_reg, mb_sp_gdb_set_reg, +2 ,"microblaze-stack-protect.xml" ,32 +25 ); + mcc->parent_realize (dev, errp); }
@@ -329,7 +333,7 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)#endif dc->vmsd = &vmstate_mb_cpu;device_class_set_props (dc, mb_properties); - cc->gdb_num_core_regs =32 +27 ; + cc->gdb_num_core_regs =32 +25 ; cc->gdb_core_xml_file ="microblaze-core.xml" ; cc->disas_set_info = mb_disas_set_info;
target/microblaze/gdbstub.c +36 -0
@@ -65,10 +65,12 @@ int mb_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)/* Other SRegs aren't modeled, so report a value of 0 */ case 19 ... 24:return gdb_get_reg32 (mem_buf,0 ); +#if 0 case 25 :return gdb_get_reg32 (mem_buf, env->slr);case 26 :return gdb_get_reg32 (mem_buf, env->shr); +#endif default :return 0 ; }
@@ -129,13 +131,47 @@ int mb_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)case 18 : env->sregs[SR_EDR ] = tmp;break ; +#if 0 case 25 : env->slr = tmp;break ;case 26 : env->shr = tmp;break ; +#endif } }return 4 ; } + +int mb_sp_gdb_get_reg (CPUMBState *env,GByteArray *buf,int n) +{ +printf ("%s: n=%d\n" , __func__, n); +switch (n) { +case 0 : +return gdb_get_reg32 (buf, env->slr); +case 1 : +return gdb_get_reg32 (buf, env->shr); +default : +return 0 ; + } +return 0 ; +} + +int mb_sp_gdb_set_reg (CPUMBState *env,uint8_t *buf,int n) +{ +uint32_t tmp; + + tmp =ldl_p (buf); + +printf ("%s: n=%d\n" , __func__, n); +switch (n) { +case 25 : + env->slr = tmp; +break ; +case 26 : + env->shr = tmp; +break ; + } +return 4 ; +}