aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2021-12-21 16:48:38 -0700
committerTom Tromey <tom@tromey.com>2022-01-18 10:14:43 -0700
commit0589ca4e7ba9b8d60599706b57be22c007c1f4fa (patch)
tree7fdde22953de4f48839190426acf158768445dc4 /gdb
parentbf31fd38f02ca9b1a7d75e2d00ee0af665fd3efd (diff)
downloadgdb-0589ca4e7ba9b8d60599706b57be22c007c1f4fa.zip
gdb-0589ca4e7ba9b8d60599706b57be22c007c1f4fa.tar.gz
gdb-0589ca4e7ba9b8d60599706b57be22c007c1f4fa.tar.bz2
Introduce gdb-hashtab module in gdbsupport
gdb has some extensions and helpers for working with the libiberty hash table. This patch consolidates these and moves them to gdbsupport.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/compile/compile-internal.h1
-rw-r--r--gdb/completer.h1
-rw-r--r--gdb/filename-seen-cache.h1
-rw-r--r--gdb/gdbtypes.h1
-rw-r--r--gdb/utils.c24
-rw-r--r--gdb/utils.h26
6 files changed, 4 insertions, 50 deletions
diff --git a/gdb/compile/compile-internal.h b/gdb/compile/compile-internal.h
index 92efd51..042ddf9 100644
--- a/gdb/compile/compile-internal.h
+++ b/gdb/compile/compile-internal.h
@@ -18,6 +18,7 @@
#define COMPILE_COMPILE_INTERNAL_H
#include "gcc-c-interface.h"
+#include "gdbsupport/gdb-hashtab.h"
/* Debugging flag for the "compile" family of commands. */
diff --git a/gdb/completer.h b/gdb/completer.h
index 93125e4..78e5240 100644
--- a/gdb/completer.h
+++ b/gdb/completer.h
@@ -17,6 +17,7 @@
#if !defined (COMPLETER_H)
#define COMPLETER_H 1
+#include "gdbsupport/gdb-hashtab.h"
#include "gdbsupport/gdb_vecs.h"
#include "command.h"
diff --git a/gdb/filename-seen-cache.h b/gdb/filename-seen-cache.h
index 0952903..83a6e8a 100644
--- a/gdb/filename-seen-cache.h
+++ b/gdb/filename-seen-cache.h
@@ -22,6 +22,7 @@
#include "defs.h"
#include "gdbsupport/function-view.h"
+#include "gdbsupport/gdb-hashtab.h"
/* Cache to watch for file names already seen. */
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 467f609..7238873 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -46,6 +46,7 @@
#include "hashtab.h"
#include "gdbsupport/array-view.h"
+#include "gdbsupport/gdb-hashtab.h"
#include "gdbsupport/gdb_optional.h"
#include "gdbsupport/offset-type.h"
#include "gdbsupport/enum-flags.h"
diff --git a/gdb/utils.c b/gdb/utils.c
index 0be49a6..bda3b7b 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -2841,30 +2841,6 @@ gdb_argv_as_array_view_test ()
#endif /* GDB_SELF_TEST */
-/* Allocation function for the libiberty hash table which uses an
- obstack. The obstack is passed as DATA. */
-
-void *
-hashtab_obstack_allocate (void *data, size_t size, size_t count)
-{
- size_t total = size * count;
- void *ptr = obstack_alloc ((struct obstack *) data, total);
-
- memset (ptr, 0, total);
- return ptr;
-}
-
-/* Trivial deallocation function for the libiberty splay tree and hash
- table - don't deallocate anything. Rely on later deletion of the
- obstack. DATA will be the obstack, although it is not needed
- here. */
-
-void
-dummy_obstack_deallocate (void *object, void *data)
-{
- return;
-}
-
/* Simple, portable version of dirname that does not modify its
argument. */
diff --git a/gdb/utils.h b/gdb/utils.h
index 5ac34eb..8e9c204 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -123,27 +123,6 @@ extern int parse_escape (struct gdbarch *, const char **);
/* Cleanup utilities. */
-/* A deleter for a hash table. */
-struct htab_deleter
-{
- void operator() (htab *ptr) const
- {
- htab_delete (ptr);
- }
-};
-
-/* A unique_ptr wrapper for htab_t. */
-typedef std::unique_ptr<htab, htab_deleter> htab_up;
-
-/* A wrapper for 'delete' that can used as a hash table entry deletion
- function. */
-template<typename T>
-void
-htab_delete_entry (void *ptr)
-{
- delete (T *) ptr;
-}
-
extern void init_page_info (void);
/* Temporarily set BATCH_FLAG and the associated unlimited terminal size.
@@ -384,11 +363,6 @@ extern void demangler_warning (const char *file, int line,
/* Misc. utilities. */
-/* Allocation and deallocation functions for the libiberty hash table
- which use obstacks. */
-void *hashtab_obstack_allocate (void *data, size_t size, size_t count);
-void dummy_obstack_deallocate (void *object, void *data);
-
#ifdef HAVE_WAITPID
extern pid_t wait_to_die_with_timeout (pid_t pid, int *status, int timeout);
#endif