/* GDB self-test for each gdbarch.
- Copyright (C) 2017 Free Software Foundation, Inc.
+ Copyright (C) 2017-2022 Free Software Foundation, Inc.
This file is part of GDB.
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include <functional>
#if GDB_SELF_TEST
-#include "selftest.h"
+#include "gdbsupport/selftest.h"
#include "selftest-arch.h"
#include "arch-utils.h"
-static std::vector<self_test_foreach_arch_function *> gdbarch_tests;
-
-void
-register_self_test_foreach_arch (self_test_foreach_arch_function *function)
-{
- gdbarch_tests.push_back (function);
-}
-
namespace selftests {
-static void
-tests_with_arch ()
+static bool skip_arch (const char *arch)
{
- int failed = 0;
-
- for (const auto &f : gdbarch_tests)
+ if (strcmp ("fr300", arch) == 0)
{
- const char **arches = gdbarch_printable_names ();
-
- for (int i = 0; arches[i] != NULL; i++)
- {
- if (strcmp ("fr300", arches[i]) == 0)
- {
- /* PR 20946 */
- continue;
- }
- else if (strcmp ("powerpc:EC603e", arches[i]) == 0
- || strcmp ("powerpc:e500mc", arches[i]) == 0
- || strcmp ("powerpc:e500mc64", arches[i]) == 0
- || strcmp ("powerpc:titan", arches[i]) == 0
- || strcmp ("powerpc:vle", arches[i]) == 0
- || strcmp ("powerpc:e5500", arches[i]) == 0
- || strcmp ("powerpc:e6500", arches[i]) == 0)
- {
- /* PR 19797 */
- continue;
- }
-
- QUIT;
-
- TRY
- {
- struct gdbarch_info info;
-
- gdbarch_info_init (&info);
- info.bfd_arch_info = bfd_scan_arch (arches[i]);
-
- struct gdbarch *gdbarch = gdbarch_find_by_info (info);
- SELF_CHECK (gdbarch != NULL);
- f (gdbarch);
- }
- CATCH (ex, RETURN_MASK_ERROR)
- {
- ++failed;
- exception_fprintf (gdb_stderr, ex,
- _("Self test failed: arch %s: "), arches[i]);
- }
- END_CATCH
+ /* PR 20946 */
+ return true;
+ }
- /* Clear GDB internal state. */
- registers_changed ();
- reinit_frame_cache ();
- }
+ if (strcmp ("powerpc:EC603e", arch) == 0
+ || strcmp ("powerpc:e500mc", arch) == 0
+ || strcmp ("powerpc:e500mc64", arch) == 0
+ || strcmp ("powerpc:titan", arch) == 0
+ || strcmp ("powerpc:vle", arch) == 0
+ || strcmp ("powerpc:e5500", arch) == 0
+ || strcmp ("powerpc:e6500", arch) == 0)
+ {
+ /* PR 19797 */
+ return true;
}
- SELF_CHECK (failed == 0);
+ return false;
}
-} // namespace selftests
-#endif /* GDB_SELF_TEST */
+/* Register a kind of selftest that calls the test function once for each
+ gdbarch known to GDB. */
-/* Suppress warning from -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_selftests_foreach_arch;
+void
+register_test_foreach_arch (const std::string &name,
+ self_test_foreach_arch_function *function)
+{
+ std::vector<const char *> arches = gdbarch_printable_names ();
+ for (const char *arch : arches)
+ {
+ if (skip_arch (arch))
+ continue;
+
+ auto test_fn
+ = ([=] ()
+ {
+ struct gdbarch_info info;
+ info.bfd_arch_info = bfd_scan_arch (arch);
+ struct gdbarch *gdbarch = gdbarch_find_by_info (info);
+ SELF_CHECK (gdbarch != NULL);
+ function (gdbarch);
+ reset ();
+ });
+
+ std::string test_name
+ = name + std::string ("::") + std::string (arch);
+ register_test (test_name, test_fn);
+ }
+}
void
-_initialize_selftests_foreach_arch ()
+reset ()
{
-#if GDB_SELF_TEST
- register_self_test (selftests::tests_with_arch);
-#endif
+ /* Clear GDB internal state. */
+ registers_changed ();
+ reinit_frame_cache ();
}
+} // namespace selftests
+#endif /* GDB_SELF_TEST */