From patchwork Thu May 8 18:04:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Seitz X-Patchwork-Id: 847 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx20.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id 47A45360098 for ; Thu, 8 May 2014 11:04:52 -0700 (PDT) Received: by homiemail-mx20.g.dreamhost.com (Postfix, from userid 14314964) id 0AB92415E8B7B; Thu, 8 May 2014 11:04:52 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx20.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx20.g.dreamhost.com (Postfix) with ESMTPS id D117F4177EC35 for ; Thu, 8 May 2014 11:04:51 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:subject :content-type; q=dns; s=default; b=h2mLrO1hYfTUyQMlTkqffOGIC/bRB kiN6Vms6qKGXORtanrif1e8tyJLAtkch2IBsvoytV+0b/fnfqgWSRs62xrjfU/56 aCRhNILa0EuPcViE9ivqa/iz6+dH8P/ohv1MdWUlzFsJbGIYG32HhGjpDIb15tz6 VnmJznK0krEsi8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:subject :content-type; s=default; bh=yq/EIsL9B2M6Yuf6LxHOnGzq4RE=; b=te8 HfvKi0hpPwUrcJ+UmxxzpyXSGbTNvn0PrGe1Er5BeyWXZSRN1jCcstRDKaQGXyj9 KTBcqZO8yS4MQyUQGsp0lUcA9atowMvJxnZbhh3sHUrkNdeBLbwXWT2rLO1Im0Jp /nG0l7P+x6V+esHveW79tz25j1JrydRJALjJ8bK8= Received: (qmail 17645 invoked by alias); 8 May 2014 18:04:50 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 17636 invoked by uid 89); 8 May 2014 18:04:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 08 May 2014 18:04:48 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s48I4kL3007336 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 8 May 2014 14:04:46 -0400 Received: from valrhona.uglyboxes.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s48I4jme007593 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Thu, 8 May 2014 14:04:46 -0400 Message-ID: <536BC73D.1040609@redhat.com> Date: Thu, 08 May 2014 11:04:45 -0700 From: Keith Seitz User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: "gdb-patches@sourceware.org ml" Subject: [RFA 8/9] Explicit locations v2 - MI for explicit locations X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in Hi, As you might guess, this patch adds support to MI for using explicit locations instead of/in addition to linespecs: (gdb) -break-insert -m main -o +3 -s main.c -l my_label One not-so-obvious-but-important fact to note, this change permits dprintf to use explicit locations, too. Once again, since this patch adds new functionality, it includes tests. Keith ChangeLog 2014-05-08 Keith Seitz * mi/mi-cmd-break.c (mi_cmd_break_insert_1): Add support for explicit locations, options "-s", "-m", "-l", and "-o". testsuite/ChangeLog 2014-05-08 Keith Seitz * gdb.mi/mi-break.exp (test_explicit_breakpoints): New proc. (at toplevel): Call test_explicit_breakpoints. * gdb.mi/mi-dprintf.exp: Add tests for explicit dprintf breakpoints. * lib/mi-support.exp (mi_make_breakpoint): Add support for breakpoint conditions, "-cond". diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c index 93d62c8..9acc3b5 100644 --- a/gdb/mi/mi-cmd-break.c +++ b/gdb/mi/mi-cmd-break.c @@ -184,6 +184,8 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc) enum bptype type_wanted; struct event_location *location; struct breakpoint_ops *ops; + int is_explicit = 0; + struct explicit_location explicit; char *extra_string = NULL; enum opt @@ -191,6 +193,8 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc) HARDWARE_OPT, TEMP_OPT, CONDITION_OPT, IGNORE_COUNT_OPT, THREAD_OPT, PENDING_OPT, DISABLE_OPT, TRACEPOINT_OPT, + EXPLICIT_SOURCE_OPT, EXPLICIT_FUNC_OPT, + EXPLICIT_LABEL_OPT, EXPLICIT_LINE_OPT }; static const struct mi_opt opts[] = { @@ -202,6 +206,10 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc) {"f", PENDING_OPT, 0}, {"d", DISABLE_OPT, 0}, {"a", TRACEPOINT_OPT, 0}, + {"s", EXPLICIT_SOURCE_OPT, 1}, + {"m", EXPLICIT_FUNC_OPT, 1}, + {"l", EXPLICIT_LABEL_OPT, 1}, + {"o", EXPLICIT_LINE_OPT, 1}, { 0, 0, 0 } }; @@ -210,6 +218,8 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc) int oind = 0; char *oarg; + initialize_explicit_location (&explicit); + while (1) { int opt = mi_getopt ("-break-insert", argc, argv, @@ -242,16 +252,31 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc) case TRACEPOINT_OPT: tracepoint = 1; break; + case EXPLICIT_SOURCE_OPT: + is_explicit = 1; + explicit.source_filename = oarg; + break; + case EXPLICIT_FUNC_OPT: + is_explicit = 1; + explicit.function_name = oarg; + break; + case EXPLICIT_LABEL_OPT: + is_explicit = 1; + explicit.label_name = oarg; + break; + case EXPLICIT_LINE_OPT: + is_explicit = 1; + explicit.line_offset = linespec_parse_line_offset (oarg); + break; } } - if (oind >= argc) + if (oind >= argc && !is_explicit) error (_("-%s-insert: Missing "), dprintf ? "dprintf" : "break"); - address = argv[oind]; if (dprintf) { - int format_num = oind + 1; + int format_num = is_explicit ? oind : oind + 1; if (hardware || tracepoint) error (_("-dprintf-insert: does not support -h or -a")); @@ -260,11 +285,21 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc) extra_string = mi_argv_to_format (argv + format_num, argc - format_num); make_cleanup (xfree, extra_string); + address = argv[oind]; } else { - if (oind < argc - 1) - error (_("-break-insert: Garbage following ")); + if (is_explicit) + { + if (oind < argc) + error (_("-break-insert: Garbage following explicit location")); + } + else + { + if (oind < argc - 1) + error (_("-break-insert: Garbage following ")); + address = argv[oind]; + } } /* Now we have what we need, let's insert the breakpoint! */ @@ -293,7 +328,10 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc) ops = &bkpt_breakpoint_ops; } - location = string_to_event_location (&address, current_language); + if (is_explicit) + location = explicit_to_event_location (&explicit); + else + location = string_to_event_location (&address, current_language); make_cleanup (delete_event_location, location); create_breakpoint (get_current_arch (), location, condition, thread, diff --git a/gdb/testsuite/gdb.mi/mi-break.exp b/gdb/testsuite/gdb.mi/mi-break.exp index d9ab757..eae1393 100644 --- a/gdb/testsuite/gdb.mi/mi-break.exp +++ b/gdb/testsuite/gdb.mi/mi-break.exp @@ -305,6 +305,85 @@ proc test_breakpoint_commands {} { mi_expect_stop "exited-normally" "" "" "" "" "" "test hitting breakpoint with commands" } +# Test explicit breakpoints. These tests only test the MI portion of the +# code. In-depth testing of explicit breakpoints is accomplished in +# gdb.linespec tests. + +proc test_explicit_breakpoints {} { + global srcfile + global line_callee3_head line_callee4_head + global line_callee2_body line_main_body + + mi_delete_breakpoints + + # First check mixed explicit/parsed linespecs. + mi_gdb_test "-break-insert -m main $srcfile:$line_callee3_head" \ + ".*Garbage following explicit linespec" + + # Insert some breakpoints and list them + # Also, disable some so they do not interfere with other tests + # Tests: + # -break-insert -t -m main + # -break-insert -t -s basics.c -m callee2 + # -break-insert -t -s basics.c -o $line_callee3_head + # -break-insert -t -s srcfile -o $line_callee4_head + # -break-list + + set bps {} + lappend bps [mi_create_breakpoint "-t -m main" \ + "insert temp explicit breakpoint at -m main" \ + -func main -file ".*$srcfile" -line $line_main_body] + + lappend bps \ + [mi_create_breakpoint "-t -s $srcfile -m callee2" \ + "insert temp explicit breakpoint at -s $srcfile -m callee2" \ + -func callee2 -file ".*$srcfile" -line $line_callee2_body] + + lappend bps \ + [mi_create_breakpoint "-t -s $srcfile -o $line_callee3_head" \ + "insert temp explicit breakpoint at -s $srcfile -o $line_callee3_head" \ + -func callee3 -file ".*$srcfile" -line $line_callee3_head] + + lappend bps \ + [mi_create_breakpoint "-t -s \"$srcfile\" -o $line_callee4_head" \ + "insert temp explicit breakpoint at -s \"$srcfile\" -o $line_callee4_head" \ + -func callee4 -file ".*$srcfile" -line $line_callee4_head] + + mi_gdb_test "-break-list" "\\^done,[mi_make_breakpoint_table $bps]" \ + "list of explicit breakpoints" + + mi_gdb_test "-break-delete" \ + "\\^done" \ + "delete temp breakpoints" + + mi_create_breakpoint "-c \"intarg == 3\" -m callee2" \ + "insert explicit conditional breakpoint at -m callee2" \ + -func callee2 ".*$srcfile" -line $line_callee2_body \ + -cond "intarg == 3" + + # mi_create_breakpoint cannot deal with displaying canonical + # linespecs. + mi_gdb_test \ + "-break-insert -c \"foo == 3\" -s $srcfile -m main -l label" \ + ".*No symbol \"foo\" in current context.*" + + mi_gdb_test \ + "-break-insert -s foobar.c -offset 3" \ + ".*No source file named foobar.c.*" + + mi_gdb_test \ + "-break-insert -s $srcfile -m foobar" \ + ".*Function \"foobar\" not defined in \"$srcfile\".*" + + mi_gdb_test \ + "-break-insert -s $srcfile -m main -l foobar" \ + ".*No label \"foobar\" defined in function \"main\".*" + + mi_gdb_test \ + "-break-insert -s $srcfile" \ + ".*Source filename requires function, label, or line offset.*" +} + test_tbreak_creation_and_listing test_rbreak_creation_and_listing @@ -318,5 +397,7 @@ test_breakpoint_commands test_abreak_creation +test_explicit_breakpoints + mi_gdb_exit return 0 diff --git a/gdb/testsuite/gdb.mi/mi-dprintf.exp b/gdb/testsuite/gdb.mi/mi-dprintf.exp index d60d66c..403e54b 100644 --- a/gdb/testsuite/gdb.mi/mi-dprintf.exp +++ b/gdb/testsuite/gdb.mi/mi-dprintf.exp @@ -47,6 +47,13 @@ mi_gdb_test "[incr i]-dprintf-insert 29" \ "$i\\^error,msg=\"-dprintf-insert: Missing \"" "mi insert second breakpoint without format string" mi_gdb_test "-break-insert main" ".*" "mi insert breakpoint main" + +mi_gdb_test "-dprintf-insert -m main \"hello\"" \ + "\\^done,bkpt={.*}" "explicit dprintf at main" + +mi_gdb_test "-dprintf-insert -s $srcfile -o $dp_location1 \"hello\"" \ + "\\^done,bkpt={.*}" "explicit breakpoint at $srcfile:$dp_location1" + mi_delete_breakpoints set bps [mi_make_breakpoint -type dprintf -func foo -file ".*mi-dprintf.c" \ @@ -61,7 +68,7 @@ mi_gdb_test "[incr i]-dprintf-insert $dp_location1 \"arg=%d, g=%d\\n\" arg g" \ "$i\\^done,$bps" "mi insert dprintf dp_location1" set bps {} -lappend bps [mi_make_breakpoint -number 3 -type dprintf -func foo \ +lappend bps [mi_make_breakpoint -type dprintf -func foo \ -file ".*mi-dprintf.c" -fullname ".*mi-dprintf.c"] lappend bps [mi_make_breakpoint -type dprintf -func foo \ -file ".*mi-dprintf.c" -fullname ".*mi-dprintf.c" \ diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index ad58775..66290f1 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -2353,7 +2353,7 @@ proc mi_build_kv_pairs {attr_list {joiner ,}} { # # All arguments for the breakpoint may be specified using the options # number, type, disp, enabled, addr, func, file, fullanme, line, -# thread-groups, times, ignore, script, and original-location. +# thread-groups, cond, times, ignore, script, and original-location. # # Only if -script and -ignore are given will they appear in the output. # Otherwise, this procedure will skip them using ".*". @@ -2368,17 +2368,27 @@ proc mi_make_breakpoint {args} { parse_args {{number .*} {type .*} {disp .*} {enabled .*} {addr .*} {func .*} {file .*} {fullname .*} {line .*} {thread-groups \\\[.*\\\]} {times .*} {ignore 0} - {script ""} {original-location .*}} + {script ""} {original-location .*} {cond ""}} set attr_list {} foreach attr [list number type disp enabled addr func file \ - fullname line thread-groups times] { + fullname line thread-groups] { lappend attr_list $attr [set $attr] } set result "bkpt={[mi_build_kv_pairs $attr_list]" # There are always exceptions. + + # If COND is not preset, do not output it. + if {[string length $cond] > 0} { + append result "," + append result [mi_build_kv_pairs [list "cond" $cond]] + } + + append result "," + append result [mi_build_kv_pairs [list "times" ".*"]] + # If SCRIPT and IGNORE are not present, do not output them. if {$ignore != 0} { append result ","