From 3cf1191390e9c1bfb12d2572157a3848ad5ae5b3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksey=20Kliger=20=28=CE=BBgeek=29?= Date: Fri, 14 Jun 2019 11:33:11 -0400 Subject: [PATCH] [mini] Move some MONO_API functions to public header (mono/mono#15105) * [mini] Move some MONO_API functions to public header And mark them all MONO_RT_EXTERNAL_ONLY. mono_set_use_llvm is new - Xamarin.Android previously assigned to mono_use_llvm directly. Commit migrated from https://github.com/mono/mono/commit/0e0f1b9be08ff14b192fdadc66efb6bb763867a4 --- src/mono/mono/mini/aot-runtime.h | 3 --- src/mono/mono/mini/jit.h | 10 ++++++++++ src/mono/mono/mini/mini-runtime.c | 7 +++++++ src/mono/mono/mini/mini-runtime.h | 2 -- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/mono/mono/mini/aot-runtime.h b/src/mono/mono/mini/aot-runtime.h index afab5b0..85c4a0c 100644 --- a/src/mono/mono/mini/aot-runtime.h +++ b/src/mono/mono/mini/aot-runtime.h @@ -268,9 +268,6 @@ gboolean mono_aot_init_llvmonly_method (gpointer amodule, guint32 method_in GHashTable *mono_aot_get_weak_field_indexes (MonoImage *image); MonoAotMethodFlags mono_aot_get_method_flags (guint8 *code); -/* This is an exported function */ -MONO_API void mono_aot_register_module (gpointer *aot_info); - /* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */ /* * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later diff --git a/src/mono/mono/mini/jit.h b/src/mono/mono/mini/jit.h index a8e3e24..2ada49b 100644 --- a/src/mono/mono/mini/jit.h +++ b/src/mono/mono/mini/jit.h @@ -100,6 +100,16 @@ mono_jit_parse_options (int argc, char * argv[]); MONO_API char* mono_get_runtime_build_info (void); +MONO_API MONO_RT_EXTERNAL_ONLY void +mono_set_use_llvm (mono_bool use_llvm); + +MONO_API MONO_RT_EXTERNAL_ONLY void +mono_aot_register_module (void **aot_info); + +MONO_API MONO_RT_EXTERNAL_ONLY +MonoDomain* mono_jit_thread_attach (MonoDomain *domain); + + MONO_END_DECLS #endif diff --git a/src/mono/mono/mini/mini-runtime.c b/src/mono/mono/mini/mini-runtime.c index 5d9979b..f86f2ce 100644 --- a/src/mono/mono/mini/mini-runtime.c +++ b/src/mono/mono/mini/mini-runtime.c @@ -163,6 +163,13 @@ mono_running_on_valgrind (void) return FALSE; } +void +mono_set_use_llvm (mono_bool use_llvm) +{ + mono_use_llvm = (gboolean)use_llvm; +} + + typedef struct { void *ip; MonoMethod *method; diff --git a/src/mono/mono/mini/mini-runtime.h b/src/mono/mono/mini/mini-runtime.h index 7c7287a..faf22b4 100644 --- a/src/mono/mono/mini/mini-runtime.h +++ b/src/mono/mono/mini/mini-runtime.h @@ -451,8 +451,6 @@ void mono_push_lmf (MonoLMFExt *ext); void mono_pop_lmf (MonoLMF *lmf); #define mono_get_jit_tls mono_tls_get_jit_tls MonoJitTlsData* mono_get_jit_tls (void); -MONO_API MONO_RT_EXTERNAL_ONLY -MonoDomain* mono_jit_thread_attach (MonoDomain *domain); MONO_API void mono_jit_set_domain (MonoDomain *domain); gboolean mono_method_same_domain (MonoJitInfo *caller, MonoJitInfo *callee); -- 2.7.4