Change gdbarch_inner_than to return bool

A recent patch from Andrew pointed out that gdbarch_inner_than returns
'int', while it should really return 'bool'.

Approved-By: Pedro Alves <pedro@palves.net>

diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 78145656b8d8ca89e8ee3812bf7288f681f59353..83e29470bf78a5bf7dd9e54f57aa054f57cd32a9 100644 (file)
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -173,16 +173,16 @@ default_code_of_frame_writable (struct gdbarch *gdbarch,
 
 /* Helper functions for gdbarch_inner_than */
 
-int
+bool
 core_addr_lessthan (CORE_ADDR lhs, CORE_ADDR rhs)
 {
-  return (lhs < rhs);
+  return lhs < rhs;
 }
 
-int
+bool
 core_addr_greaterthan (CORE_ADDR lhs, CORE_ADDR rhs)
 {
-  return (lhs > rhs);
+  return lhs > rhs;
 }
 
 /* Misc helper functions for targets.  */

diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
index 467be40c68888316904d0cdb003879268e55d256..40c62f30a65fbf86a1644ae24ef3f6ec329fd87f 100644 (file)
--- a/gdb/arch-utils.h
+++ b/gdb/arch-utils.h
@@ -83,8 +83,8 @@ extern bool default_displaced_step_hw_singlestep (struct gdbarch *);
 extern CORE_ADDR displaced_step_at_entry_point (struct gdbarch *gdbarch);
 
 /* The only possible cases for inner_than.  */
-extern int core_addr_lessthan (CORE_ADDR lhs, CORE_ADDR rhs);
-extern int core_addr_greaterthan (CORE_ADDR lhs, CORE_ADDR rhs);
+extern bool core_addr_lessthan (CORE_ADDR lhs, CORE_ADDR rhs);
+extern bool core_addr_greaterthan (CORE_ADDR lhs, CORE_ADDR rhs);
 
 /* Identity functions on a CORE_ADDR.  Just return the "addr".  */
 

diff --git a/gdb/gdbarch-gen.h b/gdb/gdbarch-gen.h
index 63fab26987f191763f9ff07ba98aad40233eb75b..b982fd7cd092e071d90b010b9deee2c270520855 100644 (file)
--- a/gdb/gdbarch-gen.h
+++ b/gdb/gdbarch-gen.h
@@ -547,8 +547,8 @@ typedef CORE_ADDR (gdbarch_skip_entrypoint_ftype) (struct gdbarch *gdbarch, CORE
 extern CORE_ADDR gdbarch_skip_entrypoint (struct gdbarch *gdbarch, CORE_ADDR ip);
 extern void set_gdbarch_skip_entrypoint (struct gdbarch *gdbarch, gdbarch_skip_entrypoint_ftype *skip_entrypoint);
 
-typedef int (gdbarch_inner_than_ftype) (CORE_ADDR lhs, CORE_ADDR rhs);
-extern int gdbarch_inner_than (struct gdbarch *gdbarch, CORE_ADDR lhs, CORE_ADDR rhs);
+typedef bool (gdbarch_inner_than_ftype) (CORE_ADDR lhs, CORE_ADDR rhs);
+extern bool gdbarch_inner_than (struct gdbarch *gdbarch, CORE_ADDR lhs, CORE_ADDR rhs);
 extern void set_gdbarch_inner_than (struct gdbarch *gdbarch, gdbarch_inner_than_ftype *inner_than);
 
 typedef const gdb_byte * (gdbarch_breakpoint_from_pc_ftype) (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr);

diff --git a/gdb/gdbarch-selftests.c b/gdb/gdbarch-selftests.c
index db99fe08141234109deae07953f2c05d6457b025..dbb93412eea6b461c18efac99a64168365dc2508 100644 (file)
--- a/gdb/gdbarch-selftests.c
+++ b/gdb/gdbarch-selftests.c
@@ -173,8 +173,8 @@ check_stack_growth (struct gdbarch *gdbarch)
      implementation by calling gdbarch_inner_than.  GDB assumes that stacks
      either grow down or up (see uses of gdbarch_stack_grows_down), so exactly
      one of these needs to be true.  */
-  bool stack_grows_down = gdbarch_inner_than (gdbarch, 1, 2) != 0;
-  bool stack_grows_up = gdbarch_inner_than (gdbarch, 2, 1) != 0;
+  bool stack_grows_down = gdbarch_inner_than (gdbarch, 1, 2);
+  bool stack_grows_up = gdbarch_inner_than (gdbarch, 2, 1);
 
   SELF_CHECK (stack_grows_up != stack_grows_down);
 }

diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 2d92f604c49d0d240a012730aa895b08d2538f63..58e9ebbdc59347b3c03d3ded9c290858df07ee7e 100644 (file)
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -2788,7 +2788,7 @@ set_gdbarch_skip_entrypoint (struct gdbarch *gdbarch,
   gdbarch->skip_entrypoint = skip_entrypoint;
 }
 
-int
+bool
 gdbarch_inner_than (struct gdbarch *gdbarch, CORE_ADDR lhs, CORE_ADDR rhs)
 {
   gdb_assert (gdbarch != NULL);

diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index d4c6795a12b11d10b7c7dadf85d2271593b28a62..5175ef79e5b8332f0a10c0074d352892c0e89771 100644 (file)
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -375,7 +375,7 @@ gdbarch_num_cooked_regs (gdbarch *arch)
 static inline bool
 gdbarch_stack_grows_down (gdbarch *arch)
 {
-  return gdbarch_inner_than (arch, 1, 2) != 0;
+  return gdbarch_inner_than (arch, 1, 2);
 }
 
 #endif

diff --git a/gdb/gdbarch_components.py b/gdb/gdbarch_components.py
index 24e979431b6662a096e85d88a83155e0102e322d..4006380076dc7e25aadb13e640c9788ca326b65d 100644 (file)
--- a/gdb/gdbarch_components.py
+++ b/gdb/gdbarch_components.py
@@ -1020,7 +1020,7 @@ is not used.
 )
 
 Function(
-    type="int",
+    type="bool",
     name="inner_than",
     params=[("CORE_ADDR", "lhs"), ("CORE_ADDR", "rhs")],
 )