commit 51c655847f2f7d2a9127574d3aeda12755014608
author Christopher Ferris <cferris@google.com> Tue Apr 23 13:59:28 2019 -0700
committer Christopher Ferris <cferris@google.com> Thu Apr 25 19:05:59 2019 +0000
tree b46ad0067f5efb98a19764650a53e68cfc9d7182
parent 81dc7ab1df59021463757e06a95b2abc937a73db

Add cfi instructions.

Bug: 131093040

Test: Builds, step through function and verify unwinding works at every point.
Change-Id: Ie213615bebe8dd3a091c4ddef561f2a609b8c4ec

runtime/arch/arm64/jni_entrypoints_arm64.S

diff --git a/runtime/arch/arm64/jni_entrypoints_arm64.S b/runtime/arch/arm64/jni_entrypoints_arm64.S
index c59a304..7f7d791 100644
--- a/runtime/arch/arm64/jni_entrypoints_arm64.S
+++ b/runtime/arch/arm64/jni_entrypoints_arm64.S
@@ -21,33 +21,54 @@
      */
     .extern artFindNativeMethod
 
-    // TODO: Add CFI directives.
 ENTRY art_jni_dlsym_lookup_stub
   // spill regs.
   stp   x29, x30, [sp, #-16]!
+  .cfi_adjust_cfa_offset 16
+  .cfi_rel_offset x29, 0
+  .cfi_rel_offset x30, 8
   mov   x29, sp
   stp   d6, d7,   [sp, #-16]!
+  .cfi_adjust_cfa_offset 16
   stp   d4, d5,   [sp, #-16]!
+  .cfi_adjust_cfa_offset 16
   stp   d2, d3,   [sp, #-16]!
+  .cfi_adjust_cfa_offset 16
   stp   d0, d1,   [sp, #-16]!
+  .cfi_adjust_cfa_offset 16
   stp   x6, x7,   [sp, #-16]!
+  .cfi_adjust_cfa_offset 16
   stp   x4, x5,   [sp, #-16]!
+  .cfi_adjust_cfa_offset 16
   stp   x2, x3,   [sp, #-16]!
+  .cfi_adjust_cfa_offset 16
   stp   x0, x1,   [sp, #-16]!
+  .cfi_adjust_cfa_offset 16
 
   bl  artFindNativeMethod
   mov  x17, x0    // store result in scratch reg.
 
   // load spill regs.
   ldp   x0, x1,   [sp], #16
+  .cfi_adjust_cfa_offset -16
   ldp   x2, x3,   [sp], #16
+  .cfi_adjust_cfa_offset -16
   ldp   x4, x5,   [sp], #16
+  .cfi_adjust_cfa_offset -16
   ldp   x6, x7,   [sp], #16
+  .cfi_adjust_cfa_offset -16
   ldp   d0, d1,   [sp], #16
+  .cfi_adjust_cfa_offset -16
   ldp   d2, d3,   [sp], #16
+  .cfi_adjust_cfa_offset -16
   ldp   d4, d5,   [sp], #16
+  .cfi_adjust_cfa_offset -16
   ldp   d6, d7,   [sp], #16
+  .cfi_adjust_cfa_offset -16
   ldp   x29, x30, [sp], #16
+  .cfi_adjust_cfa_offset -16
+  .cfi_restore x29
+  .cfi_restore x30
 
   cbz   x17, 1f   // is method code null ?
   br    x17       // if non-null, tail call to method's code.