[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 09/18] gdbstub: Use GDBFeature for GDBRegisterState
From: |
Akihiko Odaki |
Subject: |
[PATCH v7 09/18] gdbstub: Use GDBFeature for GDBRegisterState |
Date: |
Tue, 12 Sep 2023 16:11:55 +0900 |
Simplify GDBRegisterState by replacing num_regs and xml members with
one member that points to GDBFeature.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
gdbstub/gdbstub.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c
index a30ffdd6b8..7554318118 100644
--- a/gdbstub/gdbstub.c
+++ b/gdbstub/gdbstub.c
@@ -47,10 +47,9 @@
typedef struct GDBRegisterState {
int base_reg;
- int num_regs;
gdb_get_reg_cb get_reg;
gdb_set_reg_cb set_reg;
- const char *xml;
+ const GDBFeature *feature;
} GDBRegisterState;
GDBState gdbserver_state;
@@ -390,7 +389,7 @@ static const char *get_feature_xml(const char *p, const
char **newp,
g_ptr_array_add(
xml,
g_markup_printf_escaped("<xi:include href=\"%s\"/>",
- r->xml));
+ r->feature->xmlname));
}
g_ptr_array_add(xml, g_strdup("</target>"));
g_ptr_array_add(xml, NULL);
@@ -504,7 +503,7 @@ static int gdb_read_register(CPUState *cpu, GByteArray
*buf, int 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) {
+ if (r->base_reg <= reg && reg < r->base_reg + r->feature->num_regs) {
return r->get_reg(env, buf, reg - r->base_reg);
}
}
@@ -523,7 +522,7 @@ static int gdb_write_register(CPUState *cpu, uint8_t
*mem_buf, int 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) {
+ if (r->base_reg <= reg && reg < r->base_reg + r->feature->num_regs) {
return r->set_reg(env, mem_buf, reg - r->base_reg);
}
}
@@ -541,7 +540,7 @@ void gdb_register_coprocessor(CPUState *cpu,
for (i = 0; i < cpu->gdb_regs->len; i++) {
/* Check for duplicates. */
s = &g_array_index(cpu->gdb_regs, GDBRegisterState, i);
- if (strcmp(s->xml, feature->xmlname) == 0)
+ if (s->feature == feature)
return;
}
} else {
@@ -552,10 +551,9 @@ void gdb_register_coprocessor(CPUState *cpu,
g_array_set_size(cpu->gdb_regs, i + 1);
s = &g_array_index(cpu->gdb_regs, GDBRegisterState, i);
s->base_reg = cpu->gdb_num_regs;
- s->num_regs = feature->num_regs;
s->get_reg = get_reg;
s->set_reg = set_reg;
- s->xml = feature->xml;
+ s->feature = feature;
/* Add to end of list. */
cpu->gdb_num_regs += feature->num_regs;
--
2.42.0
- [PATCH v7 00/18] plugins: Allow to read registers, Akihiko Odaki, 2023/09/12
- [PATCH v7 01/18] gdbstub: Add num_regs member to GDBFeature, Akihiko Odaki, 2023/09/12
- [PATCH v7 02/18] gdbstub: Introduce gdb_find_static_feature(), Akihiko Odaki, 2023/09/12
- [PATCH v7 04/18] gdbstub: Introduce GDBFeatureBuilder, Akihiko Odaki, 2023/09/12
- [PATCH v7 03/18] hw/core/cpu: Replace gdb_core_xml_file with gdb_core_feature, Akihiko Odaki, 2023/09/12
- [PATCH v7 05/18] target/arm: Use GDBFeature for dynamic XML, Akihiko Odaki, 2023/09/12
- [PATCH v7 06/18] target/ppc: Use GDBFeature for dynamic XML, Akihiko Odaki, 2023/09/12
- [PATCH v7 07/18] target/riscv: Use GDBFeature for dynamic XML, Akihiko Odaki, 2023/09/12
- [PATCH v7 08/18] gdbstub: Use GDBFeature for gdb_register_coprocessor, Akihiko Odaki, 2023/09/12
- [PATCH v7 09/18] gdbstub: Use GDBFeature for GDBRegisterState,
Akihiko Odaki <=
- [PATCH v7 10/18] gdbstub: Simplify XML lookup, Akihiko Odaki, 2023/09/12
- [PATCH v7 11/18] hw/core/cpu: Remove gdb_get_dynamic_xml member, Akihiko Odaki, 2023/09/12
- [PATCH v7 12/18] gdbstub: Add members to identify registers to GDBFeature, Akihiko Odaki, 2023/09/12
- [PATCH v7 13/18] gdbstub: Expose functions to read registers, Akihiko Odaki, 2023/09/12
- [PATCH v7 14/18] cpu: Call plugin hooks only when ready, Akihiko Odaki, 2023/09/12
- [PATCH v7 15/18] plugins: Allow to read registers, Akihiko Odaki, 2023/09/12
- [PATCH v7 16/18] contrib/plugins: Allow to log registers, Akihiko Odaki, 2023/09/12
- [PATCH v7 17/18] plugins: Support C++, Akihiko Odaki, 2023/09/12