gdb: xtensa: fix register counters for xtensa-linux

Commit 37d9e0623102 ("gdb: xtensa: handle privileged registers") changed
how the tdep->num_regs and tdep->num_pseudo_regs are calculated, but
didn't update these numbers in the gdbarch for the xtensa-linux target.
As a result xtensa-linux-gdb behaves as xtensa-elf-gdb and cannot
communicate with the linux gdbserver.
Fix tdep->num_pseudo_regs calculation and call set_gdbarch_num_regs and
set_gdbarch_num_pseudo_regs in xtensa_linux_init_abi.

gdb/
2019-01-13  Max Filippov  <jcmvbkbc@gmail.com>

	* xtensa-linux-tdep.c (xtensa_linux_init_abi): Update
	tdep->num_pseudo_regs. Add calls to set_gdbarch_num_regs and
	set_gdbarch_num_pseudo_regs.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 18a2dbb80143031e571437d4082968837a4a12dd..b0971d1bf1553f3b2ccc6a9e36389bc6d3238ca3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-13  Max Filippov  <jcmvbkbc@gmail.com>
+
+       * xtensa-linux-tdep.c (xtensa_linux_init_abi): Update
+       tdep->num_pseudo_regs. Add calls to set_gdbarch_num_regs and
+       set_gdbarch_num_pseudo_regs.
+
 2019-01-12  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
 
        * cli/cli-style.h (class cli_style_option): <add_setshow_commands>

diff --git a/gdb/xtensa-linux-tdep.c b/gdb/xtensa-linux-tdep.c
index 1764b953a00bafe5d1c02d5cde773558838ff316..796143c6699baf94b6e0c4bd5bb765af4536556e 100644 (file)
--- a/gdb/xtensa-linux-tdep.c
+++ b/gdb/xtensa-linux-tdep.c
@@ -101,7 +101,13 @@ xtensa_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
   if (tdep->num_nopriv_regs < tdep->num_regs)
-    tdep->num_regs = tdep->num_nopriv_regs;
+    {
+      tdep->num_pseudo_regs += tdep->num_regs - tdep->num_nopriv_regs;
+      tdep->num_regs = tdep->num_nopriv_regs;
+
+      set_gdbarch_num_regs (gdbarch, tdep->num_regs);
+      set_gdbarch_num_pseudo_regs (gdbarch, tdep->num_pseudo_regs);
+    }
 
   linux_init_abi (info, gdbarch);