gdb: xtensa-linux: support THREADPTR register

Make THREADPTR user register accessible.

gdb/
2017-03-27  Max Filippov  <jcmvbkbc@gmail.com>

	* xtensa-linux-nat.c (fill_gregset): Call regcache_raw_collect
	for THREADPTR register.
	(supply_gregset_reg): Call regcache_raw_supply for THREADPTR
	register.
	* xtensa-tdep.c (XTENSA_DBREGN_UREG): New definition.
	(xtensa_derive_tdep): Initialize tdep->threadptr_regnum.
	* xtensa-tdep.h (gdbarch_tdep::threadptr_regnum): New field.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2cebe10b027ccc052860f2e01eac74c4638d556f..25fde723d47fe7261f2b173bd7435d94f2879df3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2017-03-27  Max Filippov  <jcmvbkbc@gmail.com>
+
+       * xtensa-linux-nat.c (fill_gregset): Call regcache_raw_collect
+       for THREADPTR register.
+       (supply_gregset_reg): Call regcache_raw_supply for THREADPTR
+       register.
+       * xtensa-tdep.c (XTENSA_DBREGN_UREG): New definition.
+       (xtensa_derive_tdep): Initialize tdep->threadptr_regnum.
+       * xtensa-tdep.h (gdbarch_tdep::threadptr_regnum): New field.
+
 2017-03-27  Max Filippov  <jcmvbkbc@gmail.com>
 
        * xtensa-tdep.c (xtensa_pseudo_register_read): Treat all

diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
index a4b001e86b9342e547ced715640dea9a8db08bd2..278168620c4b84ccb52315b25caa065f95a34756 100644 (file)
--- a/gdb/xtensa-linux-nat.c
+++ b/gdb/xtensa-linux-nat.c
@@ -82,6 +82,10 @@ fill_gregset (const struct regcache *regcache,
     regcache_raw_collect (regcache,
                          gdbarch_tdep (gdbarch)->sar_regnum,
                          &regs->sar);
+  if (regnum == gdbarch_tdep (gdbarch)->threadptr_regnum || regnum == -1)
+    regcache_raw_collect (regcache,
+                         gdbarch_tdep (gdbarch)->threadptr_regnum,
+                         &regs->threadptr);
   if (regnum >=gdbarch_tdep (gdbarch)->ar_base
       && regnum < gdbarch_tdep (gdbarch)->ar_base
                    + gdbarch_tdep (gdbarch)->num_aregs)
@@ -148,6 +152,10 @@ supply_gregset_reg (struct regcache *regcache,
     regcache_raw_supply (regcache,
                          gdbarch_tdep (gdbarch)->sar_regnum,
                          &regs->sar);
+  if (regnum == gdbarch_tdep (gdbarch)->threadptr_regnum || regnum == -1)
+    regcache_raw_supply (regcache,
+                         gdbarch_tdep (gdbarch)->threadptr_regnum,
+                         &regs->threadptr);
   if (regnum >=gdbarch_tdep (gdbarch)->ar_base
       && regnum < gdbarch_tdep (gdbarch)->ar_base
                    + gdbarch_tdep (gdbarch)->num_aregs)

diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index 2338ac10ea5be0ec49a95afef00d81e3c728c9fb..13f1514e7651e47a268ef809b1324167f1f759bd 100644 (file)
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -3107,6 +3107,8 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
 
 /* Special registers 0..255 (core).  */
 #define XTENSA_DBREGN_SREG(n)  (0x0200+(n))
+/* User registers 0..255.  */
+#define XTENSA_DBREGN_UREG(n)  (0x0300+(n))
 
   for (rmap = tdep->regmap, n = 0; rmap->target_number != -1; n++, rmap++)
     {
@@ -3138,6 +3140,8 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
        tdep->litbase_regnum = n;
       else if (rmap->target_number == XTENSA_DBREGN_SREG(230))
        tdep->ps_regnum = n;
+      else if (rmap->target_number == XTENSA_DBREGN_UREG(231))
+       tdep->threadptr_regnum = n;
 #if 0
       else if (rmap->target_number == XTENSA_DBREGN_SREG(226))
        tdep->interrupt_regnum = n;

diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h
index 46aeecb35567930ac1497df3dae09d5ffe57e9e1..986aa689f0cd30e2b7c311ab7e23c20f6b888787 100644 (file)
--- a/gdb/xtensa-tdep.h
+++ b/gdb/xtensa-tdep.h
@@ -204,6 +204,7 @@ struct gdbarch_tdep
   int lcount_regnum;
   int sar_regnum;              /* Register number of SAR.  */
   int litbase_regnum;          /* Register number of LITBASE.  */
+  int threadptr_regnum;                /* Register number of THREADPTR.  */
 
   int interrupt_regnum;                /* Register number for interrupt.  */
   int interrupt2_regnum;       /* Register number for interrupt2.  */