From: Max Filippov <jcmvbkbc@gmail.com>
Date: Thu, 16 Aug 2018 17:33:04 +0000 (-0700)
Subject: target/xtensa: fix gdbstub register counts
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2becc8fd7e6cbb69015ab7a2cbd21bba5a5ffbb9;p=qemu.git

target/xtensa: fix gdbstub register counts

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: qemu-stable@nongnu.org
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---

diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c
index c9a6132700..efb3cef128 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;