Merge pull request #4169 from evincarofautumn/fix-xmm-scanning-mac-x86

Fix XMM scanning on Mac x86.

diff --combined mono/utils/mono-context.h
index 0d474ecf4846becdedd68426408764a71d304e09,3fb9facf24f6d15bf51f27faaeeefd84e000edf3..3a6f44636c88a90af290d063274291f3fb432cd0
--- 1/mono/utils/mono-context.h
--- 2/mono/utils/mono-context.h
+++ b/mono/utils/mono-context.h
@@@ -139,7 -139,8 +139,8 @@@ typedef struct 
                 }                                                                                                                              \
        } while (0)
  #else
- #define MONO_CONTEXT_GET_CURRENT(ctx) \
+ 
+ #define MONO_CONTEXT_GET_CURRENT_GREGS(ctx) \
        __asm__ __volatile__(   \
        "movl $0x0, %c[eax](%0)\n" \
        "mov %%ebx, %c[ebx](%0)\n" \
@@@ -162,6 -163,40 +163,40 @@@
                [esi] MONO_CONTEXT_OFFSET (esi, 0, mgreg_t), \
                [edi] MONO_CONTEXT_OFFSET (edi, 0, mgreg_t) \
        : "memory")
+ 
+ #ifdef UCONTEXT_REG_XMM
+ #define MONO_CONTEXT_GET_CURRENT_FREGS(ctx) \
+       do { \
+               __asm__ __volatile__ ( \
+                       "movups %%xmm0, %c[xmm0](%0)\n" \
+                       "movups %%xmm1, %c[xmm1](%0)\n" \
+                       "movups %%xmm2, %c[xmm2](%0)\n" \
+                       "movups %%xmm3, %c[xmm3](%0)\n" \
+                       "movups %%xmm4, %c[xmm4](%0)\n" \
+                       "movups %%xmm5, %c[xmm5](%0)\n" \
+                       "movups %%xmm6, %c[xmm6](%0)\n" \
+                       "movups %%xmm7, %c[xmm7](%0)\n" \
+                       : \
+                       : "a" (&(ctx)), \
+                               [xmm0] MONO_CONTEXT_OFFSET (fregs, X86_XMM0, MonoContextSimdReg), \
+                               [xmm1] MONO_CONTEXT_OFFSET (fregs, X86_XMM1, MonoContextSimdReg), \
+                               [xmm2] MONO_CONTEXT_OFFSET (fregs, X86_XMM2, MonoContextSimdReg), \
+                               [xmm3] MONO_CONTEXT_OFFSET (fregs, X86_XMM3, MonoContextSimdReg), \
+                               [xmm4] MONO_CONTEXT_OFFSET (fregs, X86_XMM4, MonoContextSimdReg), \
+                               [xmm5] MONO_CONTEXT_OFFSET (fregs, X86_XMM5, MonoContextSimdReg), \
+                               [xmm6] MONO_CONTEXT_OFFSET (fregs, X86_XMM6, MonoContextSimdReg), \
+                               [xmm7] MONO_CONTEXT_OFFSET (fregs, X86_XMM7, MonoContextSimdReg), \
+       } while (0)
+ #else
+ #define MONO_CONTEXT_GET_CURRENT_FREGS(ctx)
+ #endif
+ 
+ #define MONO_CONTEXT_GET_CURRENT(ctx) \
+     do {      \
+               MONO_CONTEXT_GET_CURRENT_GREGS(ctx);    \
+               MONO_CONTEXT_GET_CURRENT_FREGS(ctx);    \
+       } while (0)
+ 
  #endif
  
  #define MONO_ARCH_HAS_MONO_CONTEXT 1
@@@ -493,7 -528,7 +528,7 @@@ typedef struct 
  #define MONO_CONTEXT_SET_SP(ctx,sp) do { (ctx)->sc_sp = (gulong)sp; } while (0);
  
  #define MONO_CONTEXT_GET_IP(ctx) ((gpointer)((ctx)->sc_ir))
 -#define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->regs [ppc_r31-13]))
 +#define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->regs [ppc_r31]))
  #define MONO_CONTEXT_GET_SP(ctx) ((gpointer)((ctx)->sc_sp))
  
  #define MONO_CONTEXT_GET_CURRENT(ctx) \
@@@ -584,7 -619,7 +619,7 @@@ typedef struct 
  #define MONO_CONTEXT_SET_SP(ctx,sp) do { (ctx)->sc_sp = (mgreg_t)sp; } while (0);
  
  #define MONO_CONTEXT_GET_IP(ctx) ((gpointer)((ctx)->sc_ir))
 -#define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->regs [ppc_r31-13]))
 +#define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->regs [ppc_r31]))
  #define MONO_CONTEXT_GET_SP(ctx) ((gpointer)((ctx)->sc_sp))
  
  #define MONO_CONTEXT_GET_CURRENT(ctx) \