Revert "Revert "Merge branch 'master' of https://github.com/mono/mono""

[mono.git] / mono / utils / mono-context.h

diff --git a/mono/utils/mono-context.h b/mono/utils/mono-context.h
old mode 100644 (file)
new mode 100755 (executable)
index d449564..a4d2946
--- a/mono/utils/mono-context.h
+++ b/mono/utils/mono-context.h
@@ -105,6 +105,24 @@ typedef struct {
 #define MONO_CONTEXT_GET_SP(ctx) ((gpointer)((ctx)->esp))
 
 /*We set EAX to zero since we are clobering it anyway*/
+#ifdef _MSC_VER
+#define MONO_CONTEXT_GET_CURRENT(ctx) do { \
+       void *_ptr = &(ctx);                                                                                            \
+       __asm {                                                                                                                         \
+        __asm mov eax, _ptr                                                                                            \
+        __asm mov [eax+0x00], eax                                                                                      \
+        __asm mov [eax+0x04], ebx                                                                                      \
+        __asm mov [eax+0x08], ecx                                                                                      \
+        __asm mov [eax+0x0c], edx                                                                                      \
+        __asm mov [eax+0x10], ebp                                                                                      \
+        __asm mov [eax+0x14], esp                                                                                      \
+        __asm mov [eax+0x18], esi                                                                                      \
+        __asm mov [eax+0x1c], edi                                                                                      \
+        __asm call $+5                                                                                                         \
+        __asm pop dword ptr [eax+0x20]                                                                         \
+                }                                                                                                                              \
+       } while (0)
+#else
 #define MONO_CONTEXT_GET_CURRENT(ctx) \
        __asm__ __volatile__(   \
        "movl $0x0, 0x00(%0)\n" \
@@ -120,10 +138,9 @@ typedef struct {
        :       \
        : "a" (&(ctx))  \
        : "memory")
+#endif
 
-#if !defined(HOST_WIN32)
 #define MONO_ARCH_HAS_MONO_CONTEXT 1
-#endif
 
 #elif (defined(__x86_64__) && !defined(MONO_CROSS_COMPILE)) || (defined(TARGET_AMD64)) /* defined(__i386__) */
 
@@ -221,7 +238,7 @@ typedef struct {
 typedef struct {
        mgreg_t pc;
        mgreg_t regs [16];
-       double fregs [8];
+       double fregs [16];
        mgreg_t cpsr;
 } MonoContext;
 
@@ -234,9 +251,79 @@ typedef struct {
 #define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->regs [ARMREG_FP]))
 #define MONO_CONTEXT_GET_SP(ctx) ((gpointer)((ctx)->regs [ARMREG_SP]))
 
-// FIXME:
 #define MONO_CONTEXT_GET_CURRENT(ctx)  do {    \
-       g_assert_not_reached (); \
+       __asm__ __volatile__(                   \
+               "push {r0}\n"                           \
+               "push {r1}\n"                           \
+               "mov r0, %0\n"                          \
+               "ldr r1, [sp, #4]\n"                    \
+               "str r1, [r0]!\n"                       \
+               "ldr r1, [sp, #0]\n"                    \
+               "str r1, [r0]!\n"                       \
+               "stmia r0!, {r2-r12}\n"         \
+               "str sp, [r0]!\n"                       \
+               "str lr, [r0]!\n"                       \
+               "mov r1, pc\n"                          \
+               "str r1, [r0]!\n"                       \
+               "pop {r1}\n"                            \
+               "pop {r0}\n"                            \
+               :                                                       \
+               : "r" (&ctx.regs)                       \
+               : "memory"                                      \
+       );                                                              \
+       ctx.pc = ctx.regs [15];                 \
+} while (0)
+
+#elif (defined(__aarch64__) && !defined(MONO_CROSS_COMPILE)) || (defined(TARGET_ARM64))
+
+#include <mono/arch/arm64/arm64-codegen.h>
+
+typedef struct {
+       mgreg_t regs [32];
+       double fregs [32];
+       mgreg_t pc;
+} MonoContext;
+
+#define MONO_CONTEXT_SET_IP(ctx,ip) do { (ctx)->pc = (mgreg_t)ip; } while (0)
+#define MONO_CONTEXT_SET_BP(ctx,bp) do { (ctx)->regs [ARMREG_FP] = (mgreg_t)bp; } while (0);
+#define MONO_CONTEXT_SET_SP(ctx,bp) do { (ctx)->regs [ARMREG_SP] = (mgreg_t)bp; } while (0);
+
+#define MONO_CONTEXT_GET_IP(ctx) (gpointer)((ctx)->pc)
+#define MONO_CONTEXT_GET_BP(ctx) (gpointer)((ctx)->regs [ARMREG_FP])
+#define MONO_CONTEXT_GET_SP(ctx) (gpointer)((ctx)->regs [ARMREG_SP])
+
+#define MONO_CONTEXT_GET_CURRENT(ctx)  do {    \
+       __asm__ __volatile__(                   \
+               "mov x16, %0\n" \
+               "stp x0, x1, [x16], #16\n"      \
+               "stp x2, x3, [x16], #16\n"      \
+               "stp x4, x5, [x16], #16\n"      \
+               "stp x6, x7, [x16], #16\n"      \
+               "stp x8, x9, [x16], #16\n"      \
+               "stp x10, x11, [x16], #16\n"    \
+               "stp x12, x13, [x16], #16\n"    \
+               "stp x14, x15, [x16], #16\n"    \
+               "stp xzr, x17, [x16], #16\n"    \
+               "stp x18, x19, [x16], #16\n"    \
+               "stp x20, x21, [x16], #16\n"    \
+               "stp x22, x23, [x16], #16\n"    \
+               "stp x24, x25, [x16], #16\n"    \
+               "stp x26, x27, [x16], #16\n"    \
+               "stp x28, x29, [x16], #16\n"    \
+               "stp x30, xzr, [x16]\n" \
+               "mov x30, sp\n"                         \
+               "str x30, [x16, #8]\n"          \
+               :                                                       \
+               : "r" (&ctx.regs)                       \
+               : "x30", "memory"                       \
+       );                                                              \
+       __asm__ __volatile__( \
+               "adr %0, L0\n" \
+               "L0:\n" \
+               : "=r" (ctx.pc)         \
+               :                                       \
+               : "memory"                       \
+       ); \
 } while (0)
 
 #elif defined(__mono_ppc__) /* defined(__arm__) */
@@ -436,8 +523,8 @@ typedef struct ucontext MonoContext;
        } while (0) 
 
 #define MONO_CONTEXT_GET_IP(ctx) (gpointer) (ctx)->uc_mcontext.psw.addr
-#define MONO_CONTEXT_GET_BP(ctx) MONO_CONTEXT_GET_SP((ctx))
 #define MONO_CONTEXT_GET_SP(ctx) ((gpointer)((ctx)->uc_mcontext.gregs[15]))
+#define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->uc_mcontext.gregs[11]))
 
 #define MONO_CONTEXT_GET_CURRENT(ctx)  \
        __asm__ __volatile__(   \