From 07fbbd013824ba9fa0bdd466f526234dc4fcca18 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 20 Oct 2020 17:39:47 -0400 Subject: gdb: make gdbarch_displaced_step_hw_singlestep return bool Replace the int-used-as-a-bool with a bool. gdb/ChangeLog: * gdbarch.sh (displaced_step_hw_singlestep): Return bool. * gdbarch.c: Re-generate. * gdbarch.h: Re-generate. * aarch64-tdep.c (aarch64_displaced_step_hw_singlestep): Return bool. * aarch64-tdep.h (aarch64_displaced_step_hw_singlestep): Likewise. * arch-utils.h (default_displaced_step_hw_singlestep): Likewise. * arch-utils.c (default_displaced_step_hw_singlestep): Likewise. * rs6000-tdep.c (ppc_displaced_step_hw_singlestep): Likewise. * s390-tdep.c (s390_displaced_step_hw_singlestep): Likewise. Change-Id: I76a78366dc5c0afb03f8f4bddf9f4e8d68fe3114 --- gdb/ChangeLog | 14 ++++++++++++++ gdb/aarch64-tdep.c | 4 ++-- gdb/aarch64-tdep.h | 4 ++-- gdb/arch-utils.c | 2 +- gdb/arch-utils.h | 2 +- gdb/gdbarch.c | 2 +- gdb/gdbarch.h | 4 ++-- gdb/gdbarch.sh | 2 +- gdb/rs6000-tdep.c | 4 ++-- gdb/s390-tdep.c | 4 ++-- 10 files changed, 28 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bc50f0e..1ea6780 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,19 @@ 2020-10-20 Simon Marchi + * gdbarch.sh (displaced_step_hw_singlestep): Return bool. + * gdbarch.c: Re-generate. + * gdbarch.h: Re-generate. + * aarch64-tdep.c (aarch64_displaced_step_hw_singlestep): Return + bool. + * aarch64-tdep.h (aarch64_displaced_step_hw_singlestep): + Likewise. + * arch-utils.h (default_displaced_step_hw_singlestep): Likewise. + * arch-utils.c (default_displaced_step_hw_singlestep): Likewise. + * rs6000-tdep.c (ppc_displaced_step_hw_singlestep): Likewise. + * s390-tdep.c (s390_displaced_step_hw_singlestep): Likewise. + +2020-10-20 Simon Marchi + * gdbarch.sh: Make generated predicates return bool. * gdbarch.c: Re-generate. * gdbarch.h: Re-generate. diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index cbc7038..73bfcf5 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -3269,11 +3269,11 @@ aarch64_displaced_step_fixup (struct gdbarch *gdbarch, /* Implement the "displaced_step_hw_singlestep" gdbarch method. */ -int +bool aarch64_displaced_step_hw_singlestep (struct gdbarch *gdbarch, struct displaced_step_closure *closure) { - return 1; + return true; } /* Get the correct target description for the given VQ value. diff --git a/gdb/aarch64-tdep.h b/gdb/aarch64-tdep.h index f6ebabe..2f15758 100644 --- a/gdb/aarch64-tdep.h +++ b/gdb/aarch64-tdep.h @@ -117,7 +117,7 @@ void aarch64_displaced_step_fixup (struct gdbarch *gdbarch, CORE_ADDR from, CORE_ADDR to, struct regcache *regs); -int aarch64_displaced_step_hw_singlestep (struct gdbarch *gdbarch, - struct displaced_step_closure *closure); +bool aarch64_displaced_step_hw_singlestep (struct gdbarch *gdbarch, + displaced_step_closure *closure); #endif /* aarch64-tdep.h */ diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index 12e3b8d..27ac2f7 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -38,7 +38,7 @@ #include "dis-asm.h" -int +bool default_displaced_step_hw_singlestep (struct gdbarch *gdbarch, struct displaced_step_closure *closure) { diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h index 8cb0db0..418b5c1 100644 --- a/gdb/arch-utils.h +++ b/gdb/arch-utils.h @@ -75,7 +75,7 @@ struct bp_manipulation_endian BREAK_INSN_LITTLE, BREAK_INSN_BIG> /* Default implementation of gdbarch_displaced_hw_singlestep. */ -extern int +extern bool default_displaced_step_hw_singlestep (struct gdbarch *, struct displaced_step_closure *); diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 664aa9c..3a55820 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -3986,7 +3986,7 @@ set_gdbarch_displaced_step_copy_insn (struct gdbarch *gdbarch, gdbarch->displaced_step_copy_insn = displaced_step_copy_insn; } -int +bool gdbarch_displaced_step_hw_singlestep (struct gdbarch *gdbarch, struct displaced_step_closure *closure) { gdb_assert (gdbarch != NULL); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index a123748..d126dfc 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -1044,8 +1044,8 @@ extern void set_gdbarch_displaced_step_copy_insn (struct gdbarch *gdbarch, gdbar The default implementation returns false on all targets that provide a gdbarch_software_single_step routine, and true otherwise. */ -typedef int (gdbarch_displaced_step_hw_singlestep_ftype) (struct gdbarch *gdbarch, struct displaced_step_closure *closure); -extern int gdbarch_displaced_step_hw_singlestep (struct gdbarch *gdbarch, struct displaced_step_closure *closure); +typedef bool (gdbarch_displaced_step_hw_singlestep_ftype) (struct gdbarch *gdbarch, struct displaced_step_closure *closure); +extern bool gdbarch_displaced_step_hw_singlestep (struct gdbarch *gdbarch, struct displaced_step_closure *closure); extern void set_gdbarch_displaced_step_hw_singlestep (struct gdbarch *gdbarch, gdbarch_displaced_step_hw_singlestep_ftype *displaced_step_hw_singlestep); /* Fix up the state resulting from successfully single-stepping a diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 5fe37e0..0b59ef0 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -794,7 +794,7 @@ M;displaced_step_closure_up;displaced_step_copy_insn;CORE_ADDR from, CORE_ADDR t # # The default implementation returns false on all targets that # provide a gdbarch_software_single_step routine, and true otherwise. -m;int;displaced_step_hw_singlestep;struct displaced_step_closure *closure;closure;;default_displaced_step_hw_singlestep;;0 +m;bool;displaced_step_hw_singlestep;struct displaced_step_closure *closure;closure;;default_displaced_step_hw_singlestep;;0 # Fix up the state resulting from successfully single-stepping a # displaced instruction, to give the result we would have gotten from diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 7e65151..d4d7781 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -994,11 +994,11 @@ ppc_displaced_step_fixup (struct gdbarch *gdbarch, /* Always use hardware single-stepping to execute the displaced instruction. */ -static int +static bool ppc_displaced_step_hw_singlestep (struct gdbarch *gdbarch, struct displaced_step_closure *closure) { - return 1; + return true; } /* Checks for an atomic sequence of instructions beginning with a diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 4d3644e..176f170 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -586,11 +586,11 @@ s390_displaced_step_fixup (struct gdbarch *gdbarch, /* Implement displaced_step_hw_singlestep gdbarch method. */ -static int +static bool s390_displaced_step_hw_singlestep (struct gdbarch *gdbarch, struct displaced_step_closure *closure) { - return 1; + return true; } /* Prologue analysis. */ -- cgit v1.1