From 4144571254685a89f57b3b0f602c5a9d4bc20a3c Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Wed, 22 Feb 2023 17:13:07 +0000 Subject: gdb: remove gdbarch_displaced_step_fixup_p The comment on the gdbarch_displaced_step_fixup gdbarch method indicates that this method is optional and that GDB will perform some default if this method is not supplied. As such we define a predicate gdbarch_displaced_step_fixup_p. It may have been true at one point that the fixup method was optional, but it is no longer true. If this method is not defined and GDB tries to complete a displaced step, then GDB is going to crash. Additionally the gdbarch_displaced_step_fixup_p predicate is not used anywhere in GDB. In this commit I have removed the gdbarch_displaced_step_fixup_p predicate, and I have updated the validation check for the gdbarch_displaced_step_fixup method; if the gdbarch_displaced_step_copy_insn method is defined then the fixup method must also be defined. I believe I've manually checked all the current places where gdbarch_displaced_step_copy_insn is defined and they all also define the fixup method, so this change should cause no problems for anyone. There should be no user visible changes after this commit. Approved-By: Pedro Alves --- gdb/gdbarch_components.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gdb/gdbarch_components.py') diff --git a/gdb/gdbarch_components.py b/gdb/gdbarch_components.py index 92c501d..2b1a2b4 100644 --- a/gdb/gdbarch_components.py +++ b/gdb/gdbarch_components.py @@ -1796,8 +1796,9 @@ see the comments in infrun.c. ("CORE_ADDR", "to"), ("struct regcache *", "regs"), ], - predicate=True, + predicate=False, predefault="NULL", + invalid="(gdbarch->displaced_step_copy_insn == nullptr) != (gdbarch->displaced_step_fixup == nullptr)", ) Method( -- cgit v1.1