From patchwork Fri Apr 25 01:33:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 672 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx22.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id 122F1360949 for ; Thu, 24 Apr 2014 18:36:48 -0700 (PDT) Received: by homiemail-mx22.g.dreamhost.com (Postfix, from userid 14314964) id B422F4EDFF50; Thu, 24 Apr 2014 18:36:47 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx22.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-mx22.g.dreamhost.com (Postfix) with ESMTPS id 614634EDFF4A for ; Thu, 24 Apr 2014 18:36:47 -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:cc :subject:references:in-reply-to:content-type :content-transfer-encoding; q=dns; s=default; b=h8eFjcGe3sJhbDUc jRSn8rAf/PJQNiXO8Hay02uztezB1q64/h9yOPOdi+an4Y/CLUSAbw2kMdm3rUO+ O5tuNefB2Kp5WGqxqnF6WHwUU9m366tbo5h9eHIc8+nj1R7ZyJcJeOugnNRLBq2m I+C8K7A2iwPws3inomPrNVnyBUI= 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:cc :subject:references:in-reply-to:content-type :content-transfer-encoding; s=default; bh=tzWcxz2FMT1bd96VzZpThq wMdLU=; b=hvsdWMyTv4y+oRdRhqJwTgBitxRNo5IC25rXS8rVkVr8IxsOIr2zB2 XM9QGZxAfxtoK3FfSh7e2PLAq9CEmfq5XBeCg9UTX92zIXzKwTkXLaAgDF1QCNKN chPzoyBWiqBBOuMuCNqc/KA6kzzjabYrbdQodn1hJColS558KXp+w= Received: (qmail 13801 invoked by alias); 25 Apr 2014 01:36:44 -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 13786 invoked by uid 89); 25 Apr 2014 01:36:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 25 Apr 2014 01:36:42 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1WdV49-0003Xm-MO from Yao_Qi@mentor.com ; Thu, 24 Apr 2014 18:36:37 -0700 Received: from SVR-ORW-FEM-06.mgc.mentorg.com ([147.34.97.120]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 24 Apr 2014 18:36:37 -0700 Received: from qiyao.dyndns.org (147.34.91.1) by SVR-ORW-FEM-06.mgc.mentorg.com (147.34.97.120) with Microsoft SMTP Server id 14.2.247.3; Thu, 24 Apr 2014 18:36:36 -0700 Message-ID: <5359BB87.7080905@codesourcery.com> Date: Fri, 25 Apr 2014 09:33:59 +0800 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Pedro Alves CC: Subject: Re: [PATCH] Compute the function length instead of hard coding it References: <1398343381-24249-1-git-send-email-yao@codesourcery.com> <535919EB.3050409@redhat.com> In-Reply-To: <535919EB.3050409@redhat.com> X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in On 04/24/2014 10:04 PM, Pedro Alves wrote: > if { $main_length == "" } { > return -1 > } > > after gdb_test_multiple, as $main_length is unknown on e.g., internal > error or timeout too. OK, let's do the check like this. > >> > +} >> > +# Calculate the size of the last instruction. Single instruction >> > +# shouldn't be longer than 10 bytes. > x86 has instructions longer than that, though it's not likely > we'll see them as last instruction. You want to disassemble two > instructions. So instead of having to hard code some number and > having to explain it in a comment, how about just asking GDB what > we want, with x/i ? That is: > > (gdb) x /2i main+72 > 0x45d854 : retq > 0x45d855: nopl (%rax) > "x /2i" is good to me. Here is the updated patch. diff --git a/gdb/testsuite/gdb.dwarf2/dwz.exp b/gdb/testsuite/gdb.dwarf2/dwz.exp index aa0ea7d..6872bde 100644 --- a/gdb/testsuite/gdb.dwarf2/dwz.exp +++ b/gdb/testsuite/gdb.dwarf2/dwz.exp @@ -22,10 +22,60 @@ if {![dwarf2_support]} { standard_testfile main.c dwz.S +if {[gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile}1.o \ + object {nodebug}] != ""} { + return -1 +} + +# Start GDB and load object file, compute the function length which is +# needed in the Dwarf Assembler below. + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile}1.o + +set main_length "" +set test "disassemble main" +gdb_test_multiple $test $test { + -re ".*$hex <\\+($decimal)>:\[^\r\n\]+\r\nEnd of assembler dump\.\r\n$gdb_prompt $" { + set main_length $expect_out(1,string) + pass $test + } +} + +if { $main_length == "" } { + # Bail out here, because we can't do the following tests if + # $main_length is unknown. + return -1 +} + +# Compute the size of the last instruction. + +set test "x/2i main+$main_length" +gdb_test_multiple $test $test { + -re ".*($hex) :\[^\r\n\]+\r\n\[ \]+($hex).*\.\r\n$gdb_prompt $" { + set start $expect_out(1,string) + set end $expect_out(2,string) + + set main_length [expr $main_length + $end - $start] + pass $test + } +} + +if { $main_length == "" } { + # Bail out here, because we can't do the following tests if + # $main_length is unknown. + return -1 +} + +gdb_exit + # Create the DWARF. set asm_file [standard_output_file $srcfile2] Dwarf::assemble $asm_file { declare_labels partial_label int_label int_label2 + global main_length extern main @@ -34,7 +84,7 @@ Dwarf::assemble $asm_file { subprogram { {name main} {low_pc main addr} - {high_pc "main + 10" addr} + {high_pc "main + $main_length" addr} } } } @@ -82,11 +132,17 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ - [list $srcfile $asm_file] {nodebug}] } { +if {[gdb_compile $asm_file ${binfile}2.o object {nodebug}] != ""} { + return -1 +} + +if {[gdb_compile [list ${binfile}1.o ${binfile}2.o] \ + "${binfile}" executable {}] != ""} { return -1 } +clean_restart ${testfile} + if ![runto_main] { return -1 }