gdb/arm: Update active msp/psp when switching stack

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
corresponding msp/psp needs to be switched too.

Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 7cb3f5f3050757d8edef49dae7e4e63376006ced..124a94dc87d72536d6931ab1e5045b781a3b43de 100644 (file)
--- 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;
 }