From patchwork Thu Apr 24 12:43:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 665 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 E594C3605A0 for ; Thu, 24 Apr 2014 05:46:04 -0700 (PDT) Received: by homiemail-mx20.g.dreamhost.com (Postfix, from userid 14314964) id 9CEFB413B8D83; Thu, 24 Apr 2014 05:46:04 -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 66E10413B8D6B for ; Thu, 24 Apr 2014 05:46:04 -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:from:to:subject:date:message-id:mime-version :content-type; q=dns; s=default; b=M8JCQYwi+jFStvv1++jDs/ggCg95x RMaFyuYebkiz+I/iHrBjOjrHKm7qX+Jysl2ejuK0n3FiE8QjbxUW/iDCNGMvc3LK 1OkrmlXWQaeY1iwcZ+asdUOQper+YJNIp4NITVVBkgl6uDWM5JlEjeiCQ2gXVnZx S+JT/MKXOmxZ7U= 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:from:to:subject:date:message-id:mime-version :content-type; s=default; bh=ZQAfB6MC2TIjENgSfB7B1Fmy+3E=; b=Moj 7afQMmuphL/b2WBMRLIH944jESZ8MHAzRESGQziUd1kJrSMNahnUCEF796do6az5 7qkcZD3QLav347lC1ZZYVZ6IHErzhKD9DuOXoJS+2ApDAeUQ1Phb83wkpQLPzItw uPNck+ZyUMNKK1OujOg2uOYNTndKGE3Bb3AVyu2Y= Received: (qmail 4714 invoked by alias); 24 Apr 2014 12:46:03 -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 4701 invoked by uid 89); 24 Apr 2014 12:46:02 -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; Thu, 24 Apr 2014 12:46:01 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1WdJ2L-0002Sn-C1 from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Thu, 24 Apr 2014 05:45:57 -0700 Received: from SVR-ORW-FEM-03.mgc.mentorg.com ([147.34.97.39]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 24 Apr 2014 05:45:57 -0700 Received: from qiyao.dyndns.org.com (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.2.247.3; Thu, 24 Apr 2014 05:45:56 -0700 From: Yao Qi To: Subject: [PATCH] Compute the function length instead of hard coding it Date: Thu, 24 Apr 2014 20:43:01 +0800 Message-ID: <1398343381-24249-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in In Dwarf::assemble in dwz.exp, 10 is hard-coded in it, subprogram { {name main} {low_pc main addr} {high_pc "main + 10" addr} } however, the length of main function varies on architectures. The hard-coded 10 here causes dwz.exp fails on some targets, such as nios2. This patch is to add some code to compute the length of function main, which is similar to what we are doing in entry-values.exp. gdb/testsuite: 2014-04-24 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 | 61 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.dwarf2/dwz.exp b/gdb/testsuite/gdb.dwarf2/dwz.exp index aa0ea7d..c19735f 100644 --- a/gdb/testsuite/gdb.dwarf2/dwz.exp +++ b/gdb/testsuite/gdb.dwarf2/dwz.exp @@ -22,10 +22,59 @@ 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 + } + -re ".*$gdb_prompt $" { + fail $test + # Bail out here, because we can't do the following tests if + # $main_length is unknown. + return -1 + } +} +# Calculate the size of the last instruction. Single instruction +# shouldn't be longer than 10 bytes. + +set test "disassemble main+$main_length,+10" +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 + } + -re ".*$gdb_prompt $" { + fail $test + # 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 +83,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 +131,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 }