Merge GDB 7.5.1

gdb/gdb-gdb.py

 # Copyright (C) 2009-2012 Free Software Foundation, Inc.
 #
 # This file is part of GDB.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ skipping 81 matching lines @@
             print "         `struct type' pretty-printer will be degraded"
             return
         try:
             iflags = gdb.lookup_type("enum type_instance_flag_value")
         except:
             print "Warning: Cannot find enum type_instance_flag_value type."
             print "         `struct type' pretty-printer will be degraded"
             return
         # Note: TYPE_FLAG_MIN is a duplicate of TYPE_FLAG_UNSIGNED,
         # so exclude it from the list we are building.
-        TYPE_FLAGS = [TypeFlag(field.name, field.bitpos)
+        TYPE_FLAGS = [TypeFlag(field.name, field.enumval)
                       for field in flags.fields()
                       if field.name != 'TYPE_FLAG_MIN']
-        TYPE_FLAGS += [TypeFlag(field.name, field.bitpos)
+        TYPE_FLAGS += [TypeFlag(field.name, field.enumval)
                        for field in iflags.fields()]
         TYPE_FLAGS.sort()
 
 class StructTypePrettyPrinter:
     """Pretty-print an object of type struct type"""
     def __init__(self, val):
         self.val = val
     def to_string(self):
         fields = []
         fields.append("pointer_type = %s" % self.val['pointer_type'])
@@ skipping 31 matching lines @@
         else:
             return "%s (gdbarch)" % self.val['owner']['gdbarch']
     def struct_field_location_img(self, field_val):
         """Return an image of the loc component inside the given field
         gdb.Value.
         """
         loc_val = field_val['loc']
         loc_kind = str(field_val['loc_kind'])
         if loc_kind == "FIELD_LOC_KIND_BITPOS":
             return 'bitpos = %d' % loc_val['bitpos']
+        elif loc_kind == "FIELD_LOC_KIND_ENUMVAL":
+            return 'enumval = %d' % loc_val['enumval']
         elif loc_kind == "FIELD_LOC_KIND_PHYSADDR":
             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):
         """Return an image of the main_type field number FIELDNO.
         """
         f = self.val['flds_bnds']['fields'][fieldno]
-        label = "field[%d]:" % fieldno
+        label = "flds_bnds.fields[%d]:" % fieldno
         if f['artificial']:
             label += " (artificial)"
         fields = []
         fields.append("name = %s" % f['name'])
         fields.append("type = %s" % f['type'])
         fields.append("loc_kind = %s" % f['loc_kind'])
         fields.append("bitsize = %d" % f['bitsize'])
         fields.append(self.struct_field_location_img(f))
         return label + "\n" + "  {" + ",\n   ".join(fields) + "}"
     def bounds_img(self):
         """Return an image of the main_type bounds.
         """
         b = self.val['flds_bnds']['bounds'].dereference()
         low = str(b['low'])
         if b['low_undefined'] != 0:
             low += " (undefined)"
         high = str(b['high'])
         if b['high_undefined'] != 0:
             high += " (undefined)"
-        return "bounds = {%s, %s}" % (low, high)
+        return "flds_bnds.bounds = {%s, %s}" % (low, high)
     def type_specific_img(self):
         """Return a string image of the main_type type_specific union.
         Only the relevant component of that union is printed (based on
         the value of the type_specific_kind field.
         """
         type_specific_kind = str(self.val['type_specific_field'])
         type_specific = self.val['type_specific']
         if type_specific_kind == "TYPE_SPECIFIC_NONE":
             img = 'type_specific_field = %s' % type_specific_kind
         elif type_specific_kind == "TYPE_SPECIFIC_CPLUS_STUFF":
@@ skipping 54 matching lines @@
         # objfile.
         register_pretty_printer(gdb.current_objfile())
     else:
         # We need to locate the objfile corresponding to the GDB
         # executable, and register the pretty-printer for that objfile.
         # FIXME: The condition used to match the objfile is too simplistic
         # and will not work on Windows.
         for objfile in gdb.objfiles():
             if os.path.basename(objfile.filename) == "gdb":
                 objfile.pretty_printers.append(type_lookup_function)