[binutils-gdb] gdb: xtensa: fix register counters for xtensa-linux

[Max Filippov <jcmvbkbc at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1a782351162b1158484923493b567231d1aec7d2

commit 1a782351162b1158484923493b567231d1aec7d2
Author: Max Filippov <jcmvbkbc@gmail.com>
Date:   Fri Nov 16 17:31:22 2018 -0800

    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:
---
 gdb/ChangeLog           | 6 ++++++
 gdb/xtensa-linux-tdep.c | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 18a2dbb..b0971d1 100644
--- 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 1764b95..796143c 100644
--- 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);