From 23bade95de322dead7fbd33368dce271c2911773 Mon Sep 17 00:00:00 2001
From: Andrew Burgess <aburgess@redhat.com>
Date: Thu, 10 Mar 2022 10:57:18 +0000
Subject: [PATCH] gdb/gdbarch: remove the predicate function for
gdbarch_register_type
I don't believe that the gdbarch_register_type_p predicate is called
anywhere in GDB, and the gdbarch_register_type function is called
without checking the gdbarch_register_type_p predicate function
everywhere it is used, for example in
init_regcache_descr (regcache.c).
My claim is that the gdbarch_register_type function is required for
every architecture, and GDB will not work if this function is not
supplied.
And so, in this commit, I remove the 'predicate=True' from
gdbarch-components.py for the 'register_type' field, and regenerate
the gdbarch files.
There should be no user visible changes after this commit.
---
gdb/gdbarch-components.py | 1 -
gdb/gdbarch-gen.h | 2 --
gdb/gdbarch.c | 11 -----------
3 files changed, 14 deletions(-)
diff --git a/gdb/gdbarch-components.py b/gdb/gdbarch-components.py
index bc09d35f9de..aa0b3682593 100644
--- a/gdb/gdbarch-components.py
+++ b/gdb/gdbarch-components.py
@@ -574,7 +574,6 @@ use "register_type".
type="struct type *",
name="register_type",
params=[("int", "reg_nr")],
- predicate=True,
invalid=True,
)
diff --git a/gdb/gdbarch-gen.h b/gdb/gdbarch-gen.h
index b7beb73d36d..7a8721328ab 100644
--- a/gdb/gdbarch-gen.h
+++ b/gdb/gdbarch-gen.h
@@ -296,8 +296,6 @@ extern void set_gdbarch_register_name (struct gdbarch *gdbarch, gdbarch_register
the register cache should call this function directly; others should
use "register_type". */
-extern bool gdbarch_register_type_p (struct gdbarch *gdbarch);
-
typedef struct type * (gdbarch_register_type_ftype) (struct gdbarch *gdbarch, int reg_nr);
extern struct type * gdbarch_register_type (struct gdbarch *gdbarch, int reg_nr);
extern void set_gdbarch_register_type (struct gdbarch *gdbarch, gdbarch_register_type_ftype *register_type);
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 55dd602b27f..28e1fbc2c71 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -443,7 +443,6 @@ verify_gdbarch (struct gdbarch *gdbarch)
/* Skip verify of dwarf2_reg_to_regnum, invalid_p == 0 */
if (gdbarch->register_name == 0)
log.puts ("\n\tregister_name");
- /* Skip verify of register_type, has predicate. */
/* Skip verify of dummy_id, invalid_p == 0 */
/* Skip verify of deprecated_fp_regnum, invalid_p == 0 */
/* Skip verify of push_dummy_call, has predicate. */
@@ -780,9 +779,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
fprintf_filtered (file,
"gdbarch_dump: register_name = <%s>\n",
host_address_to_string (gdbarch->register_name));
- fprintf_filtered (file,
- "gdbarch_dump: gdbarch_register_type_p() = %d\n",
- gdbarch_register_type_p (gdbarch));
fprintf_filtered (file,
"gdbarch_dump: register_type = <%s>\n",
host_address_to_string (gdbarch->register_type));
@@ -2219,13 +2215,6 @@ set_gdbarch_register_name (struct gdbarch *gdbarch,
gdbarch->register_name = register_name;
}
-bool
-gdbarch_register_type_p (struct gdbarch *gdbarch)
-{
- gdb_assert (gdbarch != NULL);
- return gdbarch->register_type != NULL;
-}
-
struct type *
gdbarch_register_type (struct gdbarch *gdbarch, int reg_nr)
{