This fixes communication with gdb in the presence of type-5 (TIE state mapped on user registers) and type-7 (special case of masked registers) registers in the xtensa core config.
Cc: [email protected] Signed-off-by: Max Filippov <[email protected]> --- target/xtensa/helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c index c9a613270036..efb3cef12813 100644 --- a/target/xtensa/helper.c +++ b/target/xtensa/helper.c @@ -100,7 +100,9 @@ void xtensa_finalize_config(XtensaConfig *config) unsigned n_core_regs = 0; for (i = 0; config->gdb_regmap.reg[i].targno >= 0; ++i) { - if (config->gdb_regmap.reg[i].type != 6) { + if (config->gdb_regmap.reg[i].type != 5 && + config->gdb_regmap.reg[i].type != 6 && + config->gdb_regmap.reg[i].type != 7) { ++n_regs; if ((config->gdb_regmap.reg[i].flags & 0x1) == 0) { ++n_core_regs; -- 2.11.0
