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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e510efb3ac2cab716f9ff63f675602b106e800d7..a742eea5900c4bd375a0ce6658e1014590807347 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2010-06-29  Doug Evans  <dje@google.com>
+
+       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.
+
 2010-06-29  Hui Zhu  <teawater@gmail.com>
 
        * record.c (set_record_pic_cmdlist,

diff --git a/gdb/gdb-gdb.py b/gdb/gdb-gdb.py
index 84e89147a9e711e76c006e98a59568f520730193..b2e68eef8a3d5c1bb72210fcfe4269aeac85a70b 100644 (file)
--- a/gdb/gdb-gdb.py
+++ b/gdb/gdb-gdb.py
@@ -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):

diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 61c7f9ae86104406b664a0eacce20a74bb1064fc..2a9bc9bd046647f20425e99b2e23f38e258f89c6 100644 (file)
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -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;
 
@@ -972,7 +965,6 @@ extern void allocate_gnat_aux_type (struct type *);
 #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))
@@ -982,9 +974,6 @@ extern void allocate_gnat_aux_type (struct type *);
 #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)
 
@@ -995,7 +984,6 @@ extern void allocate_gnat_aux_type (struct type *);
 #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)