From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1844) id A34A33858C55; Mon, 25 Jul 2022 13:31:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A34A33858C55 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Yvan Roux To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb/arm: Use if-else if instead of switch X-Act-Checkin: binutils-gdb X-Git-Author: =?utf-8?q?Torbj=C3=B6rn_SVENSSON?= X-Git-Refname: refs/heads/master X-Git-Oldrev: eea2d83593428d2ac18f6b3fc43cff5472521579 X-Git-Newrev: 42e11f363c5e2c5e750e9b9b67fbae511d83974d Message-Id: <20220725133125.A34A33858C55@sourceware.org> Date: Mon, 25 Jul 2022 13:31:25 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jul 2022 13:31:25 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D42e11f363c5e= 2c5e750e9b9b67fbae511d83974d commit 42e11f363c5e2c5e750e9b9b67fbae511d83974d Author: Torbj=C3=B6rn SVENSSON Date: Mon Jul 25 14:51:58 2022 +0200 gdb/arm: Use if-else if instead of switch =20 As the register numbers for the alternative Arm SP registers are not constant, it's not possible to use switch statement to define the rules. In order to not have a mix, replace the few existing switch statements with regular if-else if statements Diff: --- gdb/arm-tdep.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index d3b4fce98a3..7d0944f9e3f 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -3785,9 +3785,8 @@ arm_dwarf2_prev_register (struct frame_info *this_fra= me, void **this_cache, CORE_ADDR lr; ULONGEST cpsr; =20 - switch (regnum) + if (regnum =3D=3D ARM_PC_REGNUM) { - case ARM_PC_REGNUM: /* The PC is normally copied from the return column, which describes saves of LR. However, that version may have an extra bit set to indicate Thumb state. The bit is not @@ -3807,18 +3806,18 @@ arm_dwarf2_prev_register (struct frame_info *this_f= rame, void **this_cache, lr =3D frame_unwind_register_unsigned (this_frame, ARM_LR_REGNUM); return frame_unwind_got_constant (this_frame, regnum, arm_addr_bits_remove (gdbarch, lr)); - - case ARM_PS_REGNUM: + } + else if (regnum =3D=3D ARM_PS_REGNUM) + { /* Reconstruct the T bit; see arm_prologue_prev_register for details= . */ cpsr =3D get_frame_register_unsigned (this_frame, regnum); lr =3D frame_unwind_register_unsigned (this_frame, ARM_LR_REGNUM); cpsr =3D reconstruct_t_bit (gdbarch, lr, cpsr); return frame_unwind_got_constant (this_frame, regnum, cpsr); - - default: - internal_error (__FILE__, __LINE__, - _("Unexpected register %d"), regnum); } + + internal_error (__FILE__, __LINE__, + _("Unexpected register %d"), regnum); } =20 /* Implement the stack_frame_destroyed_p gdbarch method. */ @@ -4944,17 +4943,13 @@ arm_dwarf2_frame_init_reg (struct gdbarch *gdbarch,= int regnum, return; } =20 - switch (regnum) + if (regnum =3D=3D ARM_PC_REGNUM || regnum =3D=3D ARM_PS_REGNUM) { - case ARM_PC_REGNUM: - case ARM_PS_REGNUM: reg->how =3D DWARF2_FRAME_REG_FN; reg->loc.fn =3D arm_dwarf2_prev_register; - break; - case ARM_SP_REGNUM: - reg->how =3D DWARF2_FRAME_REG_CFA; - break; } + else if (regnum =3D=3D ARM_SP_REGNUM) + reg->how =3D DWARF2_FRAME_REG_CFA; } =20 /* Given BUF, which is OLD_LEN bytes ending at ENDADDR, expand