From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16994 invoked by alias); 21 Aug 2013 15:02:43 -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 16980 invoked by uid 89); 21 Aug 2013 15:02:43 -0000 X-Spam-SWARE-Status: No, score=-7.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Wed, 21 Aug 2013 15:02:42 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7LF2cAA029147 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 21 Aug 2013 11:02:38 -0400 Received: from barimba (ovpn-113-142.phx2.redhat.com [10.3.113.142]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r7LF2a66009308 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Wed, 21 Aug 2013 11:02:37 -0400 From: Tom Tromey To: Yao Qi Cc: Subject: Re: [PATCH 1/2] Test case for entry values. References: <1376379586-24150-1-git-send-email-yao@codesourcery.com> <1376379586-24150-2-git-send-email-yao@codesourcery.com> <87wqnggt2i.fsf@fleche.redhat.com> <5214561B.4050202@codesourcery.com> Date: Wed, 21 Aug 2013 15:02:00 -0000 In-Reply-To: <5214561B.4050202@codesourcery.com> (Yao Qi's message of "Wed, 21 Aug 2013 13:54:35 +0800") Message-ID: <871u5nf5o3.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2013-08/txt/msg00585.txt.bz2 >>>>> "Yao" == Yao Qi writes: Tom> Will it still work on x86-64? Yao> Yes, it works. Yao> I didn't use "addr_size 4" at the beginning, but get the following Yao> error. Yao> gdb/testsuite/gdb.trace/entry-values-dw.S:19: Error: cannot represent relocation type BFD_RELOC_64 Yao> gdb/testsuite/gdb.trace/entry-values-dw.S:20: Error: cannot represent relocation type BFD_RELOC_64 Jan pointed out that the new "dwz.exp" has this failure. It seems to me that using 32 bit addresses in the DWARF can yield the wrong results for the test. What if the high bits matter? Yao> I also tried the following stuff, but it seems I can't pass Yao> $cu_addr_size correctly to cu. Yao> if [is_lp64_target] { Yao> set cu_addr_size 8 Yao> } else { Yao> set cu_addr_size 4 Yao> } Yao> ... Yao> cu {addr_size $cu_addr_size} { You need to use [list ...] instead. However, what do you think of the appended? It adds a "default" setting for addr_size. This seems to be what we usually want. Tom diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp index 5b19bb8..1d3eb03 100644 --- a/gdb/testsuite/lib/dwarf.exp +++ b/gdb/testsuite/lib/dwarf.exp @@ -684,8 +684,8 @@ namespace eval Dwarf { # default = 0 (32-bit) # version n - DWARF version number to emit # default = 4 - # addr_size n - the size of addresses, 32 or 64 - # default = 64 + # addr_size n - the size of addresses, 32, 64, or default + # default = default # fission 0|1 - boolean indicating if generating Fission debug info # default = 0 # BODY is Tcl code that emits the DIEs which make up the body of @@ -702,7 +702,7 @@ namespace eval Dwarf { # Establish the defaults. set is_64 0 set _cu_version 4 - set _cu_addr_size 8 + set _cu_addr_size default set fission 0 set section ".debug_info" set _abbrev_section ".debug_abbrev" @@ -716,6 +716,13 @@ namespace eval Dwarf { default { error "unknown option $name" } } } + if {$_cu_addr_size == "default"} { + if {[is_64_target]} { + set _cu_addr_size 8 + } else { + set _cu_addr_size 4 + } + } set _cu_offset_size [expr { $is_64 ? 8 : 4 }] if { $fission } { set section ".debug_info.dwo" @@ -767,8 +774,8 @@ namespace eval Dwarf { # default = 0 (32-bit) # version n - DWARF version number to emit # default = 4 - # addr_size n - the size of addresses, 32 or 64 - # default = 64 + # addr_size n - the size of addresses, 32, 64, or default + # default = default # fission 0|1 - boolean indicating if generating Fission debug info # default = 0 # SIGNATURE is the 64-bit signature of the type. @@ -788,7 +795,7 @@ namespace eval Dwarf { # Establish the defaults. set is_64 0 set _cu_version 4 - set _cu_addr_size 8 + set _cu_addr_size default set fission 0 set section ".debug_types" set _abbrev_section ".debug_abbrev" @@ -802,6 +809,13 @@ namespace eval Dwarf { default { error "unknown option $name" } } } + if {$_cu_addr_size == "default"} { + if {[is_64_target]} { + set _cu_addr_size 8 + } else { + set _cu_addr_size 4 + } + } set _cu_offset_size [expr { $is_64 ? 8 : 4 }] if { $fission } { set section ".debug_types.dwo" diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 1a1fac2..ab41da0 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1854,6 +1854,34 @@ gdb_caching_proc is_lp64_target { return 1 } +# Return 1 if target has 64 bit addresses. +# This cannot be decided simply from looking at the target string, +# as it might depend on externally passed compiler options like -m64. +gdb_caching_proc is_64_target { + set me "is_64_target" + + set src [standard_temp_file is64[pid].c] + set obj [standard_temp_file is64[pid].o] + + set f [open $src "w"] + puts $f "int function(void) { return 3; }" + puts $f "int dummy\[sizeof (&function) == 8 ? 1 : -1\];" + close $f + + verbose "$me: compiling testfile $src" 2 + set lines [gdb_compile $src $obj object {quiet}] + file delete $src + file delete $obj + + if ![string match "" $lines] then { + verbose "$me: testfile compilation failed, returning 0" 2 + return 0 + } + + verbose "$me: returning 1" 2 + return 1 +} + # Return 1 if target has x86_64 registers - either amd64 or x32. # x32 target identifies as x86_64-*-linux*, therefore it cannot be determined # just from the target string.