[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 1/6] gdbstub: Check if gdb_regs is NULL
From: |
Akihiko Odaki |
Subject: |
[PATCH v5 1/6] gdbstub: Check if gdb_regs is NULL |
Date: |
Thu, 19 Oct 2023 19:10:23 +0900 |
cpu->gdb_regs may be NULL if no coprocessor is registered.
Fixes: 73c392c26b ("gdbstub: Replace gdb_regs with an array")
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
gdbstub/gdbstub.c | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c
index 1e96a71c0c..29540a0284 100644
--- a/gdbstub/gdbstub.c
+++ b/gdbstub/gdbstub.c
@@ -385,12 +385,14 @@ static const char *get_feature_xml(const char *p, const
char **newp,
xml,
g_markup_printf_escaped("<xi:include href=\"%s\"/>",
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, NULL);
@@ -430,10 +432,12 @@ static int gdb_read_register(CPUState *cpu, GByteArray
*buf, int 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;
@@ -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);
}
- 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;
--
2.42.0
- [PATCH v5 0/6] gdbstub and TCG plugin improvements, Akihiko Odaki, 2023/10/19
- [PATCH v5 1/6] gdbstub: Check if gdb_regs is NULL,
Akihiko Odaki <=
- [PATCH v5 2/6] hw/riscv: Use misa_mxl instead of misa_mxl_max, Akihiko Odaki, 2023/10/19
- [PATCH v5 3/6] target/riscv: Remove misa_mxl validation, Akihiko Odaki, 2023/10/19
- [PATCH v5 4/6] target/riscv: Move misa_mxl_max to class, Akihiko Odaki, 2023/10/19
- [PATCH v5 5/6] target/riscv: Validate misa_mxl_max only once, Akihiko Odaki, 2023/10/19
- [PATCH v5 6/6] plugins: Remove an extra parameter, Akihiko Odaki, 2023/10/19