From: Yvan Roux <yvan.roux@foss.st.com>
To: <gdb-patches@sourceware.org>
Cc: Torbjorn SVENSSON <torbjorn.svensson@foss.st.com>,
Luis Machado <luis.machado@arm.com>
Subject: [PATCH 2/3] gdb/arm: Track msp and psp
Date: Tue, 14 Jun 2022 17:00:32 +0200 [thread overview]
Message-ID: <20220614150032.GD12000@gnbcxd0114.gnb.st.com> (raw)
In-Reply-To: <20220614145606.GB12000@gnbcxd0114.gnb.st.com>
For Arm Cortex-M33 with security extensions, there are 4 different
stack pointers (msp_s, msp_ns, psp_s, psp_ns). To be compatible
with earlier Cortex-M derivates, the msp and psp registers are
aliases for one of the 4 real stack pointer registers.
These are the combinations that exist:
sp -> msp -> msp_s
sp -> msp -> msp_ns
sp -> psp -> psp_s
sp -> psp -> psp_ns
This means that when the GDB client is to show the value of "msp",
the value should always be equal to either "msp_s" or "msp_ns".
Same goes for "psp".
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29121
Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
Signed-off-by: Yvan Roux <yvan.roux@foss.st.com>
---
gdb/arm-tdep.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 1df57f5b5c8..e497dd1b3b8 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -288,6 +288,8 @@ struct arm_prologue_cache
/* Active stack pointer. */
int active_sp_regnum;
+ int active_msp_regnum;
+ int active_psp_regnum;
/* The frame base for this frame is just prev_sp - frame size.
FRAMESIZE is the distance from the frame pointer to the
@@ -345,11 +347,23 @@ arm_cache_init (struct arm_prologue_cache *cache, struct frame_info *frame)
if (tdep->have_sec_ext)
{
+ CORE_ADDR msp_val = get_frame_register_unsigned (frame, tdep->m_profile_msp_regnum);
+ CORE_ADDR psp_val = get_frame_register_unsigned (frame, tdep->m_profile_psp_regnum);
+
arm_cache_init_sp (tdep->m_profile_msp_s_regnum, &cache->msp_s, cache, frame);
arm_cache_init_sp (tdep->m_profile_psp_s_regnum, &cache->psp_s, cache, frame);
arm_cache_init_sp (tdep->m_profile_msp_ns_regnum, &cache->msp_ns, cache, frame);
arm_cache_init_sp (tdep->m_profile_psp_ns_regnum, &cache->psp_ns, cache, frame);
+ if (msp_val == cache->msp_s)
+ cache->active_msp_regnum = tdep->m_profile_msp_s_regnum;
+ else if (msp_val == cache->msp_ns)
+ cache->active_msp_regnum = tdep->m_profile_msp_ns_regnum;
+ if (psp_val == cache->psp_s)
+ cache->active_psp_regnum = tdep->m_profile_psp_s_regnum;
+ else if (psp_val == cache->psp_ns)
+ cache->active_psp_regnum = tdep->m_profile_psp_ns_regnum;
+
/* Use MSP_S as default stack pointer. */
if (cache->active_sp_regnum == ARM_SP_REGNUM)
cache->active_sp_regnum = tdep->m_profile_msp_s_regnum;
@@ -384,6 +398,10 @@ arm_cache_get_sp_register (struct arm_prologue_cache *cache,
return cache->psp_s;
if (regnum == tdep->m_profile_psp_ns_regnum)
return cache->psp_ns;
+ if (regnum == tdep->m_profile_msp_regnum)
+ return arm_cache_get_sp_register (cache, tdep, cache->active_msp_regnum);
+ if (regnum == tdep->m_profile_psp_regnum)
+ return arm_cache_get_sp_register (cache, tdep, cache->active_psp_regnum);
}
else if (tdep->is_m)
{
--
2.17.1
next prev parent reply other threads:[~2022-06-14 15:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 14:56 [PATCH 0/3] gdb/arm: ARMv8-M Secure/Non-Secure stack support fixes Yvan Roux
2022-06-14 14:59 ` [PATCH 1/3] gdb/arm: Fetch initial sp value prior to compare Yvan Roux
2022-06-15 8:39 ` Luis Machado
2022-06-15 9:20 ` Yvan Roux
2022-06-14 15:00 ` Yvan Roux [this message]
2022-06-15 8:57 ` [PATCH 2/3] gdb/arm: Track msp and psp Luis Machado
2022-06-15 9:28 ` Yvan Roux
2022-06-15 9:46 ` Torbjorn SVENSSON
2022-06-15 10:15 ` Luis Machado
2022-06-15 10:46 ` Yvan Roux
2022-06-14 15:01 ` [PATCH 3/3] gdb/arm: Make sp alias for one of the other stack pointers Yvan Roux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220614150032.GD12000@gnbcxd0114.gnb.st.com \
--to=yvan.roux@foss.st.com \
--cc=gdb-patches@sourceware.org \
--cc=luis.machado@arm.com \
--cc=torbjorn.svensson@foss.st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).