From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23930 invoked by alias); 12 Jul 2012 12:36:17 -0000 Received: (qmail 23837 invoked by uid 22791); 12 Jul 2012 12:36:16 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,SPF_FAIL,TW_BJ 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, 12 Jul 2012 12:35:55 +0000 Date: Thu, 12 Jul 2012 12:36:00 -0000 From: Gary Benson To: gdb-patches@sourceware.org Subject: [RFA 3/4] Improved linker-debugger interface Message-ID: <20120712123554.GD29236@redhat.com> Mail-Followup-To: gdb-patches@sourceware.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="lqaZmxkhekPBfBzr" Content-Disposition: inline In-Reply-To: <20120712123406.GA29236@redhat.com> 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/msg00158.txt.bz2 --lqaZmxkhekPBfBzr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 138 Hi all, This patch encapsulates part of the probes API which the final patch in this series uses. Cheers, Gary -- http://gbenson.net/ --lqaZmxkhekPBfBzr Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="rtld-stap-1.patch" Content-length: 2651 2012-07-12 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 @@ -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. */ + +extern unsigned get_probe_argument_count (struct objfile *objfile, + struct probe *probe); + +/* Evaluate argument N of the specified probe. */ + +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); +} + +/* 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. */ --lqaZmxkhekPBfBzr--