From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29649 invoked by alias); 27 Jun 2010 16:55:49 -0000 Received: (qmail 29641 invoked by uid 22791); 27 Jun 2010 16:55:48 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 27 Jun 2010 16:55:43 +0000 Received: from kpbe11.cbf.corp.google.com (kpbe11.cbf.corp.google.com [172.25.105.75]) by smtp-out.google.com with ESMTP id o5RGtf0Z025769 for ; Sun, 27 Jun 2010 09:55:42 -0700 Received: from ruffy.mtv.corp.google.com (ruffy.mtv.corp.google.com [172.18.118.116]) by kpbe11.cbf.corp.google.com with ESMTP id o5RGtfhX005788 for ; Sun, 27 Jun 2010 09:55:41 -0700 Received: by ruffy.mtv.corp.google.com (Postfix, from userid 67641) id D944984613; Sun, 27 Jun 2010 09:55:40 -0700 (PDT) To: gdb-patches@sourceware.org Subject: [patch] Delete FIELD_LOC_KIND_DWARF_BLOCK, unused. Message-Id: <20100627165540.D944984613@ruffy.mtv.corp.google.com> Date: Sun, 27 Jun 2010 16:55:00 -0000 From: dje@google.com (Doug Evans) X-System-Of-Record: true 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: 2010-06/txt/msg00618.txt.bz2 Hi. This patch is strictly cleanup. It deletes FIELD_LOC_KIND_DWARF_BLOCK as it is unused. I will commit this in a few days if there are no objections. [Note: There is a FIXME in gdbtypes.c:field_is_static regarding dwarf block locations. I will delete that in a subsequent patch to fix c++ static const member support, pr 11702.] 2010-06-27 Doug Evans Delete FIELD_LOC_KIND_DWARF_BLOCK, unused. * gdbtypes.h (enum field_loc_kind): Delete FIELD_LOC_KIND_DWARF_BLOCK. (struct main_type, field loc): Delete dwarf_block. (FIELD_DWARF_BLOCK): Delete. (SET_FIELD_DWARF_BLOCK): Delete. (TYPE_FIELD_DWARF_BLOCK): Delete. * gdb-gdb.py (StructMainTypePrettyPrinter.struct_field_location_img): Update. Index: gdb-gdb.py =================================================================== RCS file: /cvs/src/src/gdb/gdb-gdb.py,v retrieving revision 1.4 diff -u -p -r1.4 gdb-gdb.py --- gdb-gdb.py 10 Feb 2010 18:39:45 -0000 1.4 +++ gdb-gdb.py 27 Jun 2010 16:44:44 -0000 @@ -158,8 +158,6 @@ class StructMainTypePrettyPrinter: return 'physaddr = 0x%x' % loc_val['physaddr'] elif loc_kind == "FIELD_LOC_KIND_PHYSNAME": return 'physname = %s' % loc_val['physname'] - elif loc_kind == "FIELD_LOC_KIND_DWARF_BLOCK": - return 'dwarf_block = %s' % loc_val['dwarf_block'] else: return 'loc = ??? (unsupported loc_kind value)' def struct_field_img(self, fieldno): Index: gdbtypes.h =================================================================== RCS file: /cvs/src/src/gdb/gdbtypes.h,v retrieving revision 1.130 diff -u -p -r1.130 gdbtypes.h --- gdbtypes.h 21 Jun 2010 18:01:51 -0000 1.130 +++ gdbtypes.h 27 Jun 2010 16:44:44 -0000 @@ -342,8 +342,7 @@ enum field_loc_kind { FIELD_LOC_KIND_BITPOS, /* bitpos */ FIELD_LOC_KIND_PHYSADDR, /* physaddr */ - FIELD_LOC_KIND_PHYSNAME, /* physname */ - FIELD_LOC_KIND_DWARF_BLOCK /* dwarf_block */ + FIELD_LOC_KIND_PHYSNAME /* physname */ }; /* A discriminant to determine which field in the main_type.type_specific @@ -504,12 +503,6 @@ struct main_type CORE_ADDR physaddr; char *physname; - - /* The field location can be computed by evaluating the following DWARF - block. This can be used in Fortran variable-length arrays, for - instance. */ - - struct dwarf2_locexpr_baton *dwarf_block; } loc; @@ -959,7 +952,6 @@ extern void allocate_gnat_aux_type (stru #define FIELD_BITPOS(thisfld) ((thisfld).loc.bitpos) #define FIELD_STATIC_PHYSNAME(thisfld) ((thisfld).loc.physname) #define FIELD_STATIC_PHYSADDR(thisfld) ((thisfld).loc.physaddr) -#define FIELD_DWARF_BLOCK(thisfld) ((thisfld).loc.dwarf_block) #define SET_FIELD_BITPOS(thisfld, bitpos) \ (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_BITPOS, \ FIELD_BITPOS (thisfld) = (bitpos)) @@ -969,9 +961,6 @@ extern void allocate_gnat_aux_type (stru #define SET_FIELD_PHYSADDR(thisfld, addr) \ (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSADDR, \ FIELD_STATIC_PHYSADDR (thisfld) = (addr)) -#define SET_FIELD_DWARF_BLOCK(thisfld, addr) \ - (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_DWARF_BLOCK, \ - FIELD_DWARF_BLOCK (thisfld) = (addr)) #define FIELD_ARTIFICIAL(thisfld) ((thisfld).artificial) #define FIELD_BITSIZE(thisfld) ((thisfld).bitsize) @@ -982,7 +971,6 @@ extern void allocate_gnat_aux_type (stru #define TYPE_FIELD_BITPOS(thistype, n) FIELD_BITPOS (TYPE_FIELD (thistype, n)) #define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) FIELD_STATIC_PHYSNAME (TYPE_FIELD (thistype, n)) #define TYPE_FIELD_STATIC_PHYSADDR(thistype, n) FIELD_STATIC_PHYSADDR (TYPE_FIELD (thistype, n)) -#define TYPE_FIELD_DWARF_BLOCK(thistype, n) FIELD_DWARF_BLOCK (TYPE_FIELD (thistype, n)) #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL(TYPE_FIELD(thistype,n)) #define TYPE_FIELD_BITSIZE(thistype, n) FIELD_BITSIZE(TYPE_FIELD(thistype,n)) #define TYPE_FIELD_PACKED(thistype, n) (FIELD_BITSIZE(TYPE_FIELD(thistype,n))!=0)