espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-18 16:53:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

[arm] Rename arm_cache_is_sp_register to arm_is_alternative_sp_register

Browse Source 
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.

Signed-off-by: Luis Machado <luis.machado@arm.com>
Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
Signed-off-by: Yvan Roux <yvan.roux@foss.st.com>
This commit is contained in:
Torbjörn SVENSSON
2022-06-30 15:23:56 +01:00
committed by Luis Machado
parent 5c3392f981
commit d65edaa0bc
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gdb/arm-tdep.c
View File

@ -479,14 +479,12 @@ arm_cache_set_active_sp_value (struct arm_prologue_cache *cache,
gdb_assert_not_reached ("Invalid SP selection"); gdb_assert_not_reached ("Invalid SP selection");
} }
/* Return true if REGNUM is one of the stack pointers. */ /* Return true if REGNUM is one of the alternative stack pointers. */
static bool static bool
arm_cache_is_sp_register (struct arm_prologue_cache *cache, arm_is_alternative_sp_register (arm_gdbarch_tdep *tdep, int regnum)
arm_gdbarch_tdep *tdep, int regnum)
{ {
if ((regnum == ARM_SP_REGNUM) if ((regnum == tdep->m_profile_msp_regnum)
|| (regnum == tdep->m_profile_msp_regnum)
|| (regnum == tdep->m_profile_msp_s_regnum) || (regnum == tdep->m_profile_msp_s_regnum)
|| (regnum == tdep->m_profile_msp_ns_regnum) || (regnum == tdep->m_profile_msp_ns_regnum)
|| (regnum == tdep->m_profile_psp_regnum) || (regnum == tdep->m_profile_psp_regnum)
@ -503,8 +501,7 @@ static void
arm_cache_switch_prev_sp (struct arm_prologue_cache *cache, arm_cache_switch_prev_sp (struct arm_prologue_cache *cache,
arm_gdbarch_tdep *tdep, int sp_regnum) arm_gdbarch_tdep *tdep, int sp_regnum)
{ {
gdb_assert (sp_regnum != ARM_SP_REGNUM); gdb_assert (arm_is_alternative_sp_register (tdep, sp_regnum));
gdb_assert (arm_cache_is_sp_register (cache, tdep, sp_regnum));
if (tdep->have_sec_ext) if (tdep->have_sec_ext)
gdb_assert (sp_regnum != tdep->m_profile_msp_regnum gdb_assert (sp_regnum != tdep->m_profile_msp_regnum
@ -2347,7 +2344,7 @@ arm_prologue_prev_register (struct frame_info *this_frame,
/* The value might be one of the alternative SP, if so, use the /* The value might be one of the alternative SP, if so, use the
value already constructed. */ value already constructed. */
if (arm_cache_is_sp_register (cache, tdep, prev_regnum)) if (arm_is_alternative_sp_register (tdep, prev_regnum))
{ {
sp_value = arm_cache_get_sp_register (cache, tdep, prev_regnum); sp_value = arm_cache_get_sp_register (cache, tdep, prev_regnum);
return frame_unwind_got_constant (this_frame, prev_regnum, sp_value); return frame_unwind_got_constant (this_frame, prev_regnum, sp_value);
@ -3694,7 +3691,7 @@ arm_m_exception_prev_register (struct frame_info *this_frame,
/* The value might be one of the alternative SP, if so, use the /* The value might be one of the alternative SP, if so, use the
value already constructed. */ value already constructed. */
if (arm_cache_is_sp_register (cache, tdep, prev_regnum)) if (arm_is_alternative_sp_register (tdep, prev_regnum))
{ {
sp_value = arm_cache_get_sp_register (cache, tdep, prev_regnum); sp_value = arm_cache_get_sp_register (cache, tdep, prev_regnum);
return frame_unwind_got_constant (this_frame, prev_regnum, sp_value); return frame_unwind_got_constant (this_frame, prev_regnum, sp_value);