From ab9bcc67975f2a04dfa0e670096fc8161d7840b9 Mon Sep 17 00:00:00 2001 From: Philipp Rudo Date: Tue, 23 Jan 2018 13:37:42 +0100 Subject: [PATCH] s390: gdbarch_tdep.have_* int -> bool Currently the gdbarch_tdep.have_* flags are a mix of int and bool. Clean this up by making them all bool. gdb/ChangeLog: * s390-linux-tdep.c (gdbarch_tdep) : Change type to bool. (s390_gdbarch_tdep_alloc): Adjust. (s390_gdbarch_init): Adjust. --- gdb/ChangeLog | 7 +++++++ gdb/s390-linux-tdep.c | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cc4816b7a3..52394ab6ec 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2018-01-23 Philipp Rudo + + * s390-linux-tdep.c (gdbarch_tdep) + : Change type to bool. + (s390_gdbarch_tdep_alloc): Adjust. + (s390_gdbarch_init): Adjust. + 2018-01-23 Philipp Rudo * s390-linux-tdep (s390_abi_kind) : New default field. diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c index e107af8b07..7d41dfeb9b 100644 --- a/gdb/s390-linux-tdep.c +++ b/gdb/s390-linux-tdep.c @@ -113,9 +113,9 @@ struct gdbarch_tdep int v0_full_regnum; bool have_upper; - int have_linux_v1; - int have_linux_v2; - int have_tdb; + bool have_linux_v1; + bool have_linux_v2; + bool have_tdb; bool have_vx; bool have_gs; }; @@ -7824,9 +7824,9 @@ s390_gdbarch_tdep_alloc () tdep->cc_regnum = -1; tdep->have_upper = false; - tdep->have_linux_v1 = 0; - tdep->have_linux_v2 = 0; - tdep->have_tdb = 0; + tdep->have_linux_v1 = false; + tdep->have_linux_v2 = false; + tdep->have_tdb = false; tdep->have_vx = false; tdep->have_gs = false; @@ -7993,13 +7993,13 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) if (tdesc_numbered_register (feature, tdesc_data, S390_LAST_BREAK_REGNUM, "last_break")) - tdep->have_linux_v1 = 1; + tdep->have_linux_v1 = true; if (tdesc_numbered_register (feature, tdesc_data, S390_SYSTEM_CALL_REGNUM, "system_call")) - tdep->have_linux_v2 = 1; + tdep->have_linux_v2 = true; - if (tdep->have_linux_v2 > tdep->have_linux_v1) + if (tdep->have_linux_v2 && !tdep->have_linux_v1) valid_p = 0; } @@ -8011,7 +8011,7 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) valid_p &= tdesc_numbered_register (feature, tdesc_data, S390_TDB_DWORD0_REGNUM + i, tdb_regs[i]); - tdep->have_tdb = 1; + tdep->have_tdb = true; } /* Vector registers. */