[interpreter] move interpreter specific trampoline definition to mini.h, also move...

diff --git a/mono/mini/interpreter/interp.h b/mono/mini/interpreter/interp.h
index 718acbcbad7e23efbb9dc89dd5bde87db3abac57..8c75b945b3fed0f1ad9a8acd974685d44a1d9186 100644 (file)
--- a/mono/mini/interpreter/interp.h
+++ b/mono/mini/interpreter/interp.h
@@ -5,9 +5,6 @@
 int
 mono_interp_regression_list (int verbose, int count, char *images []);
 
-gpointer
-mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info);
-
 void
 mono_interp_init (void);
 

diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index 763153469183c2e8091184ce452f3035716d68d2..d55825ed383013e36b052235d3fdc49848cd78db 100644 (file)
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -2820,6 +2820,7 @@ void    mono_arch_notify_pending_exc            (MonoThreadInfo *info);
 guint8* mono_arch_get_call_target               (guint8 *code);
 guint32 mono_arch_get_plt_info_offset           (guint8 *plt_entry, mgreg_t *regs, guint8 *code);
 GSList *mono_arch_get_trampolines               (gboolean aot);
+gpointer mono_arch_get_enter_icall_trampoline   (MonoTrampInfo **info);
 
 /* Handle block guard */
 gpointer mono_arch_install_handler_block_guard (MonoJitInfo *ji, MonoJitExceptionInfo *clause, MonoContext *ctx, gpointer new_value);

diff --git a/mono/mini/tramp-amd64.c b/mono/mini/tramp-amd64.c
index 4c64ac240815e6ba5bfcad51d43a12e2104880bf..b143645fb7d83c9d70d04ac4e9f6d2f9d81b9ded 100644 (file)
--- a/mono/mini/tramp-amd64.c
+++ b/mono/mini/tramp-amd64.c
@@ -29,10 +29,6 @@
 #include "mini-amd64.h"
 #include "debugger-agent.h"
 
-#ifdef ENABLE_INTERPRETER
-#include "interpreter/interp.h"
-#endif
-
 #define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
 
 #define IS_REX(inst) (((inst) >= 0x40) && ((inst) <= 0x4f))
@@ -973,9 +969,8 @@ mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gbo
 
        return buf;
 }
+#endif /* !DISABLE_JIT */
 
-
-#ifdef ENABLE_INTERPRETER
 /*
  * mono_arch_get_enter_icall_trampoline:
  *
@@ -986,6 +981,7 @@ mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gbo
 gpointer
 mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info)
 {
+#ifdef ENABLE_INTERPRETER
        const int gregs_num = 6;
        guint8 *start = NULL, *code, *exits [gregs_num], *leave_tramp;
        MonoJumpInfo *ji = NULL;
@@ -1067,9 +1063,11 @@ mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info)
                *info = mono_tramp_info_create ("enter_icall_trampoline", start, code - start, ji, unwind_ops);
 
        return start;
+#else
+       g_assert_not_reached ();
+       return NULL;
+#endif /* ENABLE_INTERPRETER */
 }
-#endif
-#endif /* !DISABLE_JIT */
 
 #ifdef DISABLE_JIT
 gpointer
@@ -1135,12 +1133,10 @@ mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gbo
        return NULL;
 }
 
-#ifdef ENABLE_INTERPRETER
 gpointer
 mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info)
 {
        g_assert_not_reached ();
        return NULL;
 }
-#endif
 #endif /* DISABLE_JIT */