This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [RFA 3/4] Improved linker-debugger interface
On Thu, 12 Jul 2012 14:35:54 +0200, Gary Benson wrote:
> --- a/gdb/probe.h
> +++ b/gdb/probe.h
> @@ -210,6 +210,17 @@ extern void info_probes_for_ops (char *arg, int from_tty,
>
> extern struct cmd_list_element **info_probes_cmdlist_get (void);
>
> +/* Return the argument count of the specified probe. */
/* OBJFILE must be known to have probes support. */
> +
> +extern unsigned get_probe_argument_count (struct objfile *objfile,
> + struct probe *probe);
> +
> +/* Evaluate argument N of the specified probe. */
/* OBJFILE must be known to have probes support. N must be between
0 inclusive and get_probe_argument_count exclusive. */
> +
> +extern struct value *evaluate_probe_argument (struct objfile *objfile,
> + struct probe *probe,
> + unsigned n);
> +
> /* A convenience function that finds a probe at the PC in FRAME and
> evaluates argument N, with 0 <= N < number_of_args. If there is no
> probe at that location, or if the probe does not have enough arguments,
> diff --git a/gdb/probe.c b/gdb/probe.c
> index 77f3b13..a61f4ea 100644
> --- a/gdb/probe.c
> +++ b/gdb/probe.c
> @@ -658,6 +658,30 @@ info_probes_command (char *arg, int from_tty)
>
> /* See comments in probe.h. */
>
> +unsigned
> +get_probe_argument_count (struct objfile *objfile, struct probe *probe)
> +{
> + gdb_assert (objfile->sf && objfile->sf->sym_probe_fns);
> +
> + return objfile->sf->sym_probe_fns->sym_get_probe_argument_count (objfile,
> + probe);
> +}
> +
> +/* See comments in probe.h. */
> +
> +struct value *
> +evaluate_probe_argument (struct objfile *objfile, struct probe *probe,
> + unsigned n)
> +{
> + gdb_assert (objfile->sf && objfile->sf->sym_probe_fns);
> +
> + return objfile->sf->sym_probe_fns->sym_evaluate_probe_argument (objfile,
> + probe,
> + n);
probe and n can be on single line, it is 76 columns [yes, it is copy-paste].
> +}
> +
> +/* See comments in probe.h. */
> +
> struct value *
> probe_safe_evaluate_at_pc (struct frame_info *frame, unsigned n)
> {
> @@ -668,17 +692,12 @@ probe_safe_evaluate_at_pc (struct frame_info *frame, unsigned n)
> probe = find_probe_by_pc (get_frame_pc (frame), &objfile);
> if (!probe)
> return NULL;
> - gdb_assert (objfile->sf && objfile->sf->sym_probe_fns);
>
> - n_probes
> - = objfile->sf->sym_probe_fns->sym_get_probe_argument_count (objfile,
> - probe);
> + n_probes = get_probe_argument_count (objfile, probe);
> if (n >= n_probes)
> return NULL;
>
> - return objfile->sf->sym_probe_fns->sym_evaluate_probe_argument (objfile,
> - probe,
> - n);
> + return evaluate_probe_argument (objfile, probe, n);
> }
>
> /* See comment in probe.h. */
It is pre-approved but please do not check it in without any use, only with
some other patch depending on it.
Thanks,
Jan