From patchwork Mon Oct 6 00:42:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 3110 Received: (qmail 9551 invoked by alias); 6 Oct 2014 00:42:24 -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 9537 invoked by uid 89); 6 Oct 2014 00:42:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.0 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; Mon, 06 Oct 2014 00:42:21 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1XawNV-0003t6-Tl from Maciej_Rozycki@mentor.com ; Sun, 05 Oct 2014 17:42:18 -0700 Received: from localhost (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server (TLS) id 14.3.181.6; Mon, 6 Oct 2014 01:42:16 +0100 Date: Mon, 6 Oct 2014 01:42:10 +0100 From: "Maciej W. Rozycki" To: Joel Brobecker CC: , Rich Fuhler , Richard Sandiford Subject: [PATCH v2 2/2] Correct invalid assumptions made by (mostly) DWARF-2 tests In-Reply-To: Message-ID: References: <20120611182043.GA7597@adacore.com> User-Agent: Alpine 1.10 (DEB 962 2008-03-14) MIME-Version: 1.0 Joel, Here's the second change, to cover issues triggered by the MIPS ISA bit handling change, usually in tests that make artificial DWARF-2 records. Here are fixes for the problems, listed individually: * gdb.cp/expand-psymtabs-cxx.exp -- this test is debugging an object file and assuming addresses will be 0; with the ISA bit set code addresses are 1 instead: (gdb) PASS: gdb.cp/expand-psymtabs-cxx.exp: set language c++ p 'method(long)' $1 = {void (long)} 0x1 (gdb) FAIL: gdb.cp/expand-psymtabs-cxx.exp: before expand p method $2 = {void (long)} 0x1 (gdb) FAIL: gdb.cp/expand-psymtabs-cxx.exp: force expand p 'method(long)' $3 = {void (long)} 0x1 (gdb) FAIL: gdb.cp/expand-psymtabs-cxx.exp: after expand Fixed by matching any hex number, there's no value AFAICT for the test in matching 0 exactly, and I suppose the method's offset within section can be non-zero for some other reasons on other targets too. * gdb.cp/nsalias.exp -- this assumes instructions can be aligned arbitrarily and places code labels at odd addreses, setting the ISA bit and wreaking havoc: (gdb) PASS: gdb.cp/nsalias.exp: print outer::inner::innermost::x list outer::inner::innermost::foo Function "outer::inner::innermost::foo" not defined. (gdb) FAIL: gdb.cp/nsalias.exp: list outer::inner::innermost::foo break *outer::inner::innermost::foo No symbol "foo" in namespace "outer::inner::innermost". (gdb) FAIL: gdb.cp/nsalias.exp: setting breakpoint at *outer::inner::innermost::foo delete $bpnum No breakpoint number 6. (gdb) FAIL: gdb.cp/nsalias.exp: (outer::inner::innermost): delete $bpnum -- etc., etc... Fixed by aligning labels to 4; required by many processors. * gdb.dwarf2/dw2-canonicalize-type.exp, gdb.dwarf2/dw2-empty-pc-range.exp, gdb.dwarf2/pr11465.exp -- these assume an instruction and consequently a function can take as little as 1 byte, which makes it impossible to look up a code symbol by an address with the ISA bit set as the address is already beyond the end of the function: (gdb) ptype f No symbol "f" in current context. (gdb) FAIL: gdb.dwarf2/dw2-canonicalize-type.exp: ptype f (gdb) PASS: gdb.dwarf2/dw2-empty-pc-range.exp: empty range before CU load ptype realrange No symbol "realrange" in current context. (gdb) FAIL: gdb.dwarf2/dw2-empty-pc-range.exp: valid range after CU load (gdb) p N::c.C Cannot take address of method C. (gdb) FAIL: gdb.dwarf2/pr11465.exp: p N::c.C -- fixed by increasing the size of the function to 4 (perhaps code in gdb/mips-tdep.c could look up code symbols up to twice, with and failing that without the ISA bit set, but it seems wrong to me to implement specific handling for invalid code just to satisfy test cases that assume too much about the target). * gdb.dwarf2/dw2-case-insensitive.exp -- an artificial code label is created, but does not work because data (a `.align' pseudo-op in this case) follows and as a result the label has no MIPS16 or microMIPS annotation in the symbol table: (gdb) PASS: gdb.dwarf2/dw2-case-insensitive.exp: set case-sensitive off info functions fUnC_lang All functions matching regular expression "fUnC_lang": File file1.txt: foo FUNC_lang(void); Non-debugging symbols: 0x004006e0 FUNC_lang_start (gdb) FAIL: gdb.dwarf2/dw2-case-insensitive.exp: regexp case-sensitive off -- fixed by adding a `.insn' pseudo-op on MIPS targets; the pseudo-op marks data as instructions. * gdb.dwarf2/dw2-stack-boundary.exp -- the test case enables complaints and assumes none will be issued beyond ones explicitly arranged by the test case, however overlapping sections are noticed because now minimal symbols are looked up by `mips_adjust_dwarf2_addr' in DWARF-2 record processing: (gdb) set complaints 100 (gdb) PASS: gdb.dwarf2/dw2-stack-boundary.exp: set complaints 100 file ./dw2-stack-boundary Reading symbols from ./dw2-stack-boundary...location description stack underflow...location description stack overflow...unexpected overlap between: (A) section `.reginfo' from `.../gdb.dwarf2/dw2-stack-boundary' [0x0, 0x18) (B) section `*COM*' from `.../gdb.dwarf2/dw2-stack-boundary' [0x0, 0x0). Will ignore section B...unexpected overlap between: (A) section `.reginfo' from `.../gdb.dwarf2/dw2-stack-boundary' [0x0, 0x18) (B) section `*UND*' from `.../gdb.dwarf2/dw2-stack-boundary' [0x0, 0x0). Will ignore section B...unexpected overlap between: (A) section `.reginfo' from `.../gdb.dwarf2/dw2-stack-boundary' [0x0, 0x18) (B) section `*ABS*' from `.../gdb.dwarf2/dw2-stack-boundary' [0x0, 0x0). Will ignore section B...done. (gdb) FAIL: gdb.dwarf2/dw2-stack-boundary.exp: check partial symtab errors -- fixed by ignoring any extra noise as long as what we look for is found. OK to apply? 2014-10-06 Maciej W. Rozycki gdb/testsuite/ * gdb.cp/expand-psymtabs-cxx.exp: Accept any address of `method(long)', not just 0x0. * gdb.cp/nsalias.exp: Align code labels to 4. * gdb.dwarf2/dw2-canonicalize-type.S (main): Expand to 4-bytes. * gdb.dwarf2/dw2-empty-pc-range.S (main): Likewise. * gdb.dwarf2/pr11465.S (_ZN1N1cE): Likewise. * gdb.dwarf2/dw2-case-insensitive.c (START_INSNS): New macro. (cu_text_start, FUNC_lang_start): Use `START_INSNS'. * gdb.dwarf2/dw2-stack-boundary.exp: Accept noise in complaints. Maciej gdb-mips16-isa-bit-test-fix.diff Index: gdb-fsf-trunk-quilt/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp =================================================================== --- gdb-fsf-trunk-quilt.orig/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp 2014-10-02 07:56:23.000000000 +0100 +++ gdb-fsf-trunk-quilt/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp 2014-10-02 07:58:10.978958268 +0100 @@ -30,9 +30,9 @@ gdb_test_no_output "set language c++" # FAIL was: # $1 = {} 0 -gdb_test "p 'method(long)'" { = {void \(long\)} 0x0 } \ +gdb_test "p 'method(long)'" " = {void \\(long\\)} $hex " \ "before expand" -gdb_test "p method" { = {void \(long\)} 0x0 } \ +gdb_test "p method" " = {void \\(long\\)} $hex " \ "force expand" -gdb_test "p 'method(long)'" { = {void \(long\)} 0x0 } \ +gdb_test "p 'method(long)'" " = {void \\(long\\)} $hex " \ "after expand" Index: gdb-fsf-trunk-quilt/gdb/testsuite/gdb.cp/nsalias.exp =================================================================== --- gdb-fsf-trunk-quilt.orig/gdb/testsuite/gdb.cp/nsalias.exp 2014-10-02 07:56:23.000000000 +0100 +++ gdb-fsf-trunk-quilt/gdb/testsuite/gdb.cp/nsalias.exp 2014-10-02 07:58:10.978958268 +0100 @@ -153,20 +153,20 @@ Dwarf::assemble $asm_file { subprogram { {specification :$im_foo_label} - {low_pc 0x1 DW_FORM_addr} - {high_pc 0x2 DW_FORM_addr} + {low_pc 0x4 DW_FORM_addr} + {high_pc 0x7 DW_FORM_addr} } subprogram { {specification :$i_foo_label} - {low_pc 0x3 DW_FORM_addr} - {high_pc 0x4 DW_FORM_addr} + {low_pc 0x8 DW_FORM_addr} + {high_pc 0xb DW_FORM_addr} } subprogram { {specification :$o_foo_label} - {low_pc 0x5 DW_FORM_addr} - {high_pc 0x6 DW_FORM_addr} + {low_pc 0xc DW_FORM_addr} + {high_pc 0xf DW_FORM_addr} } } } Index: gdb-fsf-trunk-quilt/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.S =================================================================== --- gdb-fsf-trunk-quilt.orig/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.S 2014-10-02 07:56:23.000000000 +0100 +++ gdb-fsf-trunk-quilt/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.S 2014-10-02 07:58:10.978958268 +0100 @@ -15,7 +15,8 @@ .text .globl main -main: .byte 0 +main: + .dc.l 0 .Lmain_end: .section .debug_info debug_start: Index: gdb-fsf-trunk-quilt/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.c =================================================================== --- gdb-fsf-trunk-quilt.orig/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.c 2014-10-02 07:56:23.000000000 +0100 +++ gdb-fsf-trunk-quilt/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.c 2014-10-02 07:58:10.978958268 +0100 @@ -15,13 +15,22 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +/* Target-specific way of forcing an instruction label. */ +#ifdef __mips__ +#define START_INSNS asm (".insn"); +#else +#define START_INSNS +#endif + /* Use DW_LANG_Fortran90 for case insensitive DWARF. */ asm (".globl cu_text_start"); asm ("cu_text_start:"); +START_INSNS asm (".globl FUNC_lang_start"); asm (".p2align 4"); asm ("FUNC_lang_start:"); +START_INSNS void FUNC_lang (void) Index: gdb-fsf-trunk-quilt/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.S =================================================================== --- gdb-fsf-trunk-quilt.orig/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.S 2014-10-02 07:56:23.000000000 +0100 +++ gdb-fsf-trunk-quilt/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.S 2014-10-02 07:58:10.978958268 +0100 @@ -15,7 +15,7 @@ .text pc_start: - .byte 0 + .dc.l 0 pc_end: .section .debug_info Index: gdb-fsf-trunk-quilt/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp =================================================================== --- gdb-fsf-trunk-quilt.orig/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp 2014-10-02 07:56:23.000000000 +0100 +++ gdb-fsf-trunk-quilt/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp 2014-10-02 07:58:10.978958268 +0100 @@ -38,7 +38,7 @@ if [is_remote host] { } } gdb_test_no_output "set complaints 100" -gdb_test "file $binfile" {Reading symbols from .*\.\.\.location description stack underflow\.\.\.location description stack overflow\.\.\.done\.} "check partial symtab errors" +gdb_test "file $binfile" {Reading symbols from .*\.\.\.location description stack underflow\.\.\.location description stack overflow\.\.\..*done\.} "check partial symtab errors" gdb_test "p underflow" {Asked for position 0 of stack, stack only has 0 elements on it\.} gdb_test "p overflow" " = 2" Index: gdb-fsf-trunk-quilt/gdb/testsuite/gdb.dwarf2/pr11465.S =================================================================== --- gdb-fsf-trunk-quilt.orig/gdb/testsuite/gdb.dwarf2/pr11465.S 2014-10-02 07:56:23.000000000 +0100 +++ gdb-fsf-trunk-quilt/gdb/testsuite/gdb.dwarf2/pr11465.S 2014-10-02 07:58:10.978958268 +0100 @@ -39,7 +39,7 @@ text_start: _ZN1N1cE: /* Valid function must have non-empty PC range. */ - .byte 0 + .dc.l 0 text_end: .section .debug_info @@ -117,7 +117,8 @@ dieaf: .uleb128 0xe /* DW_TAG_const_typ dieb4: .uleb128 0xf /* DW_TAG_subprogram */ .4byte die95-d /* DW_AT_abstract_origin */ .4byte _ZN1N1cE /* DW_AT_low_pc */ - .4byte _ZN1N1cE + 1 /* DW_AT_high_pc */ + .4byte _ZN1N1cE + (text_end - text_start) + /* DW_AT_high_pc */ diec9: .uleb128 0x10 /* DW_TAG_subprogram */ .4byte die9f-d /* DW_AT_abstract_origin */ .byte 2f-1f /* DW_AT_location */ @@ -136,7 +137,8 @@ dieda: .uleb128 0x11 /* DW_TAG_subprogr .4byte .LASF8 /* DW_AT_name */ .4byte dief2-d /* DW_AT_type */ .4byte _ZN1N1cE /* DW_AT_low_pc */ - .4byte _ZN1N1cE + 1 /* DW_AT_high_pc */ + .4byte _ZN1N1cE + (text_end - text_start) + /* DW_AT_high_pc */ dief2: .uleb128 0x12 /* DW_TAG_base_type */ .byte 0x4 /* DW_AT_byte_size */ .byte 0x5 /* DW_AT_encoding */