Implement x86 support.

[mono.git] / mono / mini / mini-amd64.h

diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index 982a98fbc725d821539cb47af7ddaeeb89593e85..d71a60a108e5fd5ac7e40a6f33a1886e6e99fc22 100644 (file)
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -165,6 +165,7 @@ typedef struct MonoCompileArch {
        gint32 localloc_offset;
        gint32 reg_save_area_offset;
        gint32 stack_alloc_size;
+       gint32 sp_fp_offset;
        gboolean omit_fp, omit_fp_computed, no_pushes;
        gpointer cinfo;
        gint32 async_point_count;
@@ -231,15 +232,6 @@ typedef struct {
 
 #endif
 
-/*
- * This structure is an extension of MonoLMF and contains extra information.
- */
-typedef struct {
-       struct MonoLMF lmf;
-       gboolean debugger_invoke;
-       MonoContext ctx; /* if debugger_invoke is TRUE */
-} MonoLMFExt;
-
 /*
  * some icalls like mono_array_new_va needs to be called using a different 
  * calling convention.
@@ -256,13 +248,13 @@ typedef struct {
 
 #endif
 
-#ifdef __OpenBSD__
-#undef MONO_ARCH_USE_SIGACTION
-#endif
-
 #endif /* HOST_WIN32 */
 
-#if defined (__NetBSD__)
+#if defined (__APPLE__)
+
+#define MONO_ARCH_NOMAP32BIT
+
+#elif defined (__NetBSD__)
 
 #define REG_RAX 14
 #define REG_RCX 3
@@ -284,7 +276,11 @@ typedef struct {
 
 #define MONO_ARCH_NOMAP32BIT
 
-#elif defined (__FreeBSD__) || defined (__OpenBSD__)
+#elif defined (__OpenBSD__)
+
+#define MONO_ARCH_NOMAP32BIT
+
+#elif defined (__FreeBSD__)
 
 #define REG_RAX 7
 #define REG_RCX 4
@@ -330,18 +326,18 @@ typedef struct {
 #define MONO_ARCH_ENABLE_REGALLOC_IN_EH_BLOCKS 1
 #define MONO_ARCH_ENABLE_MONO_LMF_VAR 1
 #define MONO_ARCH_HAVE_INVALIDATE_METHOD 1
-#define MONO_ARCH_HAVE_THROW_CORLIB_EXCEPTION 1
 #define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE 1
 #define MONO_ARCH_HAVE_ATOMIC_ADD 1
 #define MONO_ARCH_HAVE_ATOMIC_EXCHANGE 1
 #define MONO_ARCH_HAVE_ATOMIC_CAS 1
 #define MONO_ARCH_HAVE_FULL_AOT_TRAMPOLINES 1
+#define MONO_ARCH_HAVE_FULL_AOT_TRAMPOLINES_2 1
 #define MONO_ARCH_HAVE_IMT 1
 #define MONO_ARCH_HAVE_TLS_GET 1
-#define MONO_ARCH_IMT_REG AMD64_R11
+#define MONO_ARCH_IMT_REG AMD64_R10
 #define MONO_ARCH_VTABLE_REG MONO_AMD64_ARG_REG1
 /*
- * We use r10 for the rgctx register rather than r11 because r11 is
+ * We use r10 for the imt/rgctx register rather than r11 because r11 is
  * used by the trampoline as a scratch register and hence might be
  * clobbered across method call boundaries.
  */
@@ -354,10 +350,11 @@ typedef struct {
 #define MONO_ARCH_HAVE_LIVERANGE_OPS 1
 #define MONO_ARCH_HAVE_XP_UNWIND 1
 #define MONO_ARCH_HAVE_SIGCTX_TO_MONOCTX 1
-#if !defined(HOST_WIN32) && !defined(HAVE_MOVING_COLLECTOR)
+#if !defined(HOST_WIN32)
 #define MONO_ARCH_MONITOR_OBJECT_REG MONO_AMD64_ARG_REG1
 #endif
 #define MONO_ARCH_HAVE_STATIC_RGCTX_TRAMPOLINE 1
+#define MONO_ARCH_HAVE_GET_TRAMPOLINES 1
 
 #define MONO_ARCH_AOT_SUPPORTED 1
 #ifndef HOST_WIN32
@@ -365,7 +362,6 @@ typedef struct {
 #else
 #define DISABLE_DEBUGGER_AGENT 1
 #endif
-#define MONO_ARCH_HAVE_FIND_JIT_INFO_EXT 1
 
 #if !defined(HOST_WIN32) || defined(__sun)
 #define MONO_ARCH_ENABLE_MONITOR_IL_FASTPATH 1
@@ -383,8 +379,16 @@ typedef struct {
 
 #define MONO_ARCH_HAVE_LLVM_IMT_TRAMPOLINE 1
 #define MONO_ARCH_LLVM_SUPPORTED 1
+#define MONO_ARCH_THIS_AS_FIRST_ARG 1
+#define MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD 1
+#define MONO_ARCH_HAVE_CARD_TABLE_WBARRIER 1
+#define MONO_ARCH_HAVE_SETUP_RESUME_FROM_SIGNAL_HANDLER_CTX 1
+#define MONO_ARCH_GC_MAPS_SUPPORTED 1
 
-#define MONO_ARCH_USE_OP_TAIL_CALL(caller_sig, callee_sig) mono_metadata_signature_equal ((caller_sig), (callee_sig))
+gboolean
+mono_amd64_tail_call_supported (MonoMethodSignature *caller_sig, MonoMethodSignature *callee_sig) MONO_INTERNAL;
+
+#define MONO_ARCH_USE_OP_TAIL_CALL(caller_sig, callee_sig) mono_amd64_tail_call_supported (caller_sig, callee_sig)
 
 /* Used for optimization, not complete */
 #define MONO_ARCH_IS_OP_MEMBASE(opcode) ((opcode) == OP_X86_PUSH_MEMBASE)
@@ -405,11 +409,14 @@ mono_amd64_patch (unsigned char* code, gpointer target) MONO_INTERNAL;
 void
 mono_amd64_throw_exception (guint64 dummy1, guint64 dummy2, guint64 dummy3, guint64 dummy4,
                                                        guint64 dummy5, guint64 dummy6,
-                                                       MonoObject *exc, guint64 rip, guint64 rsp,
-                                                       guint64 rbx, guint64 rbp, guint64 r12, guint64 r13, 
-                                                       guint64 r14, guint64 r15, guint64 rdi, guint64 rsi, 
-                                                       guint64 rax, guint64 rcx, guint64 rdx,
-                                                       guint64 rethrow);
+                                                       mgreg_t *regs, mgreg_t rip,
+                                                       MonoObject *exc, gboolean rethrow) MONO_INTERNAL;
+
+void
+mono_amd64_throw_corlib_exception (guint64 dummy1, guint64 dummy2, guint64 dummy3, guint64 dummy4,
+                                                                  guint64 dummy5, guint64 dummy6,
+                                                                  mgreg_t *regs, mgreg_t rip,
+                                                                  guint32 ex_token_index, gint64 pc_offset) MONO_INTERNAL;
 
 guint64
 mono_amd64_get_original_ip (void) MONO_INTERNAL;
@@ -417,6 +424,9 @@ mono_amd64_get_original_ip (void) MONO_INTERNAL;
 guint8*
 mono_amd64_emit_tls_get (guint8* code, int dreg, int tls_offset) MONO_INTERNAL;
 
+GSList*
+mono_amd64_get_exception_trampolines (gboolean aot) MONO_INTERNAL;
+
 typedef struct {
        guint8 *address;
        guint8 saved_byte;