|
@@ -385,12 +385,14 @@ static const char *get_feature_xml(const char *p, const char **newp,
|
|
xml,
|
|
xml,
|
|
g_markup_printf_escaped("<xi:include href=\"%s\"/>",
|
|
g_markup_printf_escaped("<xi:include href=\"%s\"/>",
|
|
cc->gdb_core_xml_file));
|
|
cc->gdb_core_xml_file));
|
|
- for (guint i = 0; i < cpu->gdb_regs->len; i++) {
|
|
|
|
- r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i);
|
|
|
|
- g_ptr_array_add(
|
|
|
|
- xml,
|
|
|
|
- g_markup_printf_escaped("<xi:include href=\"%s\"/>",
|
|
|
|
- r->xml));
|
|
|
|
|
|
+ if (cpu->gdb_regs) {
|
|
|
|
+ for (guint i = 0; i < cpu->gdb_regs->len; i++) {
|
|
|
|
+ r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i);
|
|
|
|
+ g_ptr_array_add(
|
|
|
|
+ xml,
|
|
|
|
+ g_markup_printf_escaped("<xi:include href=\"%s\"/>",
|
|
|
|
+ r->xml));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
g_ptr_array_add(xml, g_strdup("</target>"));
|
|
g_ptr_array_add(xml, g_strdup("</target>"));
|
|
g_ptr_array_add(xml, NULL);
|
|
g_ptr_array_add(xml, NULL);
|
|
@@ -430,10 +432,12 @@ static int gdb_read_register(CPUState *cpu, GByteArray *buf, int reg)
|
|
return cc->gdb_read_register(cpu, buf, reg);
|
|
return cc->gdb_read_register(cpu, buf, reg);
|
|
}
|
|
}
|
|
|
|
|
|
- for (guint i = 0; i < cpu->gdb_regs->len; i++) {
|
|
|
|
- r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i);
|
|
|
|
- if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) {
|
|
|
|
- return r->get_reg(env, buf, reg - r->base_reg);
|
|
|
|
|
|
+ if (cpu->gdb_regs) {
|
|
|
|
+ for (guint i = 0; i < cpu->gdb_regs->len; i++) {
|
|
|
|
+ r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i);
|
|
|
|
+ if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) {
|
|
|
|
+ return r->get_reg(env, buf, reg - r->base_reg);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
return 0;
|
|
@@ -449,10 +453,12 @@ static int gdb_write_register(CPUState *cpu, uint8_t *mem_buf, int reg)
|
|
return cc->gdb_write_register(cpu, mem_buf, reg);
|
|
return cc->gdb_write_register(cpu, mem_buf, reg);
|
|
}
|
|
}
|
|
|
|
|
|
- for (guint i = 0; i < cpu->gdb_regs->len; i++) {
|
|
|
|
- r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i);
|
|
|
|
- if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) {
|
|
|
|
- return r->set_reg(env, mem_buf, reg - r->base_reg);
|
|
|
|
|
|
+ if (cpu->gdb_regs) {
|
|
|
|
+ for (guint i = 0; i < cpu->gdb_regs->len; i++) {
|
|
|
|
+ r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i);
|
|
|
|
+ if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) {
|
|
|
|
+ return r->set_reg(env, mem_buf, reg - r->base_reg);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
return 0;
|