gdb: change gdbarch_fast_tracepoint_valid_at to return bool

Change-Id: Ib88a1667df6f580745a647e8ea9672b9b49a3f5c
Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 886f9431fea87824fd555f0a9b87e759626ef67b..3a0e3f35f2caa0e19fd572da56f04cb58429a853 100644 (file)
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -857,7 +857,7 @@ default_has_shared_address_space (struct gdbarch *gdbarch)
   return false;
 }
 
-int
+bool
 default_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr,
                                  std::string *msg)
 {
@@ -865,7 +865,7 @@ default_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr,
      tracepoints that doesn't need gdbarch, so always say yes.  */
   if (msg)
     msg->clear ();
-  return 1;
+  return true;
 }
 
 const gdb_byte *

diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
index 5ff262179f8155f30846b4fdb731ad002b3db8f1..66a5c89744906ae4d530f7b7862de2203b5a04d5 100644 (file)
--- a/gdb/arch-utils.h
+++ b/gdb/arch-utils.h
@@ -302,8 +302,9 @@ extern struct gdbarch *get_current_arch (void);
 
 extern bool default_has_shared_address_space (struct gdbarch *);
 
-extern int default_fast_tracepoint_valid_at (struct gdbarch *gdbarch,
-                                            CORE_ADDR addr, std::string *msg);
+extern bool default_fast_tracepoint_valid_at (struct gdbarch *gdbarch,
+                                             CORE_ADDR addr,
+                                             std::string *msg);
 
 extern const gdb_byte *default_breakpoint_from_pc (struct gdbarch *gdbarch,
                                                   CORE_ADDR *pcptr,

diff --git a/gdb/gdbarch-gen.c b/gdb/gdbarch-gen.c
index 332849c162e67af1f9f98817b1c8571e05c6c6b9..e1f8759a8ee9b521e97e605f00a0761cb4c9d91f 100644 (file)
--- a/gdb/gdbarch-gen.c
+++ b/gdb/gdbarch-gen.c
@@ -4749,7 +4749,7 @@ set_gdbarch_has_shared_address_space (struct gdbarch *gdbarch,
   gdbarch->has_shared_address_space = has_shared_address_space;
 }
 
-int
+bool
 gdbarch_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr, std::string *msg)
 {
   gdb_assert (gdbarch != NULL);

diff --git a/gdb/gdbarch-gen.h b/gdb/gdbarch-gen.h
index b4f73e308db36f442ced12e1aac88b158e950731..3225a0857ebc7f98650e6d2cc5c27880ffa9422a 100644 (file)
--- a/gdb/gdbarch-gen.h
+++ b/gdb/gdbarch-gen.h
@@ -1515,8 +1515,8 @@ extern void set_gdbarch_has_shared_address_space (struct gdbarch *gdbarch, gdbar
 
 /* True if a fast tracepoint can be set at an address. */
 
-typedef int (gdbarch_fast_tracepoint_valid_at_ftype) (struct gdbarch *gdbarch, CORE_ADDR addr, std::string *msg);
-extern int gdbarch_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr, std::string *msg);
+typedef bool (gdbarch_fast_tracepoint_valid_at_ftype) (struct gdbarch *gdbarch, CORE_ADDR addr, std::string *msg);
+extern bool gdbarch_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr, std::string *msg);
 extern void set_gdbarch_fast_tracepoint_valid_at (struct gdbarch *gdbarch, gdbarch_fast_tracepoint_valid_at_ftype *fast_tracepoint_valid_at);
 
 /* Guess register state based on tracepoint location.  Used for tracepoints

diff --git a/gdb/gdbarch_components.py b/gdb/gdbarch_components.py
index c719c27279107c34d8d36cd947ed69afecd4fab3..6fdc576283c0119b26ec6d7b5808cf06131d95ac 100644 (file)
--- a/gdb/gdbarch_components.py
+++ b/gdb/gdbarch_components.py
@@ -2405,7 +2405,7 @@ Method(
     comment="""
 True if a fast tracepoint can be set at an address.
 """,
-    type="int",
+    type="bool",
     name="fast_tracepoint_valid_at",
     params=[("CORE_ADDR", "addr"), ("std::string *", "msg")],
     predefault="default_fast_tracepoint_valid_at",

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 6863c1579e6950a9e84eb0fec9f2ef544ee020dc..e52140a3c13fe943e487e4dd9445eee01451f2bf 100644 (file)
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -8394,7 +8394,7 @@ static const int i386_record_regmap[] =
    of instruction to replace, and 0 if not, plus an explanatory
    string.  */
 
-static int
+static bool
 i386_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr,
                               std::string *msg)
 {
@@ -8432,13 +8432,13 @@ i386_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr,
        *msg = string_printf (_("; instruction is only %d bytes long, "
                                "need at least %d bytes for the jump"),
                              len, jumplen);
-      return 0;
+      return false;
     }
   else
     {
       if (msg)
        msg->clear ();
-      return 1;
+      return true;
     }
 }