2012-03-28 Pedro Alves <palves@redhat.com>

	* linux-ia64-low.c (ia64_regmap): Map IA64_EC_REGNUM to PT_AR_EC.
	(IA64_GR0_REGNUM, IA64_FR0_REGNUM)
	(IA64_FR1_REGNUM): New defines.
	(ia64_fetch_register): New.
	(the_low_target): Install it.
	* linux-low.h (struct linux_target_ops) <fetch_register>: New
	field.
	* linux-low.c (linux_fetch_registers): Try the
	the_low_target.fetch_register hook first.

	* linux-arm-low.c (the_low_target): Adjust.
	* linux-bfin-low.c (the_low_target): Adjust.
	* linux-cris-low.c (the_low_target): Adjust.
	* linux-crisv32-low.c (the_low_target): Adjust.
	* linux-m32r-low.c (the_low_target): Adjust.
	* linux-m68k-low.c (the_low_target): Adjust.
	* linux-mips-low.c (the_low_target): Adjust.
	* linux-ppc-low.c (the_low_target): Adjust.
	* linux-s390-low.c (the_low_target): Adjust.
	* linux-sh-low.c (the_low_target): Adjust.
	* linux-sparc-low.c (the_low_target): Adjust.
	* linux-tic6x-low.c (the_low_target): Adjust.
	* linux-x86-low.c (the_low_target): Adjust.
	* linux-xtensa-low.c (the_low_target): Adjust.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index c99505fba7eae8a47df32d6d988ccd6c35506342..8627aa9c4a7add8c45e1e221fdddb0686c59a7b9 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,30 @@
+2012-03-28  Pedro Alves  <palves@redhat.com>
+
+       * linux-ia64-low.c (ia64_regmap): Map IA64_EC_REGNUM to PT_AR_EC.
+       (IA64_GR0_REGNUM, IA64_FR0_REGNUM)
+       (IA64_FR1_REGNUM): New defines.
+       (ia64_fetch_register): New.
+       (the_low_target): Install it.
+       * linux-low.h (struct linux_target_ops) <fetch_register>: New
+       field.
+       * linux-low.c (linux_fetch_registers): Try the
+       the_low_target.fetch_register hook first.
+
+       * linux-arm-low.c (the_low_target): Adjust.
+       * linux-bfin-low.c (the_low_target): Adjust.
+       * linux-cris-low.c (the_low_target): Adjust.
+       * linux-crisv32-low.c (the_low_target): Adjust.
+       * linux-m32r-low.c (the_low_target): Adjust.
+       * linux-m68k-low.c (the_low_target): Adjust.
+       * linux-mips-low.c (the_low_target): Adjust.
+       * linux-ppc-low.c (the_low_target): Adjust.
+       * linux-s390-low.c (the_low_target): Adjust.
+       * linux-sh-low.c (the_low_target): Adjust.
+       * linux-sparc-low.c (the_low_target): Adjust.
+       * linux-tic6x-low.c (the_low_target): Adjust.
+       * linux-x86-low.c (the_low_target): Adjust.
+       * linux-xtensa-low.c (the_low_target): Adjust.
+
 2012-03-26  Pedro Alves  <palves@redhat.com>
 
        * server.c (handle_qxfer_libraries): Don't bail early if

diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
index 01208efc1ab9d0b1eec4c5b20de3c73c31473e10..bf1792bf9e08d1f6fd0a47ddfebfaebb9bffe884 100644 (file)
--- a/gdb/gdbserver/linux-arm-low.c
+++ b/gdb/gdbserver/linux-arm-low.c
@@ -837,6 +837,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   arm_cannot_fetch_register,
   arm_cannot_store_register,
+  NULL, /* fetch_register */
   arm_get_pc,
   arm_set_pc,
 

diff --git a/gdb/gdbserver/linux-bfin-low.c b/gdb/gdbserver/linux-bfin-low.c
index b6fe58a4c959f86d358b9b6921e12a51f38e982a..d5b0361181c05aa7af41b0d1baefa2af53289b48 100644 (file)
--- a/gdb/gdbserver/linux-bfin-low.c
+++ b/gdb/gdbserver/linux-bfin-low.c
@@ -97,6 +97,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   bfin_cannot_fetch_register,
   bfin_cannot_store_register,
+  NULL, /* fetch_register */
   bfin_get_pc,
   bfin_set_pc,
   bfin_breakpoint,

diff --git a/gdb/gdbserver/linux-cris-low.c b/gdb/gdbserver/linux-cris-low.c
index a399789cb71f010a0b1f0d835b5e2ab14d3b3b27..0c92e629d6757f1e5bad6c4980e6f17c3a11e218 100644 (file)
--- a/gdb/gdbserver/linux-cris-low.c
+++ b/gdb/gdbserver/linux-cris-low.c
@@ -115,6 +115,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   cris_cannot_fetch_register,
   cris_cannot_store_register,
+  NULL, /* fetch_register */
   cris_get_pc,
   cris_set_pc,
   (const unsigned char *) &cris_breakpoint,

diff --git a/gdb/gdbserver/linux-crisv32-low.c b/gdb/gdbserver/linux-crisv32-low.c
index e33372de25762c2b799dd5b43ba990fd589daa5b..1cc4cd10c18d1ec90695a8b8912c361226bfec4f 100644 (file)
--- a/gdb/gdbserver/linux-crisv32-low.c
+++ b/gdb/gdbserver/linux-crisv32-low.c
@@ -377,6 +377,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   NULL,
   NULL,
+  NULL, /* fetch_register */
   cris_get_pc,
   cris_set_pc,
   (const unsigned char *) &cris_breakpoint,

diff --git a/gdb/gdbserver/linux-ia64-low.c b/gdb/gdbserver/linux-ia64-low.c
index 875319051adfe9622337eab9537d48ad8555f5ae..c8fa603ec7d226a4efbd7cef4c80d284610759ab 100644 (file)
--- a/gdb/gdbserver/linux-ia64-low.c
+++ b/gdb/gdbserver/linux-ia64-low.c
@@ -256,7 +256,7 @@ static int ia64_regmap[] =
     -1, -1, -1, -1, -1, -1, -1, -1, -1,
     PT_AR_PFS,
     PT_AR_LC,
-    -1,                /* Not available: EC, the Epilog Count register */
+    PT_AR_EC,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -278,6 +278,48 @@ ia64_cannot_fetch_register (int regno)
   return 0;
 }
 
+/* GDB register numbers.  */
+#define IA64_GR0_REGNUM                0
+#define IA64_FR0_REGNUM                128
+#define IA64_FR1_REGNUM                129
+
+static int
+ia64_fetch_register (struct regcache *regcache, int regnum)
+{
+  /* r0 cannot be fetched but is always zero.  */
+  if (regnum == IA64_GR0_REGNUM)
+    {
+      const gdb_byte zero[8] = { 0 };
+
+      gdb_assert (sizeof (zero) == register_size (regnum));
+      supply_register (regcache, regnum, zero);
+      return 1;
+    }
+
+  /* fr0 cannot be fetched but is always zero.  */
+  if (regnum == IA64_FR0_REGNUM)
+    {
+      const gdb_byte f_zero[16] = { 0 };
+
+      gdb_assert (sizeof (f_zero) == register_size (regnum));
+      supply_register (regcache, regnum, f_zero);
+      return 1;
+    }
+
+  /* fr1 cannot be fetched but is always one (1.0).  */
+  if (regnum == IA64_FR1_REGNUM)
+    {
+      const gdb_byte f_one[16] =
+       { 0, 0, 0, 0, 0, 0, 0, 0x80, 0xff, 0xff, 0, 0, 0, 0, 0, 0 };
+
+      gdb_assert (sizeof (f_one) == register_size (regnum));
+      supply_register (regcache, regnum, f_one);
+      return 1;
+    }
+
+  return 0;
+}
+
 struct linux_target_ops the_low_target = {
   init_registers_ia64,
   ia64_num_regs,
@@ -285,4 +327,5 @@ struct linux_target_ops the_low_target = {
   NULL,
   ia64_cannot_fetch_register,
   ia64_cannot_store_register,
+  ia64_fetch_register,
 };

diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 8becf78cceac2095c7b01dacea0dbb196debb470..aea8d36794337dd078de02e518d2916454742b11 100644 (file)
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -4271,11 +4271,19 @@ linux_fetch_registers (struct regcache *regcache, int regno)
 
   if (regno == -1)
     {
+      if (the_low_target.fetch_register != NULL)
+       for (regno = 0; regno < the_low_target.num_regs; regno++)
+         (*the_low_target.fetch_register) (regcache, regno);
+
       all = regsets_fetch_inferior_registers (regcache);
-      usr_fetch_inferior_registers (regcache, regno, all);
+      usr_fetch_inferior_registers (regcache, -1, all);
     }
   else
     {
+      if (the_low_target.fetch_register != NULL
+         && (*the_low_target.fetch_register) (regcache, regno))
+       return;
+
       use_regsets = linux_register_in_regsets (regno);
       if (use_regsets)
        all = regsets_fetch_inferior_registers (regcache);

diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h
index 3aeae704055e3d16fd70806d60ab857f362f55d8..07eda12de1686ec5199214008d495f57eb6b4aa5 100644 (file)
--- a/gdb/gdbserver/linux-low.h
+++ b/gdb/gdbserver/linux-low.h
@@ -81,6 +81,14 @@ struct linux_target_ops
      store the register, and 2 if failure to store the register
      is acceptable.  */
   int (*cannot_store_register) (int);
+
+  /* Hook to fetch a register in some non-standard way.  Used for
+     example by backends that have read-only registers with hardcoded
+     values (e.g., IA64's gr0/fr0/fr1).  Returns true if register
+     REGNO was supplied, false if not, and we should fallback to the
+     standard ptrace methods.  */
+  int (*fetch_register) (struct regcache *regcache, int regno);
+
   CORE_ADDR (*get_pc) (struct regcache *regcache);
   void (*set_pc) (struct regcache *regcache, CORE_ADDR newpc);
   const unsigned char *breakpoint;

diff --git a/gdb/gdbserver/linux-m32r-low.c b/gdb/gdbserver/linux-m32r-low.c
index fd70cf2c4998355659a40f9d81f937e0c5f51840..29bb3f7cf01705a3c45049291e7cf46a59861ba1 100644 (file)
--- a/gdb/gdbserver/linux-m32r-low.c
+++ b/gdb/gdbserver/linux-m32r-low.c
@@ -94,6 +94,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   m32r_cannot_fetch_register,
   m32r_cannot_store_register,
+  NULL, /* fetch_register */
   m32r_get_pc,
   m32r_set_pc,
   (const unsigned char *) &m32r_breakpoint,

diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c
index a640e4c42c2699008f73b789d9c59bd2f1b68700..6769dac9afa6b6d0063b4641aeac4d732561da43 100644 (file)
--- a/gdb/gdbserver/linux-m68k-low.c
+++ b/gdb/gdbserver/linux-m68k-low.c
@@ -182,6 +182,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   m68k_cannot_fetch_register,
   m68k_cannot_store_register,
+  NULL, /* fetch_register */
   m68k_get_pc,
   m68k_set_pc,
   m68k_breakpoint,

diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c
index 1f584425a14f8f61279faf25fb270552d6125ebb..8e37298d118ddef4765590116a047d4b1bea8b8d 100644 (file)
--- a/gdb/gdbserver/linux-mips-low.c
+++ b/gdb/gdbserver/linux-mips-low.c
@@ -430,6 +430,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   mips_cannot_fetch_register,
   mips_cannot_store_register,
+  NULL, /* fetch_register */
   mips_get_pc,
   mips_set_pc,
   (const unsigned char *) &mips_breakpoint,

diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
index 518a59e27208899dc2984aecd4c48eaa5e055c40..ed254fac067c4dcaf60f89dd8c08edaf2f204945 100644 (file)
--- a/gdb/gdbserver/linux-ppc-low.c
+++ b/gdb/gdbserver/linux-ppc-low.c
@@ -613,6 +613,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   ppc_cannot_fetch_register,
   ppc_cannot_store_register,
+  NULL, /* fetch_register */
   ppc_get_pc,
   ppc_set_pc,
   (const unsigned char *) &ppc_breakpoint,

diff --git a/gdb/gdbserver/linux-s390-low.c b/gdb/gdbserver/linux-s390-low.c
index 8a327952434ea6888d7dc1444993fcd5368143a4..ea4620667cff2d071aa14126c9efb130578969b7 100644 (file)
--- a/gdb/gdbserver/linux-s390-low.c
+++ b/gdb/gdbserver/linux-s390-low.c
@@ -464,6 +464,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   s390_cannot_fetch_register,
   s390_cannot_store_register,
+  NULL, /* fetch_register */
   s390_get_pc,
   s390_set_pc,
   s390_breakpoint,

diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c
index e2537d607964ad5cceee2e53b9cfdc0d292c2d36..fbd67c657ee2a1413e225df8feaa19fa8d5c87c8 100644 (file)
--- a/gdb/gdbserver/linux-sh-low.c
+++ b/gdb/gdbserver/linux-sh-low.c
@@ -115,6 +115,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   sh_cannot_fetch_register,
   sh_cannot_store_register,
+  NULL, /* fetch_register */
   sh_get_pc,
   sh_set_pc,
   (const unsigned char *) &sh_breakpoint,

diff --git a/gdb/gdbserver/linux-sparc-low.c b/gdb/gdbserver/linux-sparc-low.c
index dc9c0ccad88035eeff29ef960755ff1b4e4c8fa6..04605877553c562874d9cdd77d67069e1be8e748 100644 (file)
--- a/gdb/gdbserver/linux-sparc-low.c
+++ b/gdb/gdbserver/linux-sparc-low.c
@@ -284,6 +284,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   sparc_cannot_fetch_register,
   sparc_cannot_store_register,
+  NULL, /* fetch_register */
   sparc_get_pc,
   /* No sparc_set_pc is needed.  */
   NULL,

diff --git a/gdb/gdbserver/linux-tic6x-low.c b/gdb/gdbserver/linux-tic6x-low.c
index db7c5a4ed625e65e18210d0a9a1791453bf6e967..69d538b4ad54fb0fc26dfcdf955201dfb51a9ada 100644 (file)
--- a/gdb/gdbserver/linux-tic6x-low.c
+++ b/gdb/gdbserver/linux-tic6x-low.c
@@ -324,6 +324,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   tic6x_cannot_fetch_register,
   tic6x_cannot_store_register,
+  NULL, /* fetch_register */
   tic6x_get_pc,
   tic6x_set_pc,
   (const unsigned char *) &tic6x_breakpoint,

diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
index b466b5d281ec2b2b4b07c9c3db9ade799b2d5b47..7feb72125add955b5144ce642afe6a3e79a9e685 100644 (file)
--- a/gdb/gdbserver/linux-x86-low.c
+++ b/gdb/gdbserver/linux-x86-low.c
@@ -2969,6 +2969,7 @@ struct linux_target_ops the_low_target =
   NULL,
   NULL,
   NULL,
+  NULL, /* fetch_register */
   x86_get_pc,
   x86_set_pc,
   x86_breakpoint,

diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c
index bf7f064ededa6b7578be112748790a4c9a309605..34370f98b4c4e02c633ad3a0a6f7799a765e17a2 100644 (file)
--- a/gdb/gdbserver/linux-xtensa-low.c
+++ b/gdb/gdbserver/linux-xtensa-low.c
@@ -183,6 +183,7 @@ struct linux_target_ops the_low_target = {
   NULL,
   0,
   0,
+  NULL, /* fetch_register */
   xtensa_get_pc,
   xtensa_set_pc,
   xtensa_breakpoint,