From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 965 invoked by alias); 24 Mar 2011 15:30:46 -0000 Received: (qmail 952 invoked by uid 22791); 24 Mar 2011 15:30:45 -0000 X-SWARE-Spam-Status: No, hits=-6.2 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,TW_BJ,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 24 Mar 2011 15:30:38 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2OFUcNg010746 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Mar 2011 11:30:38 -0400 Received: from [10.3.113.61] (ovpn-113-61.phx2.redhat.com [10.3.113.61]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p2OFUbah031323 for ; Thu, 24 Mar 2011 11:30:37 -0400 Subject: Remove deprecated DW_FORM_sig8 define From: Mark Wielaard To: gdb-patches@sourceware.org Content-Type: multipart/mixed; boundary="=-nkTV9vv/cmNkhqRO1mVa" Date: Thu, 24 Mar 2011 15:54:00 -0000 Message-ID: <1300980636.4889.57.camel@springer.wildebeest.org> Mime-Version: 1.0 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: 2011-03/txt/msg01075.txt.bz2 --=-nkTV9vv/cmNkhqRO1mVa Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Content-length: 980 Hi, While reading through the type unit support I noticed the old deprecated DW_FORM_sig8 still being used in dwarf2read.c. This patch replaces it with the official name from the dwarf spec, DW_FORM_ref_sig8, which was already used in some other places. 2011-03-24 Mark Wielaard * dwarf2.h (dwarf_form): Remove deprecated DW_FORM_sig8 define. 2011-03-24 Mark Wielaard * dwarf2read.c (lookup_signatured_type): Use DW_FORM_ref_sig8 in complaint. (skip_one_die): Use DW_FORM_ref_sig8, not DW_FORM_sig8. (find_partial_die_in_comp_unit): Likewise in comment. (read_attribute_value): Likewise. (lookup_die_type): Likewise. (dwarf_form_name): Likewise. (dump_die_shallow): Likewise. (follow_die_ref_or_sig): Likewise. If this is OK, could someone commit it for me? I have a similar patch for gcc. binutils already uses the new define exclusively. Thanks, Mark --=-nkTV9vv/cmNkhqRO1mVa Content-Disposition: inline; filename="gdb_ref_sig8.patch" Content-Type: text/x-patch; name="gdb_ref_sig8.patch"; charset="UTF-8" Content-Transfer-Encoding: 8bit Content-length: 4732 diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e5600dc..fad4f4b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2011-03-24 Mark Wielaard + + * dwarf2read.c (lookup_signatured_type): Use DW_FORM_ref_sig8 in + complaint. + (skip_one_die): Use DW_FORM_ref_sig8, not DW_FORM_sig8. + (find_partial_die_in_comp_unit): Likewise in comment. + (read_attribute_value): Likewise. + (lookup_die_type): Likewise. + (dwarf_form_name): Likewise. + (dump_die_shallow): Likewise. + (follow_die_ref_or_sig): Likewise. + 2011-03-23 Pedro Alves * regcache.c (regcache_raw_read): If the target didn't supply a diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 190f0bc..0cc5ca0 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -3105,7 +3105,7 @@ lookup_signatured_type (struct objfile *objfile, ULONGEST sig) if (dwarf2_per_objfile->signatured_types == NULL) { complaint (&symfile_complaints, - _("missing `.debug_types' section for DW_FORM_sig8 die")); + _("missing `.debug_types' section for DW_FORM_ref_sig8 die")); return 0; } @@ -4217,7 +4217,7 @@ skip_one_die (gdb_byte *buffer, gdb_byte *info_ptr, break; case DW_FORM_data8: case DW_FORM_ref8: - case DW_FORM_sig8: + case DW_FORM_ref_sig8: info_ptr += 8; break; case DW_FORM_string: @@ -9184,7 +9184,7 @@ find_partial_die_in_comp_unit (unsigned int offset, struct dwarf2_cu *cu) /* Find a partial DIE at OFFSET, which may or may not be in CU, except in the case of .debug_types DIEs which do not reference outside their CU (they do however referencing other types via - DW_FORM_sig8). */ + DW_FORM_ref_sig8). */ static struct partial_die_info * find_partial_die (unsigned int offset, struct dwarf2_cu *cu) @@ -9487,7 +9487,7 @@ read_attribute_value (struct attribute *attr, unsigned form, DW_ADDR (attr) = cu->header.offset + read_8_bytes (abfd, info_ptr); info_ptr += 8; break; - case DW_FORM_sig8: + case DW_FORM_ref_sig8: /* Convert the signature to something we can record in DW_UNSND for later lookup. NOTE: This is NULL if the type wasn't found. */ @@ -11497,7 +11497,7 @@ lookup_die_type (struct die_info *die, struct attribute *attr, this_type = get_die_type_at_offset (offset, cu->per_cu); } - else if (attr->form == DW_FORM_sig8) + else if (attr->form == DW_FORM_ref_sig8) { struct signatured_type *sig_type = DW_SIGNATURED_TYPE (attr); struct dwarf2_cu *sig_cu; @@ -12537,8 +12537,8 @@ dwarf_form_name (unsigned form) return "DW_FORM_exprloc"; case DW_FORM_flag_present: return "DW_FORM_flag_present"; - case DW_FORM_sig8: - return "DW_FORM_sig8"; + case DW_FORM_ref_sig8: + return "DW_FORM_ref_sig8"; default: return "DW_FORM_"; } @@ -13089,7 +13089,7 @@ dump_die_shallow (struct ui_file *f, int indent, struct die_info *die) fprintf_unfiltered (f, "section offset: %s", pulongest (DW_UNSND (&die->attrs[i]))); break; - case DW_FORM_sig8: + case DW_FORM_ref_sig8: if (DW_SIGNATURED_TYPE (&die->attrs[i]) != NULL) fprintf_unfiltered (f, "signatured type, offset: 0x%x", DW_SIGNATURED_TYPE (&die->attrs[i])->offset); @@ -13291,7 +13291,7 @@ follow_die_ref_or_sig (struct die_info *src_die, struct attribute *attr, if (is_ref_attr (attr)) die = follow_die_ref (src_die, attr, ref_cu); - else if (attr->form == DW_FORM_sig8) + else if (attr->form == DW_FORM_ref_sig8) die = follow_die_sig (src_die, attr, ref_cu); else { @@ -13322,7 +13322,7 @@ follow_die_offset (unsigned int offset, struct dwarf2_cu **ref_cu) { /* .debug_types CUs cannot reference anything outside their CU. If they need to, they have to reference a signatured type via - DW_FORM_sig8. */ + DW_FORM_ref_sig8. */ if (! offset_in_cu_p (&cu->header, offset)) return NULL; } diff --git a/include/ChangeLog b/include/ChangeLog index 863d6f3..de6858b 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2011-03-24 Mark Wielaard + + * dwarf2.h (dwarf_form): Remove deprecated DW_FORM_sig8 define. + 2010-03-23 Rafael Ávila de Espíndola * plugin-api.h (ld_plugin_get_view): New. diff --git a/include/dwarf2.h b/include/dwarf2.h index 46f2291..ef0fa5f 100644 --- a/include/dwarf2.h +++ b/include/dwarf2.h @@ -189,7 +189,6 @@ enum dwarf_form DW_FORM_exprloc = 0x18, DW_FORM_flag_present = 0x19, DW_FORM_ref_sig8 = 0x20 -#define DW_FORM_sig8 DW_FORM_ref_sig8 /* Note: The use of DW_FORM_sig8 is deprecated. */ }; /* Attribute names and codes. */ --=-nkTV9vv/cmNkhqRO1mVa--