From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1405 invoked by alias); 17 Dec 2007 18:43:04 -0000 Received: (qmail 1392 invoked by uid 22791); 17 Dec 2007 18:43:03 -0000 X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (65.74.133.4) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 17 Dec 2007 18:42:54 +0000 Received: (qmail 26444 invoked from network); 17 Dec 2007 18:42:52 -0000 Received: from unknown (HELO localhost) (jimb@127.0.0.2) by mail.codesourcery.com with ESMTPA; 17 Dec 2007 18:42:52 -0000 To: Vladimir Prus Cc: gdb-patches@sources.redhat.com Subject: Re: Support constants for DW_AT_data_member_location References: <200711291254.14423.vladimir@codesourcery.com> <200711292317.53967.vladimir@codesourcery.com> <200712132005.17970.vladimir@codesourcery.com> From: Jim Blandy Date: Mon, 17 Dec 2007 19:30:00 -0000 In-Reply-To: (Jim Blandy's message of "Thu, 13 Dec 2007 11:23:11 -0800") Message-ID: User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-IsSubscribed: yes 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 X-SW-Source: 2007-12/txt/msg00280.txt.bz2 I've committed the following. gdb/ChangeLog: 2007-12-17 Jim Blandy * dwarf2read.c (dwarf2_add_field): Correctly scale all byte offsets obtained from DW_AT_data_member_location before recording them in FIELD_BITPOS (*fp). * dwarf2read.c (attr_form_is_section_offset): Doc fixes. diff -r ac45448af75b -r 946effe2c5c8 gdb/dwarf2read.c --- a/gdb/dwarf2read.c Mon Dec 17 10:34:43 2007 -0800 +++ b/gdb/dwarf2read.c Mon Dec 17 10:39:13 2007 -0800 @@ -3478,16 +3478,19 @@ dwarf2_add_field (struct field_info *fip attr = dwarf2_attr (die, DW_AT_data_member_location, cu); if (attr) { + int byte_offset; + if (attr_form_is_section_offset (attr)) { dwarf2_complex_location_expr_complaint (); - FIELD_BITPOS (*fp) = 0; + byte_offset = 0; } else if (attr_form_is_constant (attr)) - FIELD_BITPOS (*fp) = dwarf2_get_attr_constant_value (attr, 0); + byte_offset = dwarf2_get_attr_constant_value (attr, 0); else - FIELD_BITPOS (*fp) = - decode_locdesc (DW_BLOCK (attr), cu) * bits_per_byte; + byte_offset = decode_locdesc (DW_BLOCK (attr), cu); + + FIELD_BITPOS (*fp) = byte_offset * bits_per_byte; } else FIELD_BITPOS (*fp) = 0; @@ -9734,9 +9737,14 @@ attr_form_is_block (struct attribute *at || attr->form == DW_FORM_block); } -/* Return non-zero if ATTR's value is a section offset (classes - lineptr, loclistptr, macptr or rangelistptr). In this case, - you may use DW_UNSND (attr) to retrieve the offset. */ +/* Return non-zero if ATTR's value is a section offset --- classes + lineptr, loclistptr, macptr or rangelistptr --- or zero, otherwise. + You may use DW_UNSND (attr) to retrieve such offsets. + + Section 7.5.4, "Attribute Encodings", explains that no attribute + may have a value that belongs to more than one of these classes; it + would be ambiguous if we did, because we use the same forms for all + of them. */ static int attr_form_is_section_offset (struct attribute *attr) {