-/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2019 Free Software Foundation, Inc.
This file is part of GDB.
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "server.h"
+#include "dll.h"
-#define get_dll(inf) ((struct dll_info *)(inf))
+#include <algorithm>
-struct inferior_list all_dlls;
-int dlls_changed;
-
-static void
-free_one_dll (struct inferior_list_entry *inf)
-{
- struct dll_info *dll = get_dll (inf);
- if (dll->name != NULL)
- free (dll->name);
- free (dll);
-}
+/* An "unspecified" CORE_ADDR, for match_dll. */
+#define UNSPECIFIED_CORE_ADDR (~(CORE_ADDR) 0)
-/* Find a DLL with the same name and/or base address. A NULL name in
- the key is ignored; so is an all-ones base address. */
-
-static int
-match_dll (struct inferior_list_entry *inf, void *arg)
-{
- struct dll_info *iter = (void *) inf;
- struct dll_info *key = arg;
-
- if (key->base_addr != ~(CORE_ADDR) 0
- && iter->base_addr == key->base_addr)
- return 1;
- else if (key->name != NULL
- && iter->name != NULL
- && strcmp (key->name, iter->name) == 0)
- return 1;
-
- return 0;
-}
+std::list<dll_info> all_dlls;
+int dlls_changed;
/* Record a newly loaded DLL at BASE_ADDR. */
void
loaded_dll (const char *name, CORE_ADDR base_addr)
{
- struct dll_info *new_dll = xmalloc (sizeof (*new_dll));
- memset (new_dll, 0, sizeof (*new_dll));
-
- new_dll->entry.id = minus_one_ptid;
-
- new_dll->name = xstrdup (name);
- new_dll->base_addr = base_addr;
-
- add_inferior_to_list (&all_dlls, &new_dll->entry);
+ all_dlls.emplace_back (name != NULL ? name : "", base_addr);
dlls_changed = 1;
}
void
unloaded_dll (const char *name, CORE_ADDR base_addr)
{
- struct dll_info *dll;
- struct dll_info key_dll;
+ auto pred = [&] (const dll_info &dll)
+ {
+ if (base_addr != UNSPECIFIED_CORE_ADDR
+ && base_addr == dll.base_addr)
+ return true;
+
+ if (name != NULL && dll.name == name)
+ return true;
- /* Be careful not to put the key DLL in any list. */
- key_dll.name = (char *) name;
- key_dll.base_addr = base_addr;
+ return false;
+ };
- dll = (void *) find_inferior (&all_dlls, match_dll, &key_dll);
+ auto iter = std::find_if (all_dlls.begin (), all_dlls.end (), pred);
- if (dll == NULL)
+ if (iter == all_dlls.end ())
/* For some inferiors we might get unloaded_dll events without having
a corresponding loaded_dll. In that case, the dll cannot be found
in ALL_DLL, and there is nothing further for us to do.
{
/* DLL has been found so remove the entry and free associated
resources. */
- remove_inferior (&all_dlls, &dll->entry);
- free_one_dll (&dll->entry);
+ all_dlls.erase (iter);
dlls_changed = 1;
}
}
void
clear_dlls (void)
{
- for_each_inferior (&all_dlls, free_one_dll);
- all_dlls.head = all_dlls.tail = NULL;
+ all_dlls.clear ();
}