gdb: change gdbarch_adjust_dwarf2_line parameter to bool

Straightforward int to bool conversion.

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

diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 98732420fe2aa037b815726138f57e1fd7a0a83f..8de7655e6384ff88fa7dfe6d87cb5dd3db3c3283 100644 (file)
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -232,7 +232,7 @@ default_adjust_dwarf2_addr (CORE_ADDR pc)
 /* See arch-utils.h.  */
 
 CORE_ADDR
-default_adjust_dwarf2_line (CORE_ADDR addr, int rel)
+default_adjust_dwarf2_line (CORE_ADDR addr, bool rel)
 {
   return addr;
 }

diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
index a898a3b1ad2a6b89762b76e8f04b425c84fdd3f8..d5772575c7a9b3c410187979592731ced81b23d4 100644 (file)
--- a/gdb/arch-utils.h
+++ b/gdb/arch-utils.h
@@ -193,7 +193,7 @@ CORE_ADDR default_adjust_dwarf2_addr (CORE_ADDR pc);
 
 /* Do nothing default implementation of gdbarch_adjust_dwarf2_line.  */
 
-CORE_ADDR default_adjust_dwarf2_line (CORE_ADDR addr, int rel);
+CORE_ADDR default_adjust_dwarf2_line (CORE_ADDR addr, bool rel);
 
 /* Default DWARF vendor CFI handler.  */
 

diff --git a/gdb/dwarf2/line-program.c b/gdb/dwarf2/line-program.c
index e6e9235f7bc09190f855cda260be3fee457158f9..b9da1b4799fcd5bed433bc810959dab175da4864 100644 (file)
--- a/gdb/dwarf2/line-program.c
+++ b/gdb/dwarf2/line-program.c
@@ -519,7 +519,7 @@ lnp_state_machine::lnp_state_machine (struct dwarf2_cu *cu, gdbarch *arch)
        chance to adjust it and also record it in case it needs it.
        This is currently used by MIPS code,
        cf. `mips_adjust_dwarf2_line'.  */
-    m_address ((unrelocated_addr) gdbarch_adjust_dwarf2_line (arch, 0, 0)),
+    m_address ((unrelocated_addr) gdbarch_adjust_dwarf2_line (arch, 0, false)),
     m_flags (m_cu->line_header->default_is_stmt
             ? LEF_IS_STMT : (linetable_entry_flags) 0),
     m_last_address (m_address)

diff --git a/gdb/gdbarch-gen.c b/gdb/gdbarch-gen.c
index 5c524d58cc302185ac0f4d9168646c3c66722565..ddf982ebcf4d1a3d83fe07643b7a61b22398c34b 100644 (file)
--- a/gdb/gdbarch-gen.c
+++ b/gdb/gdbarch-gen.c
@@ -3445,7 +3445,7 @@ set_gdbarch_adjust_dwarf2_addr (struct gdbarch *gdbarch,
 }
 
 CORE_ADDR
-gdbarch_adjust_dwarf2_line (struct gdbarch *gdbarch, CORE_ADDR addr, int rel)
+gdbarch_adjust_dwarf2_line (struct gdbarch *gdbarch, CORE_ADDR addr, bool rel)
 {
   gdb_assert (gdbarch != nullptr);
   gdb_assert (gdbarch->adjust_dwarf2_line != nullptr);

diff --git a/gdb/gdbarch-gen.h b/gdb/gdbarch-gen.h
index 0c15a86765a55eb44314b7b1ff7a8df58ae6c0fc..b6ec669ee2b77a7b676a3871cae0cf5f9cf8e735 100644 (file)
--- a/gdb/gdbarch-gen.h
+++ b/gdb/gdbarch-gen.h
@@ -883,8 +883,8 @@ void set_gdbarch_adjust_dwarf2_addr (struct gdbarch *gdbarch, gdbarch_adjust_dwa
    in turn ensures breakpoint addresses are correctly matched against the
    stop PC. */
 
-using gdbarch_adjust_dwarf2_line_ftype = CORE_ADDR (CORE_ADDR addr, int rel);
-CORE_ADDR gdbarch_adjust_dwarf2_line (struct gdbarch *gdbarch, CORE_ADDR addr, int rel);
+using gdbarch_adjust_dwarf2_line_ftype = CORE_ADDR (CORE_ADDR addr, bool rel);
+CORE_ADDR gdbarch_adjust_dwarf2_line (struct gdbarch *gdbarch, CORE_ADDR addr, bool rel);
 void set_gdbarch_adjust_dwarf2_line (struct gdbarch *gdbarch, gdbarch_adjust_dwarf2_line_ftype *adjust_dwarf2_line);
 
 bool gdbarch_cannot_step_breakpoint (struct gdbarch *gdbarch);

diff --git a/gdb/gdbarch_components.py b/gdb/gdbarch_components.py
index b1cff8c2b69bb9f286033b656873c0fedad20ed7..424558d6ae08e29f00d878cdee90fdc383c2f007 100644 (file)
--- a/gdb/gdbarch_components.py
+++ b/gdb/gdbarch_components.py
@@ -1517,7 +1517,7 @@ stop PC.
 """,
     type="CORE_ADDR",
     name="adjust_dwarf2_line",
-    params=[("CORE_ADDR", "addr"), ("int", "rel")],
+    params=[("CORE_ADDR", "addr"), ("bool", "rel")],
     predefault="default_adjust_dwarf2_line",
     invalid=False,
 )

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 161c94569a87eb3c9d8531ac9db637e842e976e8..3ecf5283a900ce0af3fd6c5240574f46c31ea471 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -1343,7 +1343,7 @@ mips_adjust_dwarf2_addr (CORE_ADDR pc)
    that sets PC to 0 and ADJ_PC accordingly, usually 0 as well.  */
 
 static CORE_ADDR
-mips_adjust_dwarf2_line (CORE_ADDR addr, int rel)
+mips_adjust_dwarf2_line (CORE_ADDR addr, bool rel)
 {
   static CORE_ADDR adj_pc;
   static CORE_ADDR pc;