Merge pull request #3403 from ntherning/fix-handler-block-trampoline-crash-on-win64

[mono.git] / mono / utils / mach-support-arm64.c

diff --git a/mono/utils/mach-support-arm64.c b/mono/utils/mach-support-arm64.c
index a1ef2e2b3a2954ea681ae05b735f00775525a761..6483238d4565568b2695e254d7428c2c1426a70f 100644 (file)
--- a/mono/utils/mach-support-arm64.c
+++ b/mono/utils/mach-support-arm64.c
@@ -89,12 +89,12 @@ mono_mach_arch_thread_state_to_mono_context (thread_state_t state, MonoContext *
        int i;
        arm_unified_thread_state_t *arch_state = (arm_unified_thread_state_t *) state;
        for (i = 0; i < 29; ++i)
-               context->regs [i] = arch_state->uts.ts_64.__x [i];
+               context->regs [i] = arch_state->ts_64.__x [i];
 
-       context->regs [ARMREG_R29] = arch_state->uts.ts_64.__fp;
-       context->regs [ARMREG_R30] = arch_state->uts.ts_64.__lr;
-       context->regs [ARMREG_R31] = arch_state->uts.ts_64.__sp;
-       context->pc = arch_state->uts.ts_64.__pc;
+       context->regs [ARMREG_R29] = arch_state->ts_64.__fp;
+       context->regs [ARMREG_R30] = arch_state->ts_64.__lr;
+       context->regs [ARMREG_SP] = arch_state->ts_64.__sp;
+       context->pc = arch_state->ts_64.__pc;
 }
 
 int