Merge pull request #819 from brendanzagaeski/patch-1

[mono.git] / mono / metadata / sgen-archdep.h

diff --git a/mono/metadata/sgen-archdep.h b/mono/metadata/sgen-archdep.h
old mode 100644 (file)
new mode 100755 (executable)
index 8a2fa73..d0687b2
--- a/mono/metadata/sgen-archdep.h
+++ b/mono/metadata/sgen-archdep.h
@@ -44,32 +44,7 @@
 #ifdef MONO_ARCH_HAS_MONO_CONTEXT
 #define USE_MONO_CTX
 #else
-#ifdef _MSC_VER
-#define ARCH_STORE_REGS(ptr) __asm {   \
-               __asm mov [ptr], edi \
-               __asm mov [ptr+4], esi \
-               __asm mov [ptr+8], ebx \
-               __asm mov [ptr+12], edx \
-               __asm mov [ptr+16], ecx \
-               __asm mov [ptr+20], eax \
-               __asm mov [ptr+24], ebp \
-               __asm mov [ptr+28], esp \
-       }
-#else
-#define ARCH_STORE_REGS(ptr)   \
-       __asm__ __volatile__(   \
-               "mov %%edi,0(%0)\n"     \
-               "mov %%esi,4(%0)\n"     \
-               "mov %%ebx,8(%0)\n"     \
-               "mov %%edx,12(%0)\n"    \
-               "mov %%ecx,16(%0)\n"    \
-               "mov %%eax,20(%0)\n"    \
-               "mov %%ebp,24(%0)\n"    \
-               "mov %%esp,28(%0)\n"    \
-               :                       \
-               : "r" (ptr)     \
-       )
-#endif
+#error 0
 #endif
 
 /*FIXME, move this to mono-sigcontext as this is generaly useful.*/
@@ -114,7 +89,7 @@
 #define ARCH_COPY_SIGCTX_REGS(a,ctx) do {      \
        int __i;        \
        for (__i = 0; __i < 32; ++__i)  \
-               ((a)[__i]) = UCONTEXT_REG_Rn((ctx), __i);       \
+               ((a)[__i]) = (gpointer) UCONTEXT_REG_Rn((ctx), __i);    \
        } while (0)
 
 #elif defined(TARGET_ARM)
@@ -226,6 +201,10 @@
        )
 #endif
 
+#ifndef REG_SP
+#define REG_SP REG_O6
+#endif
+
 #define ARCH_SIGCTX_SP(ctx)    (((ucontext_t *)(ctx))->uc_mcontext.gregs [REG_SP])
 #define ARCH_SIGCTX_IP(ctx)    (((ucontext_t *)(ctx))->uc_mcontext.gregs [REG_PC])
 #define ARCH_COPY_SIGCTX_REGS(a,ctx) do {      \