gdb: remove TYPE_FIELD_ENUMVAL

Remove TYPE_FIELD_ENUMVAL, replace with type::field +
field::loc_enumval.

Change-Id: I2ada73e4635aad3363ce2eb22c1dc52698ee2072

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index c7837c75139da0d18ec3f26dfab15a93d6a8a87f..d964dae42cf64c24637a0241585ad63f860c9e51 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -651,7 +651,7 @@ ada_discrete_type_high_bound (struct type *type)
          }
       }
     case TYPE_CODE_ENUM:
-      return TYPE_FIELD_ENUMVAL (type, type->num_fields () - 1);
+      return type->field (type->num_fields () - 1).loc_enumval ();
     case TYPE_CODE_BOOL:
       return 1;
     case TYPE_CODE_CHAR:
@@ -686,7 +686,7 @@ ada_discrete_type_low_bound (struct type *type)
          }
       }
     case TYPE_CODE_ENUM:
-      return TYPE_FIELD_ENUMVAL (type, 0);
+      return type->field (0).loc_enumval ();
     case TYPE_CODE_BOOL:
       return 0;
     case TYPE_CODE_CHAR:
@@ -4617,7 +4617,7 @@ ada_identical_enum_types_p (struct type *type1, struct type *type2)
 
   /* All enums in the type should have an identical underlying value.  */
   for (i = 0; i < type1->num_fields (); i++)
-    if (TYPE_FIELD_ENUMVAL (type1, i) != TYPE_FIELD_ENUMVAL (type2, i))
+    if (type1->field (i).loc_enumval () != type2->field (i).loc_enumval ())
       return 0;
 
   /* All enumerals should also have the same name (modulo any numerical
@@ -8578,7 +8578,7 @@ val_atr (struct type *type, LONGEST val)
     {
       if (val < 0 || val >= type->num_fields ())
        error (_("argument to 'VAL out of range"));
-      val = TYPE_FIELD_ENUMVAL (type, val);
+      val = type->field (val).loc_enumval ();
     }
   return value_from_longest (type, val);
 }
@@ -10214,7 +10214,7 @@ convert_char_literal (struct type *type, LONGEST val)
       size_t elen = strlen (ename);
 
       if (elen >= len && strcmp (name, ename + elen - len) == 0)
-       return TYPE_FIELD_ENUMVAL (type, f);
+       return type->field (f).loc_enumval ();
     }
   return val;
 }

diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index 6bc8912422b5a05fc4c2ca4866de86ccb4913289..e336e03448097e201ba99516ac96e41492784b7e 100644 (file)
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -328,11 +328,11 @@ print_enum_type (struct type *type, struct ui_file *stream)
       wrap_here ("    ");
       fputs_styled (ada_enum_name (type->field (i).name ()),
                    variable_name_style.style (), stream);
-      if (lastval != TYPE_FIELD_ENUMVAL (type, i))
+      if (lastval != type->field (i).loc_enumval ())
        {
          fprintf_filtered (stream, " => %s",
-                           plongest (TYPE_FIELD_ENUMVAL (type, i)));
-         lastval = TYPE_FIELD_ENUMVAL (type, i);
+                           plongest (type->field (i).loc_enumval ()));
+         lastval = type->field (i).loc_enumval ();
        }
       lastval += 1;
     }

diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 04f1c7d840831b615562fd8b44832709d5a22761..6813af56dda4a12b01d9248afb8c63b5299520d0 100644 (file)
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -94,7 +94,7 @@ print_optional_low_bound (struct ui_file *stream, struct type *type,
     case TYPE_CODE_ENUM:
       if (low_bound == 0)
        return 0;
-      low_bound = TYPE_FIELD_ENUMVAL (index_type, low_bound);
+      low_bound = index_type->field (low_bound).loc_enumval ();
       break;
     case TYPE_CODE_UNDEF:
       index_type = NULL;
@@ -381,7 +381,7 @@ ada_print_scalar (struct type *type, LONGEST val, struct ui_file *stream)
       len = type->num_fields ();
       for (i = 0; i < len; i++)
        {
-         if (TYPE_FIELD_ENUMVAL (type, i) == val)
+         if (type->field (i).loc_enumval () == val)
            {
              break;
            }
@@ -835,7 +835,7 @@ ada_val_print_enum (struct value *value, struct ui_file *stream, int recurse,
   for (i = 0; i < len; i++)
     {
       QUIT;
-      if (val == TYPE_FIELD_ENUMVAL (type, i))
+      if (val == type->field (i).loc_enumval ())
        break;
     }
 

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index a471fdc27203f3c04dce95696a8109baf891a1a5..5f20233c78ac0823c6ae702bbd557a8cb19116fb 100644 (file)
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -1596,11 +1596,11 @@ c_type_print_base_1 (struct type *type, struct ui_file *stream,
              wrap_here ("    ");
              fputs_styled (type->field (i).name (),
                            variable_name_style.style (), stream);
-             if (lastval != TYPE_FIELD_ENUMVAL (type, i))
+             if (lastval != type->field (i).loc_enumval ())
                {
                  fprintf_filtered (stream, " = %s",
-                                   plongest (TYPE_FIELD_ENUMVAL (type, i)));
-                 lastval = TYPE_FIELD_ENUMVAL (type, i);
+                                   plongest (type->field (i).loc_enumval ()));
+                 lastval = type->field (i).loc_enumval ();
                }
              lastval++;
            }

diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c
index 8fbbc0e4ef2ce467419cb4240fbbbc0193cacbbd..87eb970231d67f23af627bad35962b963f27938a 100644 (file)
--- a/gdb/compile/compile-c-types.c
+++ b/gdb/compile/compile-c-types.c
@@ -137,7 +137,7 @@ convert_enum (compile_c_instance *context, struct type *type)
   for (i = 0; i < type->num_fields (); ++i)
     {
       context->plugin ().build_add_enum_constant
-       (result, type->field (i).name (), TYPE_FIELD_ENUMVAL (type, i));
+       (result, type->field (i).name (), type->field (i).loc_enumval ());
     }
 
   context->plugin ().finish_enum_type (result);

diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index a54a5449242ca7c605bd5b8adc1d3575eb80d475..1bd083df8703260d5639f8163ec41f6703356813 100644 (file)
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -944,7 +944,7 @@ compile_cplus_convert_enum (compile_cplus_instance *instance, struct type *type,
        continue;
 
       instance->plugin ().build_enum_constant (result, fname.get (),
-                                              TYPE_FIELD_ENUMVAL (type, i));
+                                              type->field (i).loc_enumval ());
     }
 
   /* Finish enum definition and pop scopes.  */

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index e3609abfa9c82d593af823ef70a1e28db510395a..48fb55c308c0e323f180a037b5b839c097db1284 100644 (file)
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -9201,7 +9201,7 @@ quirk_rust_enum (struct type *type, struct objfile *objfile)
            {
              const char *name
                = rust_last_path_segment (enum_type->field (i).name ());
-             discriminant_map[name] = TYPE_FIELD_ENUMVAL (enum_type, i);
+             discriminant_map[name] = enum_type->field (i).loc_enumval ();
            }
        }
 

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 0dd2790d33a4deafd748cbbfc858c88d03d299a0..84e987b0410e1ffc8e4143c701e754cc38172e17 100644 (file)
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -1068,12 +1068,12 @@ get_discrete_low_bound (struct type *type)
          {
            /* The enums may not be sorted by value, so search all
               entries.  */
-           LONGEST low = TYPE_FIELD_ENUMVAL (type, 0);
+           LONGEST low = type->field (0).loc_enumval ();
 
            for (int i = 0; i < type->num_fields (); i++)
              {
-               if (TYPE_FIELD_ENUMVAL (type, i) < low)
-                 low = TYPE_FIELD_ENUMVAL (type, i);
+               if (type->field (i).loc_enumval () < low)
+                 low = type->field (i).loc_enumval ();
              }
 
            /* Set unsigned indicator if warranted.  */
@@ -1139,12 +1139,12 @@ get_discrete_high_bound (struct type *type)
          {
            /* The enums may not be sorted by value, so search all
               entries.  */
-           LONGEST high = TYPE_FIELD_ENUMVAL (type, 0);
+           LONGEST high = type->field (0).loc_enumval ();
 
            for (int i = 0; i < type->num_fields (); i++)
              {
-               if (TYPE_FIELD_ENUMVAL (type, i) > high)
-                 high = TYPE_FIELD_ENUMVAL (type, i);
+               if (type->field (i).loc_enumval () > high)
+                 high = type->field (i).loc_enumval ();
              }
 
            return high;
@@ -1250,7 +1250,7 @@ discrete_position (struct type *type, LONGEST val)
 
       for (i = 0; i < type->num_fields (); i += 1)
        {
-         if (val == TYPE_FIELD_ENUMVAL (type, i))
+         if (val == type->field (i).loc_enumval ())
            return i;
        }
 
@@ -5337,7 +5337,7 @@ recursive_dump_type (struct type *type, int spaces)
     {
       if (type->code () == TYPE_CODE_ENUM)
        printf_filtered ("%*s[%d] enumval %s type ", spaces + 2, "",
-                        idx, plongest (TYPE_FIELD_ENUMVAL (type, idx)));
+                        idx, plongest (type->field (idx).loc_enumval ()));
       else
        printf_filtered ("%*s[%d] bitpos %s bitsize %d type ", spaces + 2, "",
                         idx, plongest (type->field (idx).loc_bitpos ()),
@@ -5565,7 +5565,7 @@ copy_type_recursive (struct objfile *objfile,
              new_type->field (i).set_loc_bitpos (type->field (i).loc_bitpos ());
              break;
            case FIELD_LOC_KIND_ENUMVAL:
-             new_type->field (i).set_loc_enumval (TYPE_FIELD_ENUMVAL (type, i));
+             new_type->field (i).set_loc_enumval (type->field (i).loc_enumval ());
              break;
            case FIELD_LOC_KIND_PHYSADDR:
              new_type->field (i).set_loc_physaddr

diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 18f856fb0597bd77c892167496e34d3e17d16568..e6384b1e8bff245d9ce2152765da81473e8c9d6b 100644 (file)
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -2128,7 +2128,6 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
 #define FIELD_ARTIFICIAL(thisfld) ((thisfld).artificial)
 #define FIELD_BITSIZE(thisfld) ((thisfld).bitsize)
 
-#define TYPE_FIELD_ENUMVAL(thistype, n) ((thistype)->field (n).loc_enumval ())
 #define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) ((thistype)->field (n).loc_physname ())
 #define TYPE_FIELD_STATIC_PHYSADDR(thistype, n) ((thistype)->field (n).loc_physaddr ())
 #define TYPE_FIELD_DWARF_BLOCK(thistype, n) ((thistype)->field (n).loc_dwarf_block ())

diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index 8209686980f25119a9c44dcde5341b75cc61540b..c4504e7c266c77e66c5b92784302ea86427136e1 100644 (file)
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -611,11 +611,11 @@ m2_enum (struct type *type, struct ui_file *stream, int show, int level)
          wrap_here ("    ");
          fputs_styled (type->field (i).name (),
                        variable_name_style.style (), stream);
-         if (lastval != TYPE_FIELD_ENUMVAL (type, i))
+         if (lastval != type->field (i).loc_enumval ())
            {
              fprintf_filtered (stream, " = %s",
-                               plongest (TYPE_FIELD_ENUMVAL (type, i)));
-             lastval = TYPE_FIELD_ENUMVAL (type, i);
+                               plongest (type->field (i).loc_enumval ()));
+             lastval = type->field (i).loc_enumval ();
            }
          lastval++;
        }

diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c
index 48bfba8b0d0c2442c2ce23630b8c314e0faa7086..b2d167f68bfea7cffaf665fafabb1e15c4347556 100644 (file)
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -711,12 +711,12 @@ pascal_language::type_print_base (struct type *type, struct ui_file *stream, int
                fprintf_filtered (stream, ", ");
              wrap_here ("    ");
              fputs_filtered (type->field (i).name (), stream);
-             if (lastval != TYPE_FIELD_ENUMVAL (type, i))
+             if (lastval != type->field (i).loc_enumval ())
                {
                  fprintf_filtered (stream,
                                    " := %s",
-                                   plongest (TYPE_FIELD_ENUMVAL (type, i)));
-                 lastval = TYPE_FIELD_ENUMVAL (type, i);
+                                   plongest (type->field (i).loc_enumval ()));
+                 lastval = type->field (i).loc_enumval ();
                }
              lastval++;
            }

diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 0895093e5e35bd66e249c489c6e852dd42557c58..8b17b70fbe3fcd84cae9b89085195d054ce5e4a6 100644 (file)
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -184,7 +184,7 @@ convert_field (struct type *type, int field)
 
       if (type->code () == TYPE_CODE_ENUM)
        {
-         arg = gdb_py_object_from_longest (TYPE_FIELD_ENUMVAL (type, field));
+         arg = gdb_py_object_from_longest (type->field (field).loc_enumval ());
          attrstring = "enumval";
        }
       else

diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 097fb6860fae78b426c99e1340a94c63c5e2eae5..1312111b6014499a3d0fc486dd50035798584e5d 100644 (file)
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -626,7 +626,7 @@ print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream)
       len = type->num_fields ();
       for (i = 0; i < len; i++)
        {
-         if (TYPE_FIELD_ENUMVAL (type, i) == val)
+         if (type->field (i).loc_enumval () == val)
            {
              break;
            }

diff --git a/gdb/valops.c b/gdb/valops.c
index 0d025841b12c66b922c6a3a4ced0b1bfcc3486af..9787cdbb513c60eccd6b4a574d1a68c8a14305c2 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -3343,7 +3343,7 @@ enum_constant_from_type (struct type *type, const char *name)
          && fname[len - name_len - 2] == ':'
          && fname[len - name_len - 1] == ':'
          && strcmp (&fname[len - name_len], name) == 0)
-       return value_from_longest (type, TYPE_FIELD_ENUMVAL (type, i));
+       return value_from_longest (type, type->field (i).loc_enumval ());
     }
 
   error (_("no constant named \"%s\" in enum \"%s\""),

diff --git a/gdb/valprint.c b/gdb/valprint.c
index 2656d0ded3fd7693243dcdeb3b2e8e4e060f2ad8..4230dcec228a4b2fc1de2b5d1419da7fec506dc1 100644 (file)
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -608,7 +608,7 @@ generic_val_print_enum_1 (struct type *type, LONGEST val,
   for (i = 0; i < len; i++)
     {
       QUIT;
-      if (val == TYPE_FIELD_ENUMVAL (type, i))
+      if (val == type->field (i).loc_enumval ())
        {
          break;
        }
@@ -630,7 +630,7 @@ generic_val_print_enum_1 (struct type *type, LONGEST val,
        {
          QUIT;
 
-         ULONGEST enumval = TYPE_FIELD_ENUMVAL (type, i);
+         ULONGEST enumval = type->field (i).loc_enumval ();
          int nbits = count_one_bits_ll (enumval);
 
          gdb_assert (nbits == 0 || nbits == 1);
@@ -645,7 +645,7 @@ generic_val_print_enum_1 (struct type *type, LONGEST val,
              else
                fputs_filtered (" | ", stream);
 
-             val &= ~TYPE_FIELD_ENUMVAL (type, i);
+             val &= ~type->field (i).loc_enumval ();
              fputs_styled (type->field (i).name (),
                            variable_name_style.style (), stream);
            }