From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27675 invoked by alias); 19 Jul 2012 11:05:31 -0000 Received: (qmail 27555 invoked by uid 22791); 19 Jul 2012 11:05:28 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,SPF_FAIL,TW_FN X-Spam-Check-By: sourceware.org Received: from gbenson.demon.co.uk (HELO gbenson.demon.co.uk) (80.177.220.214) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 19 Jul 2012 11:05:05 +0000 Date: Thu, 19 Jul 2012 11:05:00 -0000 From: Gary Benson To: gdb-patches@sourceware.org Subject: [RFA 1/4 take 2] Improved linker-debugger interface Message-ID: <20120719110503.GB16185@redhat.com> Mail-Followup-To: gdb-patches@sourceware.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="ZInfyf7laFu/Kiw7" Content-Disposition: inline X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-07/txt/msg00332.txt.bz2 --ZInfyf7laFu/Kiw7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 446 Hi all, This patch encapsulates part of the probes API which the final patch in this series uses. It is basically the same as [1], updated with Jan's fixes from [2] and updated to cope with Sergio's changes in [3]. Cheers, Gary [1] http://www.cygwin.com/ml/gdb-patches/2012-07/msg00158.html [2] http://www.cygwin.com/ml/gdb-patches/2012-07/msg00246.html [3] http://www.cygwin.com/ml/gdb-patches/2012-07/msg00274.html -- http://gbenson.net/ --ZInfyf7laFu/Kiw7 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="rtld-stap-1.patch" Content-length: 2849 2012-07-19 Gary Benson * probe.h (get_probe_argument_count): New declaration. (evaluate_probe_argument): Likewise. * probe.c (get_probe_argument_count): New function. (evaluate_probe_argument): Likewise. (probe_safe_evaluate_at_pc): Use the above new functions. diff --git a/gdb/probe.h b/gdb/probe.h index 8d44ca2..1d29b87 100644 --- a/gdb/probe.h +++ b/gdb/probe.h @@ -214,6 +214,16 @@ 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. */ + +extern unsigned get_probe_argument_count (struct probe *probe); + +/* Evaluate argument N of the specified probe. N must be between 0 + inclusive and get_probe_argument_count exclusive. */ + +extern struct value *evaluate_probe_argument (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 @@ -632,28 +632,55 @@ info_probes_command (char *arg, int from_tty) /* See comments in probe.h. */ +unsigned +get_probe_argument_count (struct probe *probe) +{ + const struct sym_probe_fns *probe_fns; + + gdb_assert (probe->objfile != NULL); + gdb_assert (probe->objfile->sf != NULL); + + probe_fns = probe->objfile->sf->sym_probe_fns; + + gdb_assert (probe_fns != NULL); + + return probe_fns->sym_get_probe_argument_count (probe); +} + +/* See comments in probe.h. */ + +struct value * +evaluate_probe_argument (struct probe *probe, unsigned n) +{ + const struct sym_probe_fns *probe_fns; + + gdb_assert (probe->objfile != NULL); + gdb_assert (probe->objfile->sf != NULL); + + probe_fns = probe->objfile->sf->sym_probe_fns; + + gdb_assert (probe_fns != NULL); + + return probe_fns->sym_evaluate_probe_argument (probe, n); +} + +/* See comments in probe.h. */ + struct value * probe_safe_evaluate_at_pc (struct frame_info *frame, unsigned n) { struct probe *probe; - const struct sym_probe_fns *probe_fns; unsigned n_args; probe = find_probe_by_pc (get_frame_pc (frame)); if (!probe) return NULL; - gdb_assert (probe->objfile != NULL); - gdb_assert (probe->objfile->sf != NULL); - gdb_assert (probe->objfile->sf->sym_probe_fns != NULL); - - probe_fns = probe->objfile->sf->sym_probe_fns; - n_args = probe_fns->sym_get_probe_argument_count (probe); - + n_args = get_probe_argument_count (probe); if (n >= n_args) return NULL; - return probe_fns->sym_evaluate_probe_argument (probe, n); + return evaluate_probe_argument (probe, n); } /* See comment in probe.h. */ --ZInfyf7laFu/Kiw7--