public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Remove addrmap::create_fixed
@ 2022-06-12 16:55 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2022-06-12 16:55 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d89120e9493281a60d6e7280e9cfa3741ea7e379
commit d89120e9493281a60d6e7280e9cfa3741ea7e379
Author: Tom Tromey <tom@tromey.com>
Date: Sat Apr 16 09:53:39 2022 -0600
Remove addrmap::create_fixed
addrmap::create_fixed is just a simple wrapper for 'new', so remove it
in favor of uses of 'new'.
Diff:
---
gdb/addrmap.c | 19 ++-----------------
gdb/addrmap.h | 6 ------
gdb/buildsym.c | 3 ++-
gdb/dwarf2/cooked-index.h | 4 ++--
gdb/dwarf2/read.c | 7 +++++--
5 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/gdb/addrmap.c b/gdb/addrmap.c
index 29e6b2e8a31..51a6c676ec6 100644
--- a/gdb/addrmap.c
+++ b/gdb/addrmap.c
@@ -72,15 +72,6 @@ addrmap_fixed::find (CORE_ADDR addr) const
}
-struct addrmap *
-addrmap_fixed::create_fixed (struct obstack *obstack)
-{
- internal_error (__FILE__, __LINE__,
- _("addrmap_create_fixed is not implemented yet "
- "for fixed addrmaps"));
-}
-
-
void
addrmap_fixed::relocate (CORE_ADDR offset)
{
@@ -306,13 +297,6 @@ addrmap_fixed::addrmap_fixed (struct obstack *obstack, addrmap_mutable *mut)
}
-struct addrmap *
-addrmap_mutable::create_fixed (struct obstack *obstack)
-{
- return new (obstack) struct addrmap_fixed (obstack, this);
-}
-
-
void
addrmap_mutable::relocate (CORE_ADDR offset)
{
@@ -491,7 +475,8 @@ test_addrmap ()
CHECK_ADDRMAP_FIND (map, array, 13, 19, nullptr);
/* Create corresponding fixed addrmap. */
- struct addrmap *map2 = map->create_fixed (&temp_obstack);
+ struct addrmap *map2
+ = new (&temp_obstack) addrmap_fixed (&temp_obstack, map);
SELF_CHECK (map2 != nullptr);
CHECK_ADDRMAP_FIND (map2, array, 0, 9, nullptr);
CHECK_ADDRMAP_FIND (map2, array, 10, 12, val1);
diff --git a/gdb/addrmap.h b/gdb/addrmap.h
index 8794f1fefbf..a3b1d6ad4a8 100644
--- a/gdb/addrmap.h
+++ b/gdb/addrmap.h
@@ -87,10 +87,6 @@ struct addrmap : public allocate_on_obstack
/* Return the object associated with ADDR in MAP. */
virtual void *find (CORE_ADDR addr) const = 0;
- /* Create a fixed address map which is a copy of this mutable
- address map. Allocate entries in OBSTACK. */
- virtual struct addrmap *create_fixed (struct obstack *obstack) = 0;
-
/* Relocate all the addresses in MAP by OFFSET. (This can be applied
to either mutable or immutable maps.) */
virtual void relocate (CORE_ADDR offset) = 0;
@@ -115,7 +111,6 @@ public:
void set_empty (CORE_ADDR start, CORE_ADDR end_inclusive,
void *obj) override;
void *find (CORE_ADDR addr) const override;
- struct addrmap *create_fixed (struct obstack *obstack) override;
void relocate (CORE_ADDR offset) override;
int foreach (addrmap_foreach_fn fn) override;
@@ -153,7 +148,6 @@ public:
void set_empty (CORE_ADDR start, CORE_ADDR end_inclusive,
void *obj) override;
void *find (CORE_ADDR addr) const override;
- struct addrmap *create_fixed (struct obstack *obstack) override;
void relocate (CORE_ADDR offset) override;
int foreach (addrmap_foreach_fn fn) override;
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index d4a90abcee4..019c2055f60 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -460,7 +460,8 @@ buildsym_compunit::make_blockvector ()
blockvector. */
if (m_pending_addrmap != nullptr && m_pending_addrmap_interesting)
blockvector->set_map
- (m_pending_addrmap->create_fixed (&m_objfile->objfile_obstack));
+ (new (&m_objfile->objfile_obstack) addrmap_fixed
+ (&m_objfile->objfile_obstack, m_pending_addrmap));
else
blockvector->set_map (nullptr);
diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h
index 4fc2a9411d4..439cbb19fa7 100644
--- a/gdb/dwarf2/cooked-index.h
+++ b/gdb/dwarf2/cooked-index.h
@@ -185,10 +185,10 @@ public:
dwarf2_per_cu_data *per_cu);
/* Install a new fixed addrmap from the given mutable addrmap. */
- void install_addrmap (addrmap *map)
+ void install_addrmap (addrmap_mutable *map)
{
gdb_assert (m_addrmap == nullptr);
- m_addrmap = map->create_fixed (&m_storage);
+ m_addrmap = new (&m_storage) addrmap_fixed (&m_storage, map);
}
/* Finalize the index. This should be called a single time, when
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 216b211bf9d..96378c3a09f 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -2308,7 +2308,8 @@ create_addrmap_from_index (dwarf2_per_objfile *per_objfile,
mutable_map->set_empty (lo, hi - 1, per_bfd->get_cu (cu_index));
}
- per_bfd->index_addrmap = mutable_map->create_fixed (&per_bfd->obstack);
+ per_bfd->index_addrmap
+ = new (&per_bfd->obstack) addrmap_fixed (&per_bfd->obstack, mutable_map);
}
/* Read the address map data from DWARF-5 .debug_aranges, and use it
@@ -2500,7 +2501,9 @@ create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
= new (&temp_obstack) addrmap_mutable (&temp_obstack);
if (read_addrmap_from_aranges (per_objfile, section, mutable_map))
- per_bfd->index_addrmap = mutable_map->create_fixed (&per_bfd->obstack);
+ per_bfd->index_addrmap
+ = new (&per_bfd->obstack) addrmap_fixed (&per_bfd->obstack,
+ mutable_map);
}
/* A helper function that reads the .gdb_index from BUFFER and fills
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-12 16:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-12 16:55 [binutils-gdb] Remove addrmap::create_fixed Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).