Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mono] Mark jit icalls using ICALL_EXPORT so they get exported from l… #56144

Merged
merged 1 commit into from
Jul 22, 2021
Merged

[mono] Mark jit icalls using ICALL_EXPORT so they get exported from l… #56144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@
<!-- iOS/tvOS simulator specific options -->
<ItemGroup Condition="('$(TargetsiOS)' == 'true' and '$(TargetsiOSSimulator)' == 'true') or ('$(TargetstvOS)' == 'true' and '$(TargetstvOSSimulator)' == 'true')">
<_MonoCMakeArgs Include="-DENABLE_MINIMAL=shared_perfcounters"/>
<_MonoCMakeArgs Include="-DENABLE_ICALL_EXPORT=1"/>
</ItemGroup>
<!-- iOS/tvOS device specific options -->
<ItemGroup Condition="('$(TargetsiOS)' == 'true' and '$(TargetsiOSSimulator)' != 'true') or ('$(TargetstvOS)' == 'true' and '$(TargetstvOSSimulator)' != 'true')">
Expand Down
20 changes: 10 additions & 10 deletions src/mono/mono/metadata/marshal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ mono_marshal_ftnptr_eh_callback (guint32 gchandle);
MONO_PAL_API void
mono_marshal_set_last_error (void);

ICALL_EXTERN_C
ICALL_EXPORT
void
mono_marshal_clear_last_error (void);

Expand Down Expand Up @@ -539,11 +539,11 @@ mono_marshal_unlock_internal (void);
void *
mono_marshal_alloc (gsize size, MonoError *error);

ICALL_EXTERN_C
ICALL_EXPORT
void
mono_marshal_free (gpointer ptr);

ICALL_EXTERN_C
ICALL_EXPORT
void
mono_marshal_free_array (gpointer *ptr, int size);

Expand All @@ -553,11 +553,11 @@ mono_marshal_free_ccw (MonoObject* obj);
MONO_API void *
mono_marshal_string_to_utf16 (MonoString *s);

ICALL_EXTERN_C
ICALL_EXPORT
void
mono_marshal_set_last_error_windows (int error);

ICALL_EXTERN_C
ICALL_EXPORT
void
mono_struct_delete_old (MonoClass *klass, char *ptr);

Expand All @@ -566,15 +566,15 @@ mono_emit_marshal (EmitMarshalContext *m, int argnum, MonoType *t,
MonoMarshalSpec *spec, int conv_arg,
MonoType **conv_arg_type, MarshalAction action);

ICALL_EXTERN_C
ICALL_EXPORT
MonoObject *
mono_marshal_isinst_with_cache (MonoObject *obj, MonoClass *klass, uintptr_t *cache);

ICALL_EXTERN_C
ICALL_EXPORT
MonoAsyncResult *
mono_delegate_begin_invoke (MonoDelegate *delegate, gpointer *params);

ICALL_EXTERN_C
ICALL_EXPORT
MonoObject *
mono_delegate_end_invoke (MonoDelegate *delegate, gpointer *params);

Expand Down Expand Up @@ -605,10 +605,10 @@ mono_pinvoke_is_unicode (MonoMethodPInvoke *piinfo);
gboolean
mono_marshal_need_free (MonoType *t, MonoMethodPInvoke *piinfo, MonoMarshalSpec *spec);

ICALL_EXTERN_C
ICALL_EXPORT
MonoObject* mono_marshal_get_type_object (MonoClass *klass);

ICALL_EXTERN_C
ICALL_EXPORT
gpointer
mono_marshal_lookup_pinvoke (MonoMethod *method);

Expand Down
8 changes: 4 additions & 4 deletions src/mono/mono/metadata/monitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,19 +106,19 @@ mono_locks_dump (gboolean include_untaken);
void
mono_monitor_init (void);

ICALL_EXTERN_C
ICALL_EXPORT
MonoBoolean
mono_monitor_enter_internal (MonoObject *obj);

ICALL_EXTERN_C
ICALL_EXPORT
void
mono_monitor_enter_v4_internal (MonoObject *obj, MonoBoolean *lock_taken);

ICALL_EXTERN_C
ICALL_EXPORT
guint32
mono_monitor_enter_fast (MonoObject *obj);

ICALL_EXTERN_C
ICALL_EXPORT
guint32
mono_monitor_enter_v4_fast (MonoObject *obj, MonoBoolean *lock_taken);

Expand Down
6 changes: 3 additions & 3 deletions src/mono/mono/metadata/object-internals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1948,7 +1948,7 @@ mono_string_hash_internal (MonoString *s);
MONO_COMPONENT_API int
mono_object_hash_internal (MonoObject* obj);

ICALL_EXTERN_C
ICALL_EXPORT
void
mono_value_copy_internal (void* dest, const void* src, MonoClass *klass);

Expand Down Expand Up @@ -2033,7 +2033,7 @@ mono_gchandle_new_internal (MonoObject *obj, mono_bool pinned);
MONO_COMPONENT_API MonoGCHandle
mono_gchandle_new_weakref_internal (MonoObject *obj, mono_bool track_resurrection);

MONO_COMPONENT_API ICALL_EXTERN_C
MONO_COMPONENT_API
MonoObject*
mono_gchandle_get_target_internal (MonoGCHandle gchandle);

Expand Down Expand Up @@ -2075,7 +2075,7 @@ mono_gc_wbarrier_generic_store_internal (void volatile* ptr, MonoObject* value);
void
mono_gc_wbarrier_generic_store_atomic_internal (void *ptr, MonoObject *value);

ICALL_EXTERN_C
ICALL_EXPORT
void
mono_gc_wbarrier_generic_nostore_internal (void* ptr);

Expand Down
6 changes: 3 additions & 3 deletions src/mono/mono/metadata/threads-types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ mono_thread_set_name (MonoInternalThread *thread,

gboolean mono_thread_interruption_requested (void);

ICALL_EXTERN_C
ICALL_EXPORT
MonoException*
mono_thread_interruption_checkpoint (void);

Expand All @@ -280,7 +280,7 @@ mono_thread_interruption_checkpoint_void (void);
MonoExceptionHandle
mono_thread_interruption_checkpoint_handle (void);

ICALL_EXTERN_C
ICALL_EXPORT
MonoException* mono_thread_force_interruption_checkpoint_noraise (void);

/**
Expand All @@ -296,7 +296,7 @@ extern gint32 mono_thread_interruption_request_flag;

uint32_t mono_alloc_special_static_data (uint32_t static_type, uint32_t size, uint32_t align, uintptr_t *bitmap, int numbits);

ICALL_EXTERN_C
ICALL_EXPORT
void* mono_get_special_static_data (uint32_t offset);

MONO_COMPONENT_API gpointer mono_get_special_static_data_for_thread (MonoInternalThread *thread, guint32 offset);
Expand Down
Loading