From patchwork Thu Sep 26 11:12:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omair Javaid X-Patchwork-Id: 20592 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E647624687 for ; Thu, 26 Sep 2013 11:13:37 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id z20sf825488yhz.3 for ; Thu, 26 Sep 2013 04:13:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:in-reply-to:references :from:date:message-id:subject:to:cc:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=vzyvmgQUiydYN9IfKgzKk5uRkg58Vboo6CMrZWvZAyY=; b=kSwfbVgR+JtXM7EkJN0YoYrbspG8BODqgUwXd50bG614/dYAtZEwA+u4qDYPQs8RZ1 0isb092pEhHKrFQPgsIQex8e6ti82FGfqlGAqAtH0puLT7A4840gWPzVjqVcdn2qaE2V FTPLT8XI8AFmEhz9q3rBhN3a2bBuVeTU9K+7ZZme3dXc1Shpj9DA1UeMoOfnQxEApReH 1nk/epWR25ct2YPJuyHX3LUXkkLN9CkfsnaY2KnMN+Ber+3y1ycrj3TK5hpdmDc4AdWD nSdel2qEOWw5HF+uqhfEJS6eR4HZVyyhf3P2Q1AMVnDmnkqlPiB58rENCoEebl7EkQuv 1Jgw== X-Gm-Message-State: ALoCoQn4bQS+x1xzJrB1Ru0AhphwesWszzdwxo/+4LBM7rHL4etPMGTOyNLx2bBLkX9K+fnVY1+I X-Received: by 10.236.186.101 with SMTP id v65mr69914yhm.12.1380194017436; Thu, 26 Sep 2013 04:13:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.49.196 with SMTP id w4ls831729qen.71.gmail; Thu, 26 Sep 2013 04:13:37 -0700 (PDT) X-Received: by 10.220.66.210 with SMTP id o18mr151854vci.64.1380194017341; Thu, 26 Sep 2013 04:13:37 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id ug9si249208vcb.107.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 04:13:37 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id lf11so697544vcb.21 for ; Thu, 26 Sep 2013 04:13:07 -0700 (PDT) X-Received: by 10.52.107.226 with SMTP id hf2mr153264vdb.2.1380193987023; Thu, 26 Sep 2013 04:13:07 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp359714vcz; Thu, 26 Sep 2013 04:13:06 -0700 (PDT) X-Received: by 10.224.120.6 with SMTP id b6mr5547682qar.11.1380193986389; Thu, 26 Sep 2013 04:13:06 -0700 (PDT) Received: from mail-qe0-f48.google.com (mail-qe0-f48.google.com [209.85.128.48]) by mx.google.com with ESMTPS id k1si418967qeo.90.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 04:13:06 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.48 is neither permitted nor denied by best guess record for domain of omair.javaid@linaro.org) client-ip=209.85.128.48; Received: by mail-qe0-f48.google.com with SMTP id nd7so656225qeb.35 for ; Thu, 26 Sep 2013 04:13:06 -0700 (PDT) X-Received: by 10.49.104.5 with SMTP id ga5mr385444qeb.53.1380193985974; Thu, 26 Sep 2013 04:13:05 -0700 (PDT) MIME-Version: 1.0 Received: by 10.49.116.66 with HTTP; Thu, 26 Sep 2013 04:12:45 -0700 (PDT) In-Reply-To: <87k3icsln0.fsf@fleche.redhat.com> References: <87li4y7f69.fsf@fleche.redhat.com> <87k3icsln0.fsf@fleche.redhat.com> From: Omair Javaid Date: Thu, 26 Sep 2013 16:12:45 +0500 Message-ID: Subject: Re: [PATCH] testsuite/gdb.dwarf2: Enable dw2-error.exp tests for arm targets To: Tom Tromey Cc: gdb-patches@sourceware.org, Patch Tracking X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: omair.javaid@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , dw2-error.exp tests dwarf debug information version and passes if a valid version is found. Its not run for arm targets because this test has been written in x86 assembly language. A patch was submitted adding debug information written with arm assembly in dw2-error.2. Upstream suggestion was to re-write the test using dwarf assembler in order to make it architecture independent. This patch implements dw2-error.exp using dwarf assembler and removes dw2-error.S which is now redundant as every time test runs new dw2-error.S will be generated by dwarf assembler according to host architecture. This patch has been tested on x86_64 and arm machines. gdb/testsuite/ChangeLog: 2013-09-26 Omair Javaid * gdb.dwarf2/dw2-error.exp: Re-written using dwarf assembler * gdb.dwarf2/dw2-error.S: Delete gdb/testsuite/gdb.dwarf2/dw2-error.S | 160 -------------------------------- gdb/testsuite/gdb.dwarf2/dw2-error.exp | 27 +++++- 2 files changed, 23 insertions(+), 164 deletions(-) delete mode 100644 gdb/testsuite/gdb.dwarf2/dw2-error.S --- On 19 September 2013 23:37, Tom Tromey wrote: >>>>>> "Omair" == Omair Javaid writes: > > Omair> Can you kindly direct me to DWARF assembler and how can I use to write > Omair> the above testcase. > > The DWARF assembler is in gdb/testsuite/lib/dwarf.exp. > It has a large comment that explains most of how to use it; > plus a few specific comments next to some exported procs. > Search gdb.dwarf2 for Dwarf::assemble for some examples. > > In this case I think the test case is just testing that gdb reacts > properly when the DWARF has an invalid version. This is simple to do > with the assembler; just pass something unusual to the "cu" proc. > > Tom diff --git a/gdb/testsuite/gdb.dwarf2/dw2-error.S b/gdb/testsuite/gdb.dwarf2/dw2-error.S deleted file mode 100644 index 597753e..0000000 --- a/gdb/testsuite/gdb.dwarf2/dw2-error.S +++ /dev/null @@ -1,160 +0,0 @@ -/* Copyright (C) 2012-2013 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - - This was created using gcc -g -dA dw2-error.c, then hand-editing - it to change the DWARF version. - - */ - - .file "dw2-error.c" - .text -.Ltext0: - .globl main - .type main, @function -main: -.LFB0: - .file 1 "dw2-error.c" - # dw2-error.c:19 - .loc 1 19 0 - .cfi_startproc - # basic block 2 - pushq %rbp - .cfi_def_cfa_offset 16 - .cfi_offset 6, -16 - movq %rsp, %rbp - .cfi_def_cfa_register 6 - # dw2-error.c:20 - .loc 1 20 0 - movl $23, %eax - # dw2-error.c:21 - .loc 1 21 0 - popq %rbp - .cfi_def_cfa 7, 8 - ret - .cfi_endproc -.LFE0: - .size main, .-main -.Letext0: - .section .debug_info,"",@progbits -.Ldebug_info0: - .long 0x4e # Length of Compilation Unit Info - .value 0x99 # DWARF version number - .long .Ldebug_abbrev0 # Offset Into Abbrev. Section - .byte 0x8 # Pointer Size (in bytes) - .uleb128 0x1 # (DIE (0xb) DW_TAG_compile_unit) - .long .LASF0 # DW_AT_producer: "GNU C 4.6.3 20120306 (Red Hat 4.6.3-2) -mtune=generic -march=x86-64 -g" - .byte 0x1 # DW_AT_language - .long .LASF1 # DW_AT_name: "dw2-error.c" - .long .LASF2 # DW_AT_comp_dir: "/tmp" - .quad .Ltext0 # DW_AT_low_pc - .quad .Letext0 # DW_AT_high_pc - .long .Ldebug_line0 # DW_AT_stmt_list - .uleb128 0x2 # (DIE (0x2d) DW_TAG_subprogram) - # DW_AT_external - .long .LASF3 # DW_AT_name: "main" - .byte 0x1 # DW_AT_decl_file (dw2-error.c) - .byte 0x12 # DW_AT_decl_line - .long 0x4a # DW_AT_type - .quad .LFB0 # DW_AT_low_pc - .quad .LFE0 # DW_AT_high_pc - .uleb128 0x1 # DW_AT_frame_base - .byte 0x9c # DW_OP_call_frame_cfa - # DW_AT_GNU_all_call_sites - .uleb128 0x3 # (DIE (0x4a) DW_TAG_base_type) - .byte 0x4 # DW_AT_byte_size - .byte 0x5 # DW_AT_encoding - .ascii "int\0" # DW_AT_name - .byte 0 # end of children of DIE 0xb - .section .debug_abbrev,"",@progbits -.Ldebug_abbrev0: - .uleb128 0x1 # (abbrev code) - .uleb128 0x11 # (TAG: DW_TAG_compile_unit) - .byte 0x1 # DW_children_yes - .uleb128 0x25 # (DW_AT_producer) - .uleb128 0xe # (DW_FORM_strp) - .uleb128 0x13 # (DW_AT_language) - .uleb128 0xb # (DW_FORM_data1) - .uleb128 0x3 # (DW_AT_name) - .uleb128 0xe # (DW_FORM_strp) - .uleb128 0x1b # (DW_AT_comp_dir) - .uleb128 0xe # (DW_FORM_strp) - .uleb128 0x11 # (DW_AT_low_pc) - .uleb128 0x1 # (DW_FORM_addr) - .uleb128 0x12 # (DW_AT_high_pc) - .uleb128 0x1 # (DW_FORM_addr) - .uleb128 0x10 # (DW_AT_stmt_list) - .uleb128 0x17 # (DW_FORM_sec_offset) - .byte 0 - .byte 0 - .uleb128 0x2 # (abbrev code) - .uleb128 0x2e # (TAG: DW_TAG_subprogram) - .byte 0 # DW_children_no - .uleb128 0x3f # (DW_AT_external) - .uleb128 0x19 # (DW_FORM_flag_present) - .uleb128 0x3 # (DW_AT_name) - .uleb128 0xe # (DW_FORM_strp) - .uleb128 0x3a # (DW_AT_decl_file) - .uleb128 0xb # (DW_FORM_data1) - .uleb128 0x3b # (DW_AT_decl_line) - .uleb128 0xb # (DW_FORM_data1) - .uleb128 0x49 # (DW_AT_type) - .uleb128 0x13 # (DW_FORM_ref4) - .uleb128 0x11 # (DW_AT_low_pc) - .uleb128 0x1 # (DW_FORM_addr) - .uleb128 0x12 # (DW_AT_high_pc) - .uleb128 0x1 # (DW_FORM_addr) - .uleb128 0x40 # (DW_AT_frame_base) - .uleb128 0x18 # (DW_FORM_exprloc) - .uleb128 0x2117 # (DW_AT_GNU_all_call_sites) - .uleb128 0x19 # (DW_FORM_flag_present) - .byte 0 - .byte 0 - .uleb128 0x3 # (abbrev code) - .uleb128 0x24 # (TAG: DW_TAG_base_type) - .byte 0 # DW_children_no - .uleb128 0xb # (DW_AT_byte_size) - .uleb128 0xb # (DW_FORM_data1) - .uleb128 0x3e # (DW_AT_encoding) - .uleb128 0xb # (DW_FORM_data1) - .uleb128 0x3 # (DW_AT_name) - .uleb128 0x8 # (DW_FORM_string) - .byte 0 - .byte 0 - .byte 0 - .section .debug_aranges,"",@progbits - .long 0x2c # Length of Address Ranges Info - .value 0x2 # DWARF Version - .long .Ldebug_info0 # Offset of Compilation Unit Info - .byte 0x8 # Size of Address - .byte 0 # Size of Segment Descriptor - .value 0 # Pad to 16 byte boundary - .value 0 - .quad .Ltext0 # Address - .quad .Letext0-.Ltext0 # Length - .quad 0 - .quad 0 - .section .debug_line,"",@progbits -.Ldebug_line0: - .section .debug_str,"MS",@progbits,1 -.LASF0: - .string "GNU C 4.6.3 20120306 (Red Hat 4.6.3-2) -mtune=generic -march=x86-64 -g" -.LASF2: - .string "/tmp" -.LASF3: - .string "main" -.LASF1: - .string "dw2-error.c" - .ident "GCC: (GNU) 4.6.3 20120306 (Red Hat 4.6.3-2)" - .section .note.GNU-stack,"",@progbits diff --git a/gdb/testsuite/gdb.dwarf2/dw2-error.exp b/gdb/testsuite/gdb.dwarf2/dw2-error.exp index d0baeea..36596d2 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-error.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-error.exp @@ -20,14 +20,33 @@ if {![dwarf2_support]} { return 0 } -standard_testfile .S +standard_testfile .c dw2-error.S -# We can't use prepare_for_testing here because we need to check the -# 'file' command's output. -if {[build_executable $testfile.exp $testfile $srcfile {nodebug}]} { +# Make some DWARF for the test. +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + + cu 0 153 8 { + compile_unit {{language @DW_LANG_C}} + } +} + +if {[gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile}1.o \ + object {nodebug}] != ""} { + return -1 +} + +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} + gdb_exit gdb_start gdb_reinitialize_dir $srcdir/$subdir