From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26803 invoked by alias); 13 Jan 2014 16:57:21 -0000 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 Received: (qmail 26792 invoked by uid 89); 13 Jan 2014 16:57:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 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; Mon, 13 Jan 2014 16:57:20 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0DGvDSn002056 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 13 Jan 2014 11:57:13 -0500 Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0DGvAUM024638; Mon, 13 Jan 2014 11:57:11 -0500 Message-ID: <52D41AE6.8000005@redhat.com> Date: Mon, 13 Jan 2014 16:57:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: Andreas Arnez CC: gdb-patches@sourceware.org, Sergio Durigan Junior , Ulrich Weigand , Andreas Krebbel , Yao Qi Subject: Re: [PATCH] Fix regression on s390x with entry-values.exp References: <87a9ez4yuc.fsf@br87z6lw.de.ibm.com> In-Reply-To: <87a9ez4yuc.fsf@br87z6lw.de.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-SW-Source: 2014-01/txt/msg00321.txt.bz2 On 01/13/2014 04:43 PM, Andreas Arnez wrote: > The trace-specific test case 'entry-values' concludes fairly late in the > process that this platform doesn't support trace. Before that, there > are some platform specifics that don't work on s390x. The fix below > addresses two aspects: > > * Removal of an excess space character in the regex for the disassembly. > This is needed when there is a function alignment gap, because then > the hex address is immediately followed by a colon. Looks good to me, but can you paste/add the relevant disassemble snippet from the gdb.log, in the commit log? A picture is worth a thousand words. > * Handling for the s390-specific call instruction. > > -- > testsuite/ChangeLog > 2014-01-13 Andreas Arnez > > * gdb.trace/entry-values.exp: Remove excess space character from > regex patterns. Handle s390 call instruction. > > > Modified gdb/testsuite/gdb.trace/entry-values.exp > diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp > index 0fb35a0..f10ffa6 100644 > --- a/gdb/testsuite/gdb.trace/entry-values.exp > +++ b/gdb/testsuite/gdb.trace/entry-values.exp > @@ -57,7 +57,7 @@ gdb_test_multiple $test $test { > > set test "disassemble foo+$foo_length,+10" > gdb_test_multiple $test $test { > - -re ".*($hex) :\[^\r\n\]+\r\n\[ \]+($hex) .*\.\r\n$gdb_prompt $" { > + -re ".*($hex) :\[^\r\n\]+\r\n\[ \]+($hex).*\.\r\n$gdb_prompt $" { > set start $expect_out(1,string) > set end $expect_out(2,string) > > @@ -77,6 +77,8 @@ set bar_call_foo "" > > if { [istarget "arm*-*-*"] || [istarget "aarch64*-*-*"] } { > set call_insn "bl" > +} elseif { [istarget "s390*-*-*"] } { > + set call_insn "brasl" > } else { > set call_insn "call" > } > @@ -109,7 +111,7 @@ if { [string equal $bar_call_foo ""] || [string equal $bar_length ""] } { > > set test "disassemble bar+$bar_length,+10" > gdb_test_multiple $test $test { > - -re ".*($hex) :\[^\r\n\]+\r\n\[ \]+($hex) .*\.\r\n$gdb_prompt $" { > + -re ".*($hex) :\[^\r\n\]+\r\n\[ \]+($hex).*\.\r\n$gdb_prompt $" { > set start $expect_out(1,string) > set end $expect_out(2,string) > > -- Pedro Alves