From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5274 invoked by alias); 18 Apr 2012 06:57:35 -0000 Received: (qmail 5261 invoked by uid 22791); 18 Apr 2012 06:57:31 -0000 X-SWARE-Spam-Status: No, hits=-3.5 required=5.0 tests=AWL,BAYES_00,KAM_STOCKTIP,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,SPF_HELO_PASS,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; Wed, 18 Apr 2012 06:56:38 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3I6ucUH017640 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 18 Apr 2012 02:56:38 -0400 Received: from host2.jankratochvil.net (ovpn-116-17.ams2.redhat.com [10.36.116.17]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3I6uS9c031901 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Wed, 18 Apr 2012 02:56:30 -0400 Date: Wed, 18 Apr 2012 06:58:00 -0000 From: Jan Kratochvil To: Siddhesh Poyarekar Cc: Tom Tromey , gdb-patches@sourceware.org Subject: [commit] [PATCH] Allow 64-bit enum values Message-ID: <20120418065627.GA31851@host2.jankratochvil.net> References: <20120229135148.GA32128@spoyarek.pnq.redhat.com> <20120301224428.GA30631@host2.jankratochvil.net> <20120305063542.GA30196@spoyarek.pnq.redhat.com> <20120305080512.GA12311@host2.jankratochvil.net> <20120321100630.GA14496@spoyarek.pnq.redhat.com> <20120327165950.GA1734@host2.jankratochvil.net> <20120328095037.254b22ed@spoyarek> <20120330161521.GA19069@host2.jankratochvil.net> <20120417135819.GA28916@host2.jankratochvil.net> <20120418080720.240a03c5@spoyarek> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120418080720.240a03c5@spoyarek> User-Agent: Mutt/1.5.21 (2010-09-15) 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: 2012-04/txt/msg00539.txt.bz2 On Wed, 18 Apr 2012 04:37:20 +0200, Siddhesh Poyarekar wrote: > Thanks, I will resubmit the patch with these changes and the rebase, > hopefully by today or latest by tomorrow. After off-list mail it is already rebased checked it in. It was not fully rebased so I added new FIELD_ENUMVAL_LVAL. I had to rewrite ChangeLog as it was too vague, it included unrelated comment fix and it used order not matching the diff+chunks. Thanks, Jan http://sourceware.org/ml/gdb-cvs/2012-04/msg00126.html + forgotten added testcases: http://sourceware.org/ml/gdb-cvs/2012-04/msg00127.html --- src/gdb/ChangeLog 2012/04/18 06:24:48 1.14122 +++ src/gdb/ChangeLog 2012/04/18 06:46:45 1.14123 @@ -1,3 +1,52 @@ +2012-04-18 Siddhesh Poyarekar + + PR symtab/7259: + * ada-exp.y (convert_char_literal): Use TYPE_FIELD_ENUMVAL. + * ada-lang.c (ada_discrete_type_high_bound) + (ada_discrete_type_low_bound): Use TYPE_FIELD_ENUMVAL for + TYPE_CODE_ENUM. + (ada_identical_enum_types_p): Use TYPE_FIELD_ENUMVAL. + (pos_atr, value_val_atr): Use TYPE_FIELD_ENUMVAL for TYPE_CODE_ENUM. + * ada-typeprint.c (print_enum_type): Change variable lastval to LONGEST. + Use TYPE_FIELD_ENUMVAL. + * ada-valprint.c (print_optional_low_bound, ada_print_scalar) + (ada_val_print_1): Use TYPE_FIELD_ENUMVAL for TYPE_CODE_ENUM. + * c-typeprint.c (c_type_print_base): Move variable lastval to inner + block, change it to LONGEST. Use TYPE_FIELD_ENUMVAL for + TYPE_CODE_ENUM. + * coffread.c (coff_read_enum_type): Use SET_FIELD_ENUMVAL. + * dwarf2read.c (process_enumeration_scope): Likewise. + * gdb-gdb.py (TypeFlagsPrinter): Use field.enumval instead of + field.bitpos. + (class StructMainTypePrettyPrinter): Support also + FIELD_LOC_KIND_ENUMVAL. + * gdbtypes.c (get_discrete_bounds): Use TYPE_FIELD_ENUMVAL for + TYPE_CODE_ENUM. + (recursive_dump_type): Use TYPE_FIELD_ENUMVAL for TYPE_CODE_ENUM. + (copy_type_recursive): Support also FIELD_LOC_KIND_ENUMVAL. + * gdbtypes.h (enum field_loc_kind): New FIELD_LOC_KIND_ENUMVAL. + (struct main_type.flds_bnds.fields.loc): Adjust bitpos comment. New + field enumval. + (struct main_type.flds_bnds.bields): Adjust loc_kind and bitsize to + accommodate enumval. + (struct call_site): Adjust loc_kind to accommodate enumval. + (FIELD_ENUMVAL, FIELD_ENUMVAL_LVAL, SET_FIELD_ENUMVAL) + (TYPE_FIELD_ENUMVAL): New macros. + * m2-typeprint.c (m2_enum): Use TYPE_FIELD_ENUMVAL. + * mdebugread.c (parse_symbol): Use TYPE_FIELD_ENUMVAL for + TYPE_CODE_ENUM. + * p-typeprint.c (pascal_type_print_base): Likewise. + * python/lib/gdb/printing.py (class FlagEnumerationPrinter): Use + enumval. + * python/lib/gdb/types.py (make_enum_dict): Likewise. + * python/py-type.c (convert_field): New variable addrstring. Use + TYPE_FIELD_ENUMVAL for TYPE_CODE_ENUM. + (check_types_equal): Support also FIELD_LOC_KIND_ENUMVAL. + * stabsread.c (read_enum_type): Use SET_FIELD_ENUMVAL. + * typepint.c (print_type_scalar): Use TYPE_FIELD_ENUMVAL for + TYPE_CODE_ENUM. + * valprint.c (generic_val_print): Likewise. + 2012-04-17 Doug Evans * dwarf2read.c (lookup_signatured_type): Return NULL instead of 0. --- src/gdb/ada-exp.y 2012/04/09 17:07:42 1.49 +++ src/gdb/ada-exp.y 2012/04/18 06:46:45 1.50 @@ -1463,7 +1463,7 @@ for (f = 0; f < TYPE_NFIELDS (type); f += 1) { if (strcmp (name, TYPE_FIELD_NAME (type, f)) == 0) - return TYPE_FIELD_BITPOS (type, f); + return TYPE_FIELD_ENUMVAL (type, f); } return val; } --- src/gdb/ada-lang.c 2012/04/17 12:43:19 1.364 +++ src/gdb/ada-lang.c 2012/04/18 06:46:45 1.365 @@ -690,7 +690,7 @@ case TYPE_CODE_RANGE: return TYPE_HIGH_BOUND (type); case TYPE_CODE_ENUM: - return TYPE_FIELD_BITPOS (type, TYPE_NFIELDS (type) - 1); + return TYPE_FIELD_ENUMVAL (type, TYPE_NFIELDS (type) - 1); case TYPE_CODE_BOOL: return 1; case TYPE_CODE_CHAR: @@ -701,7 +701,7 @@ } } -/* The largest value in the domain of TYPE, a discrete type, as an integer. */ +/* The smallest value in the domain of TYPE, a discrete type, as an integer. */ LONGEST ada_discrete_type_low_bound (struct type *type) { @@ -710,7 +710,7 @@ case TYPE_CODE_RANGE: return TYPE_LOW_BOUND (type); case TYPE_CODE_ENUM: - return TYPE_FIELD_BITPOS (type, 0); + return TYPE_FIELD_ENUMVAL (type, 0); case TYPE_CODE_BOOL: return 0; case TYPE_CODE_CHAR: @@ -4479,7 +4479,7 @@ /* All enums in the type should have an identical underlying value. */ for (i = 0; i < TYPE_NFIELDS (type1); i++) - if (TYPE_FIELD_BITPOS (type1, i) != TYPE_FIELD_BITPOS (type2, i)) + if (TYPE_FIELD_ENUMVAL (type1, i) != TYPE_FIELD_ENUMVAL (type2, i)) return 0; /* All enumerals should also have the same name (modulo any numerical @@ -8298,7 +8298,7 @@ for (i = 0; i < TYPE_NFIELDS (type); i += 1) { - if (v == TYPE_FIELD_BITPOS (type, i)) + if (v == TYPE_FIELD_ENUMVAL (type, i)) return i; } error (_("enumeration value is invalid: can't find 'POS")); @@ -8329,7 +8329,7 @@ if (pos < 0 || pos >= TYPE_NFIELDS (type)) error (_("argument to 'VAL out of range")); - return value_from_longest (type, TYPE_FIELD_BITPOS (type, pos)); + return value_from_longest (type, TYPE_FIELD_ENUMVAL (type, pos)); } else return value_from_longest (type, value_as_long (arg)); --- src/gdb/ada-typeprint.c 2012/02/07 04:48:18 1.45 +++ src/gdb/ada-typeprint.c 2012/04/18 06:46:46 1.46 @@ -274,7 +274,8 @@ print_enum_type (struct type *type, struct ui_file *stream) { int len = TYPE_NFIELDS (type); - int i, lastval; + int i; + LONGEST lastval; fprintf_filtered (stream, "("); wrap_here (" "); @@ -287,10 +288,11 @@ fprintf_filtered (stream, ", "); wrap_here (" "); fputs_filtered (ada_enum_name (TYPE_FIELD_NAME (type, i)), stream); - if (lastval != TYPE_FIELD_BITPOS (type, i)) + if (lastval != TYPE_FIELD_ENUMVAL (type, i)) { - fprintf_filtered (stream, " => %d", TYPE_FIELD_BITPOS (type, i)); - lastval = TYPE_FIELD_BITPOS (type, i); + fprintf_filtered (stream, " => %s", + plongest (TYPE_FIELD_ENUMVAL (type, i))); + lastval = TYPE_FIELD_ENUMVAL (type, i); } lastval += 1; } --- src/gdb/ada-valprint.c 2012/03/29 18:50:21 1.90 +++ src/gdb/ada-valprint.c 2012/04/18 06:46:46 1.91 @@ -109,7 +109,7 @@ return 0; break; case TYPE_CODE_ENUM: - if (low_bound == TYPE_FIELD_BITPOS (index_type, 0)) + if (low_bound == TYPE_FIELD_ENUMVAL (index_type, 0)) return 0; break; case TYPE_CODE_UNDEF: @@ -402,7 +402,7 @@ len = TYPE_NFIELDS (type); for (i = 0; i < len; i++) { - if (TYPE_FIELD_BITPOS (type, i) == val) + if (TYPE_FIELD_ENUMVAL (type, i) == val) { break; } @@ -824,7 +824,7 @@ for (i = 0; i < len; i++) { QUIT; - if (val == TYPE_FIELD_BITPOS (type, i)) + if (val == TYPE_FIELD_ENUMVAL (type, i)) { break; } --- src/gdb/c-typeprint.c 2012/02/07 04:48:18 1.73 +++ src/gdb/c-typeprint.c 2012/04/18 06:46:46 1.74 @@ -717,7 +717,6 @@ { int i; int len, real_len; - int lastval; enum { s_none, s_public, s_private, s_protected @@ -1194,9 +1193,10 @@ } else if (show > 0 || TYPE_TAG_NAME (type) == NULL) { + LONGEST lastval = 0; + fprintf_filtered (stream, "{"); len = TYPE_NFIELDS (type); - lastval = 0; for (i = 0; i < len; i++) { QUIT; @@ -1204,11 +1204,11 @@ fprintf_filtered (stream, ", "); wrap_here (" "); fputs_filtered (TYPE_FIELD_NAME (type, i), stream); - if (lastval != TYPE_FIELD_BITPOS (type, i)) + if (lastval != TYPE_FIELD_ENUMVAL (type, i)) { - fprintf_filtered (stream, " = %d", - TYPE_FIELD_BITPOS (type, i)); - lastval = TYPE_FIELD_BITPOS (type, i); + fprintf_filtered (stream, " = %s", + plongest (TYPE_FIELD_ENUMVAL (type, i))); + lastval = TYPE_FIELD_ENUMVAL (type, i); } lastval++; } --- src/gdb/coffread.c 2012/02/07 04:48:18 1.126 +++ src/gdb/coffread.c 2012/04/18 06:46:46 1.127 @@ -2159,7 +2159,7 @@ SYMBOL_TYPE (xsym) = type; TYPE_FIELD_NAME (type, n) = SYMBOL_LINKAGE_NAME (xsym); - SET_FIELD_BITPOS (TYPE_FIELD (type, n), SYMBOL_VALUE (xsym)); + SET_FIELD_ENUMVAL (TYPE_FIELD (type, n), SYMBOL_VALUE (xsym)); if (SYMBOL_VALUE (xsym) < 0) unsigned_enum = 0; TYPE_FIELD_BITSIZE (type, n) = 0; --- src/gdb/dwarf2read.c 2012/04/18 06:24:48 1.635 +++ src/gdb/dwarf2read.c 2012/04/18 06:46:46 1.636 @@ -8051,7 +8051,7 @@ FIELD_NAME (fields[num_fields]) = SYMBOL_LINKAGE_NAME (sym); FIELD_TYPE (fields[num_fields]) = NULL; - SET_FIELD_BITPOS (fields[num_fields], SYMBOL_VALUE (sym)); + SET_FIELD_ENUMVAL (fields[num_fields], SYMBOL_VALUE (sym)); FIELD_BITSIZE (fields[num_fields]) = 0; num_fields++; --- src/gdb/gdb-gdb.py 2012/02/09 15:14:46 1.10 +++ src/gdb/gdb-gdb.py 2012/04/18 06:46:46 1.11 @@ -99,10 +99,10 @@ 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() @@ -154,6 +154,8 @@ 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": --- src/gdb/gdbtypes.c 2012/04/17 13:55:31 1.228 +++ src/gdb/gdbtypes.c 2012/04/18 06:46:46 1.229 @@ -775,13 +775,13 @@ entries. */ int i; - *lowp = *highp = TYPE_FIELD_BITPOS (type, 0); + *lowp = *highp = TYPE_FIELD_ENUMVAL (type, 0); for (i = 0; i < TYPE_NFIELDS (type); i++) { - if (TYPE_FIELD_BITPOS (type, i) < *lowp) - *lowp = TYPE_FIELD_BITPOS (type, i); - if (TYPE_FIELD_BITPOS (type, i) > *highp) - *highp = TYPE_FIELD_BITPOS (type, i); + if (TYPE_FIELD_ENUMVAL (type, i) < *lowp) + *lowp = TYPE_FIELD_ENUMVAL (type, i); + if (TYPE_FIELD_ENUMVAL (type, i) > *highp) + *highp = TYPE_FIELD_ENUMVAL (type, i); } /* Set unsigned indicator if warranted. */ @@ -3197,10 +3197,15 @@ puts_filtered ("\n"); for (idx = 0; idx < TYPE_NFIELDS (type); idx++) { - printfi_filtered (spaces + 2, - "[%d] bitpos %d bitsize %d type ", - idx, TYPE_FIELD_BITPOS (type, idx), - TYPE_FIELD_BITSIZE (type, idx)); + if (TYPE_CODE (type) == TYPE_CODE_ENUM) + printfi_filtered (spaces + 2, + "[%d] enumval %s type ", + idx, plongest (TYPE_FIELD_ENUMVAL (type, idx))); + else + printfi_filtered (spaces + 2, + "[%d] bitpos %d bitsize %d type ", + idx, TYPE_FIELD_BITPOS (type, idx), + TYPE_FIELD_BITSIZE (type, idx)); gdb_print_host_address (TYPE_FIELD_TYPE (type, idx), gdb_stdout); printf_filtered (" name '%s' (", TYPE_FIELD_NAME (type, idx) != NULL @@ -3397,6 +3402,10 @@ SET_FIELD_BITPOS (TYPE_FIELD (new_type, i), TYPE_FIELD_BITPOS (type, i)); break; + case FIELD_LOC_KIND_ENUMVAL: + SET_FIELD_ENUMVAL (TYPE_FIELD (new_type, i), + TYPE_FIELD_ENUMVAL (type, i)); + break; case FIELD_LOC_KIND_PHYSADDR: SET_FIELD_PHYSADDR (TYPE_FIELD (new_type, i), TYPE_FIELD_STATIC_PHYSADDR (type, i)); --- src/gdb/gdbtypes.h 2012/04/17 13:55:31 1.164 +++ src/gdb/gdbtypes.h 2012/04/18 06:46:46 1.165 @@ -351,6 +351,7 @@ enum field_loc_kind { FIELD_LOC_KIND_BITPOS, /* bitpos */ + FIELD_LOC_KIND_ENUMVAL, /* enumval */ FIELD_LOC_KIND_PHYSADDR, /* physaddr */ FIELD_LOC_KIND_PHYSNAME, /* physname */ FIELD_LOC_KIND_DWARF_BLOCK /* dwarf_block */ @@ -511,11 +512,13 @@ containing structure. For gdbarch_bits_big_endian=1 targets, it is the bit offset to the MSB. For gdbarch_bits_big_endian=0 targets, it is the bit offset to - the LSB. For a range bound or enum value, this is the - value itself. */ + the LSB. */ int bitpos; + /* Enum value. */ + LONGEST enumval; + /* For a static field, if TYPE_FIELD_STATIC_HAS_ADDR then physaddr is the location (in the target) of the static field. Otherwise, physname is the mangled label of the static field. */ @@ -538,7 +541,7 @@ unsigned int artificial : 1; /* Discriminant for union field_location. */ - ENUM_BITFIELD(field_loc_kind) loc_kind : 2; + ENUM_BITFIELD(field_loc_kind) loc_kind : 3; /* Size of this field, in bits, or zero if not packed. If non-zero in an array type, indicates the element size in @@ -546,7 +549,7 @@ For an unpacked field, the field's type's length says how many bytes the field occupies. */ - unsigned int bitsize : 29; + unsigned int bitsize : 28; /* In a struct or union type, type of this field. In a function or member type, type of this argument. @@ -931,7 +934,7 @@ union field_location loc; /* Discriminant for union field_location. */ - ENUM_BITFIELD(field_loc_kind) loc_kind : 2; + ENUM_BITFIELD(field_loc_kind) loc_kind : 3; } target; @@ -1089,12 +1092,17 @@ #define FIELD_LOC_KIND(thisfld) ((thisfld).loc_kind) #define FIELD_BITPOS_LVAL(thisfld) ((thisfld).loc.bitpos) #define FIELD_BITPOS(thisfld) (FIELD_BITPOS_LVAL (thisfld) + 0) +#define FIELD_ENUMVAL_LVAL(thisfld) ((thisfld).loc.enumval) +#define FIELD_ENUMVAL(thisfld) (FIELD_ENUMVAL_LVAL (thisfld) + 0) #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_LVAL (thisfld) = (bitpos)) +#define SET_FIELD_ENUMVAL(thisfld, enumval) \ + (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_ENUMVAL, \ + FIELD_ENUMVAL_LVAL (thisfld) = (enumval)) #define SET_FIELD_PHYSNAME(thisfld, name) \ (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSNAME, \ FIELD_STATIC_PHYSNAME (thisfld) = (name)) @@ -1112,6 +1120,7 @@ #define TYPE_FIELD_NAME(thistype, n) FIELD_NAME(TYPE_FIELD(thistype, n)) #define TYPE_FIELD_LOC_KIND(thistype, n) FIELD_LOC_KIND (TYPE_FIELD (thistype, n)) #define TYPE_FIELD_BITPOS(thistype, n) FIELD_BITPOS (TYPE_FIELD (thistype, n)) +#define TYPE_FIELD_ENUMVAL(thistype, n) FIELD_ENUMVAL (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)) --- src/gdb/m2-typeprint.c 2012/01/04 08:17:05 1.29 +++ src/gdb/m2-typeprint.c 2012/04/18 06:46:46 1.30 @@ -607,10 +607,11 @@ fprintf_filtered (stream, ", "); wrap_here (" "); fputs_filtered (TYPE_FIELD_NAME (type, i), stream); - if (lastval != TYPE_FIELD_BITPOS (type, i)) + if (lastval != TYPE_FIELD_ENUMVAL (type, i)) { - fprintf_filtered (stream, " = %d", TYPE_FIELD_BITPOS (type, i)); - lastval = TYPE_FIELD_BITPOS (type, i); + fprintf_filtered (stream, " = %s", + plongest (TYPE_FIELD_ENUMVAL (type, i))); + lastval = TYPE_FIELD_ENUMVAL (type, i); } lastval++; } --- src/gdb/mdebugread.c 2012/02/07 04:48:21 1.129 +++ src/gdb/mdebugread.c 2012/04/18 06:46:46 1.130 @@ -1047,7 +1047,7 @@ if (tsym.st != stMember) break; - SET_FIELD_BITPOS (*f, tsym.value); + SET_FIELD_ENUMVAL (*f, tsym.value); FIELD_TYPE (*f) = t; FIELD_NAME (*f) = debug_info->ss + cur_fdr->issBase + tsym.iss; FIELD_BITSIZE (*f) = 0; --- src/gdb/p-typeprint.c 2012/03/16 11:10:04 1.45 +++ src/gdb/p-typeprint.c 2012/04/18 06:46:46 1.46 @@ -750,11 +750,12 @@ fprintf_filtered (stream, ", "); wrap_here (" "); fputs_filtered (TYPE_FIELD_NAME (type, i), stream); - if (lastval != TYPE_FIELD_BITPOS (type, i)) + if (lastval != TYPE_FIELD_ENUMVAL (type, i)) { fprintf_filtered (stream, - " := %d", TYPE_FIELD_BITPOS (type, i)); - lastval = TYPE_FIELD_BITPOS (type, i); + " := %s", + plongest (TYPE_FIELD_ENUMVAL (type, i))); + lastval = TYPE_FIELD_ENUMVAL (type, i); } lastval++; } --- src/gdb/stabsread.c 2012/04/17 13:55:32 1.146 +++ src/gdb/stabsread.c 2012/04/18 06:46:46 1.147 @@ -3731,7 +3731,7 @@ SYMBOL_TYPE (xsym) = type; TYPE_FIELD_NAME (type, n) = SYMBOL_LINKAGE_NAME (xsym); - SET_FIELD_BITPOS (TYPE_FIELD (type, n), SYMBOL_VALUE (xsym)); + SET_FIELD_ENUMVAL (TYPE_FIELD (type, n), SYMBOL_VALUE (xsym)); TYPE_FIELD_BITSIZE (type, n) = 0; } if (syms == osyms) --- src/gdb/typeprint.c 2012/02/21 13:48:59 1.45 +++ src/gdb/typeprint.c 2012/04/18 06:46:46 1.46 @@ -206,7 +206,7 @@ len = TYPE_NFIELDS (type); for (i = 0; i < len; i++) { - if (TYPE_FIELD_BITPOS (type, i) == val) + if (TYPE_FIELD_ENUMVAL (type, i) == val) { break; } --- src/gdb/valprint.c 2012/04/03 14:39:53 1.122 +++ src/gdb/valprint.c 2012/04/18 06:46:46 1.123 @@ -445,7 +445,7 @@ for (i = 0; i < len; i++) { QUIT; - if (val == TYPE_FIELD_BITPOS (type, i)) + if (val == TYPE_FIELD_ENUMVAL (type, i)) { break; } @@ -466,13 +466,13 @@ { QUIT; - if ((val & TYPE_FIELD_BITPOS (type, i)) != 0) + if ((val & TYPE_FIELD_ENUMVAL (type, i)) != 0) { if (!first) fputs_filtered (" | ", stream); first = 0; - val &= ~TYPE_FIELD_BITPOS (type, i); + val &= ~TYPE_FIELD_ENUMVAL (type, i); fputs_filtered (TYPE_FIELD_NAME (type, i), stream); } } --- src/gdb/python/py-type.c 2012/02/17 19:24:26 1.36 +++ src/gdb/python/py-type.c 2012/04/18 06:46:46 1.37 @@ -167,11 +167,23 @@ if (!field_is_static (&TYPE_FIELD (type, field))) { - arg = PyLong_FromLong (TYPE_FIELD_BITPOS (type, field)); + const char *attrstring; + + if (TYPE_CODE (type) == TYPE_CODE_ENUM) + { + arg = gdb_py_long_from_longest (TYPE_FIELD_ENUMVAL (type, field)); + attrstring = "enumval"; + } + else + { + arg = PyLong_FromLong (TYPE_FIELD_BITPOS (type, field)); + attrstring = "bitpos"; + } + if (!arg) goto fail; - if (PyObject_SetAttrString (result, "bitpos", arg) < 0) + if (PyObject_SetAttrString (result, attrstring, arg) < 0) goto failarg; } @@ -1018,6 +1030,10 @@ if (FIELD_BITPOS (*field1) != FIELD_BITPOS (*field2)) return Py_NE; break; + case FIELD_LOC_KIND_ENUMVAL: + if (FIELD_ENUMVAL (*field1) != FIELD_ENUMVAL (*field2)) + return Py_NE; + break; case FIELD_LOC_KIND_PHYSADDR: if (FIELD_STATIC_PHYSADDR (*field1) != FIELD_STATIC_PHYSADDR (*field2)) --- src/gdb/python/lib/gdb/printing.py 2012/01/16 19:44:15 1.8 +++ src/gdb/python/lib/gdb/printing.py 2012/04/18 06:46:46 1.9 @@ -247,10 +247,10 @@ flags = gdb.lookup_type(self.name) self.enumerators = [] for field in flags.fields(): - self.enumerators.append((field.name, field.bitpos)) + self.enumerators.append((field.name, field.enumval)) # Sorting the enumerators by value usually does the right # thing. - self.enumerators.sort(key = lambda x: x.bitpos) + self.enumerators.sort(key = lambda x: x.enumval) if self.enabled: return _EnumInstance(self.enumerators, val) --- src/gdb/python/lib/gdb/types.py 2012/01/04 08:17:24 1.5 +++ src/gdb/python/lib/gdb/types.py 2012/04/18 06:46:46 1.6 @@ -86,8 +86,8 @@ raise TypeError("not an enum type") enum_dict = {} for field in enum_type.fields(): - # The enum's value is stored in "bitpos". - enum_dict[field.name] = field.bitpos + # The enum's value is stored in "enumval". + enum_dict[field.name] = field.enumval return enum_dict --- src/gdb/testsuite/ChangeLog 2012/04/17 17:43:10 1.3166 +++ src/gdb/testsuite/ChangeLog 2012/04/18 06:46:47 1.3167 @@ -1,3 +1,12 @@ +2012-04-18 Siddhesh Poyarekar + Jan Kratochvil + + PR symtab/7259: + * gdb.base/enumval.c: New test case. + * gdb.base/enumval.exp: New test case. + * gdb.python/py-type.exp (test_enums): Use field.enumval instead of + field.bitpos. + 2012-04-17 Pedro Alves * Makefile.in (site.exp): Make site.exp source --- src/gdb/testsuite/gdb.python/py-type.exp 2012/02/17 19:24:27 1.21 +++ src/gdb/testsuite/gdb.python/py-type.exp 2012/04/18 06:46:47 1.22 @@ -136,8 +136,8 @@ gdb_test "python print len(e.type)" "3" "Check the number of enum fields" gdb_test "python print e.type\['v1'\].name" "v1" "Check enum field lookup by name" gdb_test "python print e.type\['v3'\].name" "v3" "Check enum field lookup by name" - gdb_test "python print \[v.bitpos for v in e.type.itervalues()\]" {\[0L, 1L, 2L\]} "Check num fields iteration over values" - gdb_test "python print \[(n, v.bitpos) for (n, v) in e.type.items()\]" {\[\('v1', 0L\), \('v2', 1L\), \('v3', 2L\)\]} "Check enum fields items list" + gdb_test "python print \[v.enumval for v in e.type.itervalues()\]" {\[0L, 1L, 2L\]} "Check num fields iteration over values" + gdb_test "python print \[(n, v.enumval) for (n, v) in e.type.items()\]" {\[\('v1', 0L\), \('v2', 1L\), \('v3', 2L\)\]} "Check enum fields items list" } proc test_base_class {} { gdb_py_test_silent_cmd "print d" "print value" 1 --- src/gdb/testsuite/gdb.base/enumval.c +++ src/gdb/testsuite/gdb.base/enumval.c 2012-04-18 06:54:18.373302000 +0000 @@ -0,0 +1,30 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2012 Free Software Foundation, Inc. + + 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, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +enum e { I, J = 0xffffffffU, K = 0xf000000000000000ULL } e = J, f = K; + +void +dummy() +{ +} + +int +main(void) +{ + dummy(); + return 0; +} --- src/gdb/testsuite/gdb.base/enumval.exp +++ src/gdb/testsuite/gdb.base/enumval.exp 2012-04-18 06:54:18.742706000 +0000 @@ -0,0 +1,31 @@ +# This testcase is part of GDB, the GNU debugger. + +# Copyright 2012 Free Software Foundation, Inc. + +# 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, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +set testfile "enumval" +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} + +if { [prepare_for_testing enumval.exp "enumval" "" {debug}] } { + return -1 +} + +# Check the real contents. +gdb_test "print e" "= J" +gdb_test "print f" "= K" + +gdb_test "print J" "= J" +gdb_test "print K" "= K"