Ensure we either set gdb_num_core_regs or have a XML file. We shouldn't modify CPUClass content, so mark it const.
Reviewed-by: Pierrick Bouvier <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- gdbstub/gdbstub.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 90f4b95135b..221951c22b0 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -582,22 +582,20 @@ static const char *gdb_get_core_xml_file(CPUState *cpu) void gdb_init_cpu(CPUState *cpu) { - CPUClass *cc = cpu->cc; + const CPUClass *cc = cpu->cc; const GDBFeature *feature; const char *xmlfile = gdb_get_core_xml_file(cpu); cpu->gdb_regs = g_array_new(false, false, sizeof(GDBRegisterState)); if (xmlfile) { + assert(!cc->gdb_num_core_regs); feature = gdb_find_static_feature(xmlfile); gdb_register_feature(cpu, 0, cc->gdb_read_register, cc->gdb_write_register, feature); - assert(!cc->gdb_num_core_regs); cpu->gdb_num_regs = cpu->gdb_num_g_regs = feature->num_regs; - } - - if (cc->gdb_num_core_regs) { + } else { cpu->gdb_num_regs = cpu->gdb_num_g_regs = cc->gdb_num_core_regs; } } -- 2.53.0
