diff mbox

[6/6] Add a gdbarch 'print_auxv' method for FreeBSD ABIs.

Message ID 20160616060202.63470-7-jhb@FreeBSD.org
State New
Headers show

Commit Message

John Baldwin June 16, 2016, 6:02 a.m. UTC
Add a 'print_auxv' method for FreeBSD ABIs that parses FreeBSD-specific
auxiliary vector entries and outputs a suitable description using
fprint_single_auxv.

gdb/ChangeLog:

	* fbsd-tdep.c: Include "auxv.h".
	(fbsd_print_auxv): New function.
	(fbsd_init_abi): Install gdbarch "print_auxv" method.
---
 gdb/ChangeLog   |  6 ++++++
 gdb/fbsd-tdep.c | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

Comments

Pedro Alves June 20, 2016, 11:43 p.m. UTC | #1
On 06/16/2016 07:02 AM, John Baldwin wrote:

>  
> +static int
> +fbsd_print_auxv (struct gdbarch *gdbarch, struct ui_file *file, CORE_ADDR type,
> +		 CORE_ADDR val)

Missing intro comment.

> +{
> +  const char *name;
> +  const char *description;
> +  enum auxv_format flavor;
> +
> +  switch (type)
> +    {
> +#define _TAGNAME(tag) #tag
> +#define TAGNAME(tag) _TAGNAME(AT_##tag)
> +#define TAG(tag, text, kind) \
> +      case AT_FREEBSD_##tag: name = TAGNAME(tag); description = text; flavor = kind; break
> +      TAG (EXECPATH, _("Executable path"), str);
> +      TAG (CANARY, _("Canary for SSP"), hex);
> +      TAG (CANARYLEN, ("Length of the SSP canary"), dec);
> +      TAG (OSRELDATE, _("OSRELDATE"), dec);
> +      TAG (NCPUS, _("Number of CPUs"), dec);
> +      TAG (PAGESIZES, _("Pagesizes"), hex);
> +      TAG (PAGESIZESLEN, _("Number of pagesizes"), dec);
> +      TAG (TIMEKEEP, _("Pointer to timehands"), hex);
> +      TAG (STACKPROT, _("Initial stack protection"), hex);
> +    default:
> +      return (0);

Write:

      return 0;

However, with the suggestion in the previous patch, this would
be a direct call to default_print_auxv_entry.

> +    }
> +
> +  fprint_single_auxv (file, name, description, flavor, type, val);
> +  return (1);

  return 1;

Thanks,
Pedro Alves
diff mbox

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2426a2f..27d4620 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@ 
 2016-06-15  John Baldwin  <jhb@FreeBSD.org>
 
+	* fbsd-tdep.c: Include "auxv.h".
+	(fbsd_print_auxv): New function.
+	(fbsd_init_abi): Install gdbarch "print_auxv" method.
+
+2016-06-15  John Baldwin  <jhb@FreeBSD.org>
+
 	* auxv.c (fprint_single_auxv): New function.
 	(default_print_auxv): New function.
 	(fprint_target_auxv): Use gdbarch_print_auxv and default_print_auxv.
diff --git a/gdb/fbsd-tdep.c b/gdb/fbsd-tdep.c
index 7310ea0..8aca570 100644
--- a/gdb/fbsd-tdep.c
+++ b/gdb/fbsd-tdep.c
@@ -18,6 +18,7 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include "auxv.h"
 #include "gdbcore.h"
 #include "inferior.h"
 #include "regcache.h"
@@ -283,6 +284,37 @@  fbsd_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
   return note_data;
 }
 
+static int
+fbsd_print_auxv (struct gdbarch *gdbarch, struct ui_file *file, CORE_ADDR type,
+		 CORE_ADDR val)
+{
+  const char *name;
+  const char *description;
+  enum auxv_format flavor;
+
+  switch (type)
+    {
+#define _TAGNAME(tag) #tag
+#define TAGNAME(tag) _TAGNAME(AT_##tag)
+#define TAG(tag, text, kind) \
+      case AT_FREEBSD_##tag: name = TAGNAME(tag); description = text; flavor = kind; break
+      TAG (EXECPATH, _("Executable path"), str);
+      TAG (CANARY, _("Canary for SSP"), hex);
+      TAG (CANARYLEN, ("Length of the SSP canary"), dec);
+      TAG (OSRELDATE, _("OSRELDATE"), dec);
+      TAG (NCPUS, _("Number of CPUs"), dec);
+      TAG (PAGESIZES, _("Pagesizes"), hex);
+      TAG (PAGESIZESLEN, _("Number of pagesizes"), dec);
+      TAG (TIMEKEEP, _("Pointer to timehands"), hex);
+      TAG (STACKPROT, _("Initial stack protection"), hex);
+    default:
+      return (0);
+    }
+
+  fprint_single_auxv (file, name, description, flavor, type, val);
+  return (1);
+}
+
 /* To be called from GDB_OSABI_FREEBSD_ELF handlers. */
 
 void
@@ -291,4 +323,5 @@  fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   set_gdbarch_core_pid_to_str (gdbarch, fbsd_core_pid_to_str);
   set_gdbarch_core_thread_name (gdbarch, fbsd_core_thread_name);
   set_gdbarch_make_corefile_notes (gdbarch, fbsd_make_corefile_notes);
+  set_gdbarch_print_auxv (gdbarch, fbsd_print_auxv);
 }