diff options
| author | Ludovic Henry <ludovic@xamarin.com> | 2017-01-12 21:31:59 +0300 |
|---|---|---|
| committer | Ludovic Henry <ludovic@xamarin.com> | 2017-03-17 21:31:50 +0300 |
| commit | 9d7441430d08ad0ca9f4144acbfd06d34f9601e9 (patch) | |
| tree | 3a4330eb67b8d75f44c70a40702197b89e0adad6 | |
| parent | cb576a77cfcf98a54570ddb38fd41713696ea0b2 (diff) | |
[hybrid] Enable gsharedvt trampoline on amd64mono-4.8.0.524
| -rw-r--r-- | mono/mini/tramp-amd64-gsharedvt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mono/mini/tramp-amd64-gsharedvt.c b/mono/mini/tramp-amd64-gsharedvt.c index f5600adbde7..0c986f14e7b 100644 --- a/mono/mini/tramp-amd64-gsharedvt.c +++ b/mono/mini/tramp-amd64-gsharedvt.c @@ -142,7 +142,8 @@ mono_arch_get_gsharedvt_arg_trampoline (MonoDomain *domain, gpointer arg, gpoint mono_arch_flush_icache (start, code - start); mono_profiler_code_buffer_new (start, code - start, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL); - g_assert (0); + mono_tramp_info_register (mono_tramp_info_create (NULL, start, code - start, NULL, NULL), domain); + return start; } @@ -281,7 +282,7 @@ mono_arch_get_gsharedvt_trampoline (MonoTrampInfo **info, gboolean aot) amd64_call_reg (code, AMD64_R11); #endif } else { - g_error ("no aot"); + amd64_call_code (code, mono_amd64_start_gsharedvt_call); } /* Method to call is now on RAX. Restore regs and jump */ |