diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/dwarf2/loc.c | 2 | ||||
| -rw-r--r-- | gdb/gdbtypes.c | 3 | ||||
| -rw-r--r-- | gdb/gdbtypes.h | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index 9d9267b..f7ec268 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -719,7 +719,7 @@ call_site_to_target_addr (struct gdbarch *call_site_gdbarch, int sect_idx = COMPUNIT_BLOCK_LINE_SECTION (cust); CORE_ADDR delta = per_objfile->objfile->section_offsets[sect_idx]; - return FIELD_STATIC_PHYSADDR (call_site->target) + delta; + return call_site->target.loc_physaddr () + delta; } default: diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 14bc546..db70475 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4221,8 +4221,7 @@ check_types_equal (struct type *type1, struct type *type2, have a type. */ continue; case FIELD_LOC_KIND_PHYSADDR: - if (FIELD_STATIC_PHYSADDR (*field1) - != FIELD_STATIC_PHYSADDR (*field2)) + if (field1->loc_physaddr () != field2->loc_physaddr ()) return false; break; case FIELD_LOC_KIND_PHYSNAME: diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 8af7bab..e3a3d98 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -2125,7 +2125,6 @@ extern void set_type_vptr_basetype (struct type *, struct type *); (TYPE_CPLUS_SPECIFIC(thistype)->virtual_field_bits == NULL ? 0 \ : B_TST(TYPE_CPLUS_SPECIFIC(thistype)->virtual_field_bits, (index))) -#define FIELD_STATIC_PHYSADDR(thisfld) ((thisfld).loc_physaddr ()) #define FIELD_DWARF_BLOCK(thisfld) ((thisfld).loc_dwarf_block ()) #define FIELD_ARTIFICIAL(thisfld) ((thisfld).artificial) #define FIELD_BITSIZE(thisfld) ((thisfld).bitsize) @@ -2134,7 +2133,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *); #define TYPE_FIELD_BITPOS(thistype, n) ((thistype)->field (n).loc_bitpos ()) #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) FIELD_STATIC_PHYSADDR ((thistype)->field (n)) +#define TYPE_FIELD_STATIC_PHYSADDR(thistype, n) ((thistype)->field (n).loc_physaddr ()) #define TYPE_FIELD_DWARF_BLOCK(thistype, n) FIELD_DWARF_BLOCK ((thistype)->field (n)) #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL((thistype)->field (n)) #define TYPE_FIELD_BITSIZE(thistype, n) FIELD_BITSIZE((thistype)->field (n)) |