diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-09-26 21:07:04 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-10-29 16:44:45 -0400 |
| commit | e06c3e112eefd357b2531b53d0d8e87619fceb95 (patch) | |
| tree | 926ac85e89d2d2d0af6c9b1b9376dd57d63feedd | |
| parent | fcbbbd90f04a137e92681d6c6dcbea95688b0c5a (diff) | |
| download | gdb-e06c3e112eefd357b2531b53d0d8e87619fceb95.zip gdb-e06c3e112eefd357b2531b53d0d8e87619fceb95.tar.gz gdb-e06c3e112eefd357b2531b53d0d8e87619fceb95.tar.bz2 | |
gdb: remove TYPE_FIELD_STATIC_PHYSADDR
Remove TYPE_FIELD_STATIC_PHYSADDR replace with type::field +
field::loc_physaddr.
Change-Id: Ica9bc4a48f34750ec82ec86c298d3ecece81bcbd
| -rw-r--r-- | gdb/ax-gdb.c | 2 | ||||
| -rw-r--r-- | gdb/compile/compile-cplus-types.c | 2 | ||||
| -rw-r--r-- | gdb/gdbtypes.c | 2 | ||||
| -rw-r--r-- | gdb/gdbtypes.h | 1 | ||||
| -rw-r--r-- | gdb/value.c | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index beeee65..8e391a0 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -1440,7 +1440,7 @@ gen_static_field (struct agent_expr *ax, struct axs_value *value, { if (type->field (fieldno).loc_kind () == FIELD_LOC_KIND_PHYSADDR) { - ax_const_l (ax, TYPE_FIELD_STATIC_PHYSADDR (type, fieldno)); + ax_const_l (ax, type->field (fieldno).loc_physaddr ()); value->kind = axs_lvalue_memory; value->type = type->field (fieldno).type (); value->optimized_out = 0; diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c index 31634a9..cd389c8 100644 --- a/gdb/compile/compile-cplus-types.c +++ b/gdb/compile/compile-cplus-types.c @@ -603,7 +603,7 @@ compile_cplus_convert_struct_or_union_members { case FIELD_LOC_KIND_PHYSADDR: { - physaddr = TYPE_FIELD_STATIC_PHYSADDR (type, i); + physaddr = type->field (i).loc_physaddr (); instance->plugin ().build_decl ("field physaddr", field_name, diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 9dd7692..7521489 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -5569,7 +5569,7 @@ copy_type_recursive (struct objfile *objfile, break; case FIELD_LOC_KIND_PHYSADDR: new_type->field (i).set_loc_physaddr - (TYPE_FIELD_STATIC_PHYSADDR (type, i)); + (type->field (i).loc_physaddr ()); break; case FIELD_LOC_KIND_PHYSNAME: new_type->field (i).set_loc_physname diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 5a8fb74..1f5dc65 100644 --- 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_STATIC_PHYSADDR(thistype, n) ((thistype)->field (n).loc_physaddr ()) #define TYPE_FIELD_DWARF_BLOCK(thistype, n) ((thistype)->field (n).loc_dwarf_block ()) #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL((thistype)->field (n)) #define TYPE_FIELD_BITSIZE(thistype, n) FIELD_BITSIZE((thistype)->field (n)) diff --git a/gdb/value.c b/gdb/value.c index 5c27a96..998bec3 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -2956,7 +2956,7 @@ value_static_field (struct type *type, int fieldno) { case FIELD_LOC_KIND_PHYSADDR: retval = value_at_lazy (type->field (fieldno).type (), - TYPE_FIELD_STATIC_PHYSADDR (type, fieldno)); + type->field (fieldno).loc_physaddr ()); break; case FIELD_LOC_KIND_PHYSNAME: { |