From 10245fe8171a292dcf50051a33ec5bae7b08cb54 Mon Sep 17 00:00:00 2001 From: Yvan Roux Date: Fri, 24 Jun 2022 17:16:54 +0200 Subject: [PATCH] gdb/arm: Update the value of active sp when base sp changes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For Arm Cortex-M33 with security extensions, there are 4 different stacks pointers (msp_s, msp_ns, psp_s, psp_ns). When plain "sp" is updated during unwinding of the stack, the active stack pointer of the 4 stack pointers needs to be kept in sync. Signed-off-by: Torbjörn SVENSSON Signed-off-by: Yvan Roux --- gdb/arm-tdep.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 0c907482036..96d70d40b28 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -923,6 +923,7 @@ thumb_analyze_prologue (struct gdbarch *gdbarch, CORE_ADDR start, CORE_ADDR limit, struct arm_prologue_cache *cache) { + arm_gdbarch_tdep *tdep = (arm_gdbarch_tdep *) gdbarch_tdep (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order_for_code = gdbarch_byte_order_for_code (gdbarch); int i; @@ -1398,9 +1399,6 @@ thumb_analyze_prologue (struct gdbarch *gdbarch, unrecognized_pc = start; } - arm_gdbarch_tdep *tdep - = (arm_gdbarch_tdep *) gdbarch_tdep (gdbarch); - /* Make sure we are dealing with a target that supports ARMv8.1-m PACBTI. */ if (cache != nullptr && tdep->have_pacbti @@ -1460,7 +1458,11 @@ thumb_analyze_prologue (struct gdbarch *gdbarch, for (i = 0; i < gdbarch_num_regs (gdbarch); i++) if (stack.find_reg (gdbarch, i, &offset)) - cache->saved_regs[i].set_addr (offset); + { + cache->saved_regs[i].set_addr (offset); + if (i == ARM_SP_REGNUM) + arm_cache_set_active_sp_value(cache, tdep, offset); + } return unrecognized_pc; } @@ -2087,7 +2089,11 @@ arm_analyze_prologue (struct gdbarch *gdbarch, for (regno = 0; regno < ARM_FPS_REGNUM; regno++) if (stack.find_reg (gdbarch, regno, &offset)) - cache->saved_regs[regno].set_addr (offset); + { + cache->saved_regs[regno].set_addr (offset); + if (regno == ARM_SP_REGNUM) + arm_cache_set_active_sp_value(cache, tdep, offset); + } } arm_debug_printf ("Prologue scan stopped at %s", -- 2.30.2