On arm64, the compiler can set the frame pointer either
with a move operation or with and add operation like:

    add (SP + constant), BP

For a simple move operation, the CFA base is changed from SP to BP.
Handle also changing the CFA base when the frame pointer is set with
an addition instruction.

Signed-off-by: Julien Thierry <jthie...@redhat.com>
---
 tools/objtool/check.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 50b3a4504db1..9f7a14a24a65 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1901,6 +1901,19 @@ static int update_cfi_state(struct instruction *insn, 
struct cfi_state *cfi,
                                break;
                        }
 
+                       if (!cfi->drap && op->src.reg == CFI_SP &&
+                           op->dest.reg == CFI_BP && cfa->base == CFI_SP &&
+                           check_reg_frame_pos(&regs[CFI_BP],
+                                               -cfa->offset + op->src.offset + 
STACKFRAME_SIZE,
+                                               STACKFRAME_BP_OFFSET)) {
+
+                               /* lea disp(%rsp), %rbp */
+                               cfa->base = CFI_BP;
+                               cfa->offset -= op->src.offset;
+                               cfi->bp_scratch = false;
+                               break;
+                       }
+
                        if (op->src.reg == CFI_SP && cfa->base == CFI_SP) {
 
                                /* drap: lea disp(%rsp), %drap */
-- 
2.25.4

Reply via email to