gdbstub: replace global gdb_has_xml with a function

Try and make the self reported global hack a little less hackish by
providing a query function instead. As gdb_has_xml was always set if
we negotiated XML we can now use the presence of ->target_xml as the
test instead.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230829161528.2707696-12-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2023-08-29 17:15:27 +01:00
parent 56e534bd11
commit d0e5fa849d
7 changed files with 19 additions and 18 deletions

View file

@ -48,7 +48,7 @@ int arm_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
}
if (n < 24) {
/* FPA registers. */
if (gdb_has_xml) {
if (gdb_has_xml()) {
return 0;
}
return gdb_get_zeroes(mem_buf, 12);
@ -56,7 +56,7 @@ int arm_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
switch (n) {
case 24:
/* FPA status register. */
if (gdb_has_xml) {
if (gdb_has_xml()) {
return 0;
}
return gdb_get_reg32(mem_buf, 0);
@ -102,7 +102,7 @@ int arm_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
}
if (n < 24) { /* 16-23 */
/* FPA registers (ignored). */
if (gdb_has_xml) {
if (gdb_has_xml()) {
return 0;
}
return 12;
@ -110,7 +110,7 @@ int arm_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
switch (n) {
case 24:
/* FPA status register (ignored). */
if (gdb_has_xml) {
if (gdb_has_xml()) {
return 0;
}
return 4;