diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/arc-tdep.c | 14 | ||||
| -rw-r--r-- | gdb/arch/arc.c | 12 | ||||
| -rw-r--r-- | gdb/arch/arc.h | 12 |
4 files changed, 26 insertions, 19 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4fea491..3caea81 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2020-10-07 Shahab Vahedi <shahab@synopsys.com> + + * arch/arc.h: Rename "arc_gdbarch_features" to + "arc_arch_features". + * arc-tdep.h: Likewise. + * arc-tdep.c: Likewise. + 2020-10-07 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> * infcmd.c (attach_command): Remove the redundant call to diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c index 6878875..ec624bc 100644 --- a/gdb/arc-tdep.c +++ b/gdb/arc-tdep.c @@ -1883,11 +1883,11 @@ mach_type_to_arc_isa (const unsigned long mach) } } -/* Common construction code for ARC_GDBARCH_FEATURES struct. If there +/* Common construction code for ARC_ARCH_FEATURES struct. If there is no ABFD, then a FEATURE with default values is returned. */ -static arc_gdbarch_features -arc_gdbarch_features_create (const bfd *abfd, const unsigned long mach) +static arc_arch_features +arc_arch_features_create (const bfd *abfd, const unsigned long mach) { /* Use 4 as a fallback value. */ int reg_size = 4; @@ -1915,7 +1915,7 @@ arc_gdbarch_features_create (const bfd *abfd, const unsigned long mach) case). */ arc_isa isa = mach_type_to_arc_isa (mach); - return arc_gdbarch_features (reg_size, isa); + return arc_arch_features (reg_size, isa); } /* Look for obsolete core feature names in TDESC. */ @@ -2085,9 +2085,9 @@ arc_tdesc_init (struct gdbarch_info info, const struct target_desc **tdesc, /* If target doesn't provide a description, use the default ones. */ if (!tdesc_has_registers (tdesc_loc)) { - arc_gdbarch_features features - = arc_gdbarch_features_create (info.abfd, - info.bfd_arch_info->mach); + arc_arch_features features + = arc_arch_features_create (info.abfd, + info.bfd_arch_info->mach); tdesc_loc = arc_lookup_target_description (features); } gdb_assert (tdesc_loc != nullptr); diff --git a/gdb/arch/arc.c b/gdb/arch/arc.c index 8e126ca..3808f9f 100644 --- a/gdb/arch/arc.c +++ b/gdb/arch/arc.c @@ -35,7 +35,7 @@ #endif STATIC_IN_GDB target_desc * -arc_create_target_description (const struct arc_gdbarch_features &features) +arc_create_target_description (const struct arc_arch_features &features) { /* Create a new target description. */ target_desc *tdesc = allocate_target_description (); @@ -84,10 +84,10 @@ arc_create_target_description (const struct arc_gdbarch_features &features) #ifndef GDBSERVER /* Wrapper used by std::unordered_map to generate hash for features set. */ -struct arc_gdbarch_features_hasher +struct arc_arch_features_hasher { std::size_t - operator() (const arc_gdbarch_features &features) const noexcept + operator() (const arc_arch_features &features) const noexcept { return features.hash (); } @@ -95,14 +95,14 @@ struct arc_gdbarch_features_hasher /* Cache of previously created target descriptions, indexed by the hash of the features set used to create them. */ -static std::unordered_map<arc_gdbarch_features, +static std::unordered_map<arc_arch_features, const target_desc_up, - arc_gdbarch_features_hasher> arc_tdesc_cache; + arc_arch_features_hasher> arc_tdesc_cache; /* See arch/arc.h. */ const target_desc * -arc_lookup_target_description (const struct arc_gdbarch_features &features) +arc_lookup_target_description (const struct arc_arch_features &features) { /* Lookup in the cache first. If found, return the pointer from the "target_desc_up" type which is a "unique_ptr". This should be fine diff --git a/gdb/arch/arc.h b/gdb/arch/arc.h index a5313b1..1625759 100644 --- a/gdb/arch/arc.h +++ b/gdb/arch/arc.h @@ -27,9 +27,9 @@ enum arc_isa ARC_ISA_ARCV2 /* such as ARC EM and ARC HS */ }; -struct arc_gdbarch_features +struct arc_arch_features { - arc_gdbarch_features (int reg_size, arc_isa isa) + arc_arch_features (int reg_size, arc_isa isa) : reg_size (reg_size), isa (isa) {} @@ -41,13 +41,13 @@ struct arc_gdbarch_features const arc_isa isa; /* Equality operator. */ - bool operator== (const struct arc_gdbarch_features &rhs) const + bool operator== (const struct arc_arch_features &rhs) const { return (reg_size == rhs.reg_size && isa == rhs.isa); } /* Inequality operator. */ - bool operator!= (const struct arc_gdbarch_features &rhs) const + bool operator!= (const struct arc_arch_features &rhs) const { return !(*this == rhs); } @@ -71,7 +71,7 @@ struct arc_gdbarch_features the returned data. */ target_desc *arc_create_target_description - (const struct arc_gdbarch_features &features); + (const struct arc_arch_features &features); #else @@ -79,7 +79,7 @@ target_desc *arc_create_target_description If nothing is found, then create one and return it. */ const target_desc *arc_lookup_target_description - (const struct arc_gdbarch_features &features); + (const struct arc_arch_features &features); #endif /* GDBSERVER */ |