[PATCH v2 1/4] gdb/arm: Update active msp/psp when switching stack

Torbjörn SVENSSON via Gdb-patches
2022-11-18T15:54:13Z

For targets with secext, msp and psp can be seen as an alias for one
of msp_s, msp_ns, psp_s or psp_ns. When switching active sp, the
coresponding msp/psp needs to be switched too.

Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
---
gdb/arm-tdep.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 7cb3f5f3050..124a94dc87d 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -504,8 +504,23 @@ arm_cache_switch_prev_sp (struct arm_prologue_cache *cache,
gdb_assert (arm_is_alternative_sp_register (tdep, sp_regnum));

if (tdep->have_sec_ext)
- gdb_assert (sp_regnum != tdep->m_profile_msp_regnum
- && sp_regnum != tdep->m_profile_psp_regnum);
+ {
+ gdb_assert (sp_regnum != tdep->m_profile_msp_regnum
+ && sp_regnum != tdep->m_profile_psp_regnum);
+
+ if (sp_regnum == tdep->m_profile_msp_s_regnum
+ || sp_regnum == tdep->m_profile_psp_s_regnum)
+ {
+ cache->active_msp_regnum = tdep->m_profile_msp_s_regnum;
+ cache->active_psp_regnum = tdep->m_profile_psp_s_regnum;
+ }
+ else if (sp_regnum == tdep->m_profile_msp_ns_regnum
+ || sp_regnum == tdep->m_profile_psp_ns_regnum)
+ {
+ cache->active_msp_regnum = tdep->m_profile_msp_ns_regnum;
+ cache->active_psp_regnum = tdep->m_profile_psp_ns_regnum;
+ }
+ }

cache->active_sp_regnum = sp_regnum;
}
--
2.25.1