From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@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 01:36:00 -0000 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> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2014-04/txt/msg00521.txt.bz2 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. -- Yao (齐尧) gdb/testsuite: 2014-04-25 Yao Qi * gdb.dwarf2/dwz.exp: Compile main.c to object. Restart GDB and compute the length of function main. Save it in $main_length. (Dwarf::assemble): Use $main_length instead of hard-coded 10. (top-level): Use gdb_compile to compile objects into executable and restart GDB. Remove invocation to prepare_for_testing. --- gdb/testsuite/gdb.dwarf2/dwz.exp | 62 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 3 deletions(-) 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 } -- 1.9.0