ARM64: Restore fp before sp in C stack unwinders.

Thanks to Peter Cawley. #1096

1 files changed, 2 insertions, 1 deletions

diff --git a/src/host/buildvm_peobj.c b/src/host/buildvm_peobj.c
index 7ce3b05a..8f04c496 100644
--- a/src/host/buildvm_peobj.c
+++ b/src/host/buildvm_peobj.c
@@ -373,11 +373,12 @@ void emit_peobj(BuildCtx *ctx)
 
     /* Unwind codes for .text section with handler. */
     p = uwc;
+    CADD_FP(192);               /* +2 */
     CSAVE_REGS(19, 28, 176);    /* +5*2 */
     CSAVE_FREGS(8, 15, 96);     /* +4*2 */
     CSAVE_FPLR(192);            /* +1 */
     CALLOC_S(208);              /* +1 */
-    CEND_ALIGN;                 /* +1 +3 -> 24 */
+    CEND_ALIGN;                 /* +1 +1 -> 24 */
 
     u32 = ((24u >> 2) << 27) | (1u << 20) | (fcofs >> 2);
     owrite(ctx, &u32, 4);