gdb/arm: Only stack S16..S31 when FPU registers are secure

The FPCCR.TS bit is used to identify if FPU registers are considered
non-secure or secure.  If they are secure, then callee saved registers
(S16 to S31) are stacked on exception entry or otherwise skipped.

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:
Yvan Roux
2022-06-29 14:01:45 +02:00
parent 6837a663c5
commit 69b46464ba
2 changed files with 17 additions and 1 deletions

View File

@@ -109,6 +109,15 @@ enum arm_m_profile_type {
ARM_M_TYPE_INVALID
};
/* System control registers accessible through an addresses. */
enum system_register_address : CORE_ADDR
{
/* M-profile Floating-Point Context Control Register address, defined in
ARMv7-M (Section B3.2.2) and ARMv8-M (Section D1.2.99) reference
manuals. */
FPCCR = 0xe000ef34
};
/* Instruction condition field values. */
#define INST_EQ 0x0
#define INST_NE 0x1

View File

@@ -3573,6 +3573,13 @@ arm_m_exception_cache (struct frame_info *this_frame)
{
int i;
int fpu_regs_stack_offset;
ULONGEST fpccr;
/* Read FPCCR register. */
gdb_assert (safe_read_memory_unsigned_integer (FPCCR,
ARM_INT_REGISTER_SIZE,
byte_order, &fpccr));
bool fpccr_ts = bit (fpccr,26);
/* This code does not take into account the lazy stacking, see "Lazy
context save of FP state", in B1.5.7, also ARM AN298, supported
@@ -3592,7 +3599,7 @@ arm_m_exception_cache (struct frame_info *this_frame)
cache->saved_regs[ARM_FPSCR_REGNUM].set_addr (unwound_sp + sp_r0_offset + 0x60);
fpu_regs_stack_offset += 4;
if (tdep->have_sec_ext && !default_callee_register_stacking)
if (tdep->have_sec_ext && !default_callee_register_stacking && fpccr_ts)
{
/* Handle floating-point callee saved registers. */
fpu_regs_stack_offset = unwound_sp + sp_r0_offset + 0x68;