From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1585) id BCE1A3858D28; Thu, 21 Jul 2022 12:59:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BCE1A3858D28 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Luis Machado To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [arm] Rename arm_cache_is_sp_register to arm_is_alternative_sp_register X-Act-Checkin: binutils-gdb X-Git-Author: =?utf-8?q?Torbj=C3=B6rn_SVENSSON?= X-Git-Refname: refs/heads/master X-Git-Oldrev: 5c3392f9811a9cc46580401cde99337e14cab6e6 X-Git-Newrev: d65edaa0bc3f24537ecde3735b1fa041f36f4ab8 Message-Id: <20220721125939.BCE1A3858D28@sourceware.org> Date: Thu, 21 Jul 2022 12:59:39 +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: Thu, 21 Jul 2022 12:59:39 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dd65edaa0bc3f= 24537ecde3735b1fa041f36f4ab8 commit d65edaa0bc3f24537ecde3735b1fa041f36f4ab8 Author: Torbj=C3=B6rn SVENSSON Date: Thu Jun 30 15:23:56 2022 +0100 [arm] Rename arm_cache_is_sp_register to arm_is_alternative_sp_register =20 All usages of this helper are really made to check if the register is one of the alternative SP registers (MSP/MSP_S/MSP_NS/PSP/PSP_S/PSP_NS) with the ARM_SP_REGNUM case being handled separately. =20 Signed-off-by: Luis Machado Signed-off-by: Torbj=C3=B6rn SVENSSON Signed-off-by: Yvan Roux Diff: --- gdb/arm-tdep.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 3a1b52c2380..89c2779bbb5 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -479,14 +479,12 @@ arm_cache_set_active_sp_value (struct arm_prologue_ca= che *cache, gdb_assert_not_reached ("Invalid SP selection"); } =20 -/* Return true if REGNUM is one of the stack pointers. */ +/* Return true if REGNUM is one of the alternative stack pointers. */ =20 static bool -arm_cache_is_sp_register (struct arm_prologue_cache *cache, - arm_gdbarch_tdep *tdep, int regnum) +arm_is_alternative_sp_register (arm_gdbarch_tdep *tdep, int regnum) { - if ((regnum =3D=3D ARM_SP_REGNUM) - || (regnum =3D=3D tdep->m_profile_msp_regnum) + if ((regnum =3D=3D tdep->m_profile_msp_regnum) || (regnum =3D=3D tdep->m_profile_msp_s_regnum) || (regnum =3D=3D tdep->m_profile_msp_ns_regnum) || (regnum =3D=3D tdep->m_profile_psp_regnum) @@ -503,8 +501,7 @@ static void arm_cache_switch_prev_sp (struct arm_prologue_cache *cache, arm_gdbarch_tdep *tdep, int sp_regnum) { - gdb_assert (sp_regnum !=3D ARM_SP_REGNUM); - gdb_assert (arm_cache_is_sp_register (cache, tdep, sp_regnum)); + gdb_assert (arm_is_alternative_sp_register (tdep, sp_regnum)); =20 if (tdep->have_sec_ext) gdb_assert (sp_regnum !=3D tdep->m_profile_msp_regnum @@ -2347,7 +2344,7 @@ arm_prologue_prev_register (struct frame_info *this_f= rame, =20 /* The value might be one of the alternative SP, if so, use the value already constructed. */ - if (arm_cache_is_sp_register (cache, tdep, prev_regnum)) + if (arm_is_alternative_sp_register (tdep, prev_regnum)) { sp_value =3D arm_cache_get_sp_register (cache, tdep, prev_regnum); return frame_unwind_got_constant (this_frame, prev_regnum, sp_value); @@ -3694,7 +3691,7 @@ arm_m_exception_prev_register (struct frame_info *thi= s_frame, =20 /* The value might be one of the alternative SP, if so, use the value already constructed. */ - if (arm_cache_is_sp_register (cache, tdep, prev_regnum)) + if (arm_is_alternative_sp_register (tdep, prev_regnum)) { sp_value =3D arm_cache_get_sp_register (cache, tdep, prev_regnum); return frame_unwind_got_constant (this_frame, prev_regnum, sp_value);