Patchwork [11/12] M68K Linux: Define regset structures.

login
register
mail settings
Submitter Andreas Arnez
Date May 26, 2014, 4:36 p.m.
Message ID <1401122208-2481-12-git-send-email-arnez@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/1157/
State New
Headers show

Comments

Andreas Arnez - May 26, 2014, 4:36 p.m.
gdb/
	* m68klinux-tdep.c: Include "regset.h".
	(m68k_linux_gregmap, m68k_linux_fpregmap): New register maps.
	(M68K_LINUX_GREGS_SIZE, M68K_LINUX_FPREGS_SIZE): New macros.
	(m68k_linux_gregset, m68k_linux_fpregset): New regsets.
	(m68k_linux_regset_from_core_section): New function.
	(m68k_linux_init_abi): Set regset_from_core_section gdbarch
	method.
---
 gdb/m68klinux-tdep.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
Yao Qi - May 27, 2014, 1:35 a.m.
On 05/27/2014 12:36 AM, Andreas Arnez wrote:
> +/* Return the appropriate register set for the core section identified
> +   by SECT_NAME and SECT_SIZE.  */
> +
> +static const struct regset *
> +m68k_linux_regset_from_core_section (struct gdbarch *gdbarch,
> +				     const char *sect_name,
> +				     size_t sect_size)
> +{
> +  if (strcmp (sect_name, ".reg") == 0
> +      && sect_size >= M68K_LINUX_GREGS_SIZE)
> +    return &m68k_linux_gregset;
> +
> +  if (strcmp (sect_name, ".reg2") == 0
> +      && sect_size >= M68K_LINUX_FPREGS_SIZE)
> +    return &m68k_linux_fpregset;
> +
> +  return NULL;
> +}
> +
>  static void
>  m68k_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
>  {
> @@ -361,6 +422,10 @@ m68k_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
>  
>    set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
>  
> +  /* Core file support. */
> +  set_gdbarch_regset_from_core_section
> +    (gdbarch, m68k_linux_regset_from_core_section);
> +

Is it intended to include this change in this patch? or it should go
to the next patch series?
Andreas Arnez - May 27, 2014, 8:51 a.m.
On Tue, May 27 2014, Yao Qi wrote:

> On 05/27/2014 12:36 AM, Andreas Arnez wrote:
>> +/* Return the appropriate register set for the core section identified
>> +   by SECT_NAME and SECT_SIZE.  */
>> +
>> +static const struct regset *
>> +m68k_linux_regset_from_core_section (struct gdbarch *gdbarch,
>> +				     const char *sect_name,
>> +				     size_t sect_size)
>> +{
>> +  if (strcmp (sect_name, ".reg") == 0
>> +      && sect_size >= M68K_LINUX_GREGS_SIZE)
>> +    return &m68k_linux_gregset;
>> +
>> +  if (strcmp (sect_name, ".reg2") == 0
>> +      && sect_size >= M68K_LINUX_FPREGS_SIZE)
>> +    return &m68k_linux_fpregset;
>> +
>> +  return NULL;
>> +}
>> +
>>  static void
>>  m68k_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
>>  {
>> @@ -361,6 +422,10 @@ m68k_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
>>  
>>    set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
>>  
>> +  /* Core file support. */
>> +  set_gdbarch_regset_from_core_section
>> +    (gdbarch, m68k_linux_regset_from_core_section);
>> +
>
> Is it intended to include this change in this patch? or it should go
> to the next patch series?

It is intended here, such that the register sets are actually used by
linux_nat_collect_thread_registers and get_core_register_section.

If I didn't miss anything, M68K and IA64 were the only Linux targets
without regset_from_core_section gdbarch methods before.  After the
patch series all Linux targets should have them, and all their regsets
should have supply- *and* collect methods.
Yao Qi - May 27, 2014, 12:46 p.m.
On 05/27/2014 04:51 PM, Andreas Arnez wrote:
> It is intended here, such that the register sets are actually used by
> linux_nat_collect_thread_registers and get_core_register_section.
> 
> If I didn't miss anything, M68K and IA64 were the only Linux targets
> without regset_from_core_section gdbarch methods before.  After the
> patch series all Linux targets should have them, and all their regsets
> should have supply- *and* collect methods.

I have no comments then.

Patch

diff --git a/gdb/m68klinux-tdep.c b/gdb/m68klinux-tdep.c
index f6fed38..8967d28 100644
--- a/gdb/m68klinux-tdep.c
+++ b/gdb/m68klinux-tdep.c
@@ -38,6 +38,7 @@ 
 #include "observer.h"
 #include "elf/common.h"
 #include "linux-tdep.h"
+#include "regset.h"
 
 /* Offsets (in target ints) into jmp_buf.  */
 
@@ -327,6 +328,66 @@  static const struct frame_unwind m68k_linux_sigtramp_frame_unwind =
   m68k_linux_sigtramp_frame_sniffer
 };
 
+/* Register maps for supply/collect regset functions.  */
+
+static const struct regcache_map_entry m68k_linux_gregmap[] =
+  {
+    { 7, M68K_D1_REGNUM },	/* d1 ... d7 */
+    { 7, M68K_A0_REGNUM },	/* a0 ... a6 */
+    { 1, M68K_D0_REGNUM },
+    { 1, M68K_SP_REGNUM },
+    { 4, REGCACHE_MAP_SKIP_BYTES }, /* orig_d0 (skip) */
+    { 1, M68K_PS_REGNUM },
+    { 1, M68K_PC_REGNUM },
+    { 0 }
+  };
+
+#define M68K_LINUX_GREGS_SIZE (19 * 4)
+
+static const struct regcache_map_entry m68k_linux_fpregmap[] =
+  {
+    { 8, M68K_FP0_REGNUM },	/* fp0 ... fp7 */
+    { 1, M68K_FPC_REGNUM },
+    { 1, M68K_FPS_REGNUM },
+    { 1, M68K_FPI_REGNUM },
+    { 0 }
+  };
+
+#define M68K_LINUX_FPREGS_SIZE (27 * 4)
+
+/* Register sets. */
+
+static const struct regset m68k_linux_gregset =
+  {
+    m68k_linux_gregmap,
+    regcache_supply_regset, regcache_collect_regset
+  };
+
+static const struct regset m68k_linux_fpregset =
+  {
+    m68k_linux_fpregmap,
+    regcache_supply_regset, regcache_collect_regset
+  };
+
+/* Return the appropriate register set for the core section identified
+   by SECT_NAME and SECT_SIZE.  */
+
+static const struct regset *
+m68k_linux_regset_from_core_section (struct gdbarch *gdbarch,
+				     const char *sect_name,
+				     size_t sect_size)
+{
+  if (strcmp (sect_name, ".reg") == 0
+      && sect_size >= M68K_LINUX_GREGS_SIZE)
+    return &m68k_linux_gregset;
+
+  if (strcmp (sect_name, ".reg2") == 0
+      && sect_size >= M68K_LINUX_FPREGS_SIZE)
+    return &m68k_linux_fpregset;
+
+  return NULL;
+}
+
 static void
 m68k_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
@@ -361,6 +422,10 @@  m68k_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
   set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
 
+  /* Core file support. */
+  set_gdbarch_regset_from_core_section
+    (gdbarch, m68k_linux_regset_from_core_section);
+
   /* Enable TLS support.  */
   set_gdbarch_fetch_tls_load_module_address (gdbarch,
                                              svr4_fetch_objfile_link_map);