projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
924ef78
)
[hybrid] Enable gsharedvt trampoline on amd64
author
Ludovic Henry
<ludovic@xamarin.com>
Thu, 12 Jan 2017 18:31:59 +0000
(16:31 -0200)
committer
Ludovic Henry
<ludovic@xamarin.com>
Fri, 13 Jan 2017 11:42:59 +0000
(09:42 -0200)
mono/mini/tramp-amd64-gsharedvt.c
patch
|
blob
|
history
diff --git
a/mono/mini/tramp-amd64-gsharedvt.c
b/mono/mini/tramp-amd64-gsharedvt.c
index f5600adbde78198f5a9935ef9971316cc1abfb8c..0c986f14e7b8b7655ad2f16abd636e19197b0963 100644
(file)
--- 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);
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;
}
return start;
}
@@
-281,7
+282,7
@@
mono_arch_get_gsharedvt_trampoline (MonoTrampInfo **info, gboolean aot)
amd64_call_reg (code, AMD64_R11);
#endif
} else {
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 */
}
/* Method to call is now on RAX. Restore regs and jump */