From 8fba63a2a3b214dc2725d977df5cd64ed395fbb9 Mon Sep 17 00:00:00 2001 From: Jay Krell Date: Thu, 25 Oct 2018 13:07:05 -0700 Subject: [PATCH] [cxx] Fix WebAssembly/C++ (ICALL_EXPORT) (#11359) Remove ICALL_EXPORT on all implementations. Add ICALL_EXPORT on two declarations. ICALL_EXPORT is on declarations, correctly, and either isn't needed on implementations, or is incorrect. On non-handles() implementations, it isn't needed but is ok. On handles() implementations, it is incorrect. Add ICALL_EXPORT on mono_object_hash_internal and mono_monitor_exit_internal. Previously many declarations were missing, which was a reason we put it on implementations. --- mono/metadata/icall-decl.h | 3 - mono/metadata/icall.c | 514 +++++++++++++++++++-------------------- mono/metadata/object-internals.h | 2 + mono/metadata/sre.c | 2 +- mono/metadata/sysmath.c | 49 ---- mono/metadata/threads.c | 2 - mono/metadata/w32socket.c | 2 +- 7 files changed, 259 insertions(+), 315 deletions(-) diff --git a/mono/metadata/icall-decl.h b/mono/metadata/icall-decl.h index c7361e3304d..44b9e6899e3 100644 --- a/mono/metadata/icall-decl.h +++ b/mono/metadata/icall-decl.h @@ -93,8 +93,6 @@ ICALL_EXPORT MonoObject* ves_icall_System_Runtime_CompilerServices_RuntimeHelper ICALL_EXPORT MonoObject* ves_icall_property_info_get_default_value (MonoReflectionProperty*); ICALL_EXPORT MonoReflectionType* ves_icall_Remoting_RealProxy_InternalGetProxyType (MonoTransparentProxy*); ICALL_EXPORT MonoString* ves_icall_System_IO_DriveInfo_GetDriveFormat (MonoString*); -ICALL_EXPORT MonoStringHandle ves_icall_System_Environment_GetMachineConfigPath (MonoError *error); // FIXME Use HANDLES_REUSE_WRAPPER. -ICALL_EXPORT MonoStringHandle ves_icall_System_Web_Util_ICalls_GetMachineConfigPath (MonoError *error); // FIXME Use HANDLES_REUSE_WRAPPER. ICALL_EXPORT MonoType* mono_ArgIterator_IntGetNextArgType (MonoArgIterator*); ICALL_EXPORT MonoTypedRef mono_ArgIterator_IntGetNextArg (MonoArgIterator*); ICALL_EXPORT MonoTypedRef mono_ArgIterator_IntGetNextArgT (MonoArgIterator*, MonoType*); @@ -179,6 +177,5 @@ ICALL_EXPORT void ves_icall_System_Runtime_RuntimeImports_Memmove (guint8*, guin ICALL_EXPORT void ves_icall_System_Runtime_RuntimeImports_Memmove_wbarrier (guint8*, guint8*, guint, MonoType*); ICALL_EXPORT void ves_icall_System_Runtime_RuntimeImports_ZeroMemory (guint8*, guint); ICALL_EXPORT void ves_icall_System_Runtime_RuntimeImports_ecvt_s(char*, size_t, double, int, int*, int*); -ICALL_EXPORT void ves_icall_get_method_info (MonoMethod*, MonoMethodInfo*, MonoError*); #endif // __MONO_METADATA_ICALL_H__ diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c index e90947c46f3..4f954b8f8ea 100644 --- a/mono/metadata/icall.c +++ b/mono/metadata/icall.c @@ -139,10 +139,6 @@ icallarray_print (const char *format, ...) #define icallarray_print(...) /* nothing */ #endif -ICALL_EXPORT -MonoReflectionAssemblyHandle -ves_icall_System_Reflection_Assembly_GetCallingAssembly (MonoError *error); - /* Lazy class loading functions */ static GENERATE_GET_CLASS_WITH_CACHE (module, "System.Reflection", "Module") @@ -172,7 +168,7 @@ mono_icall_get_file_path_prefix (const gchar *path) } #endif /* HOST_WIN32 */ -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle ves_icall_System_Array_GetValueImpl (MonoArrayHandle array, guint32 pos, MonoError *error) { MonoClass * const array_class = mono_handle_class (array); @@ -188,7 +184,7 @@ ves_icall_System_Array_GetValueImpl (MonoArrayHandle array, guint32 pos, MonoErr return result; } -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle ves_icall_System_Array_GetValue (MonoArrayHandle arr, MonoArrayHandle indices, MonoError *error) { MONO_CHECK_ARG_NULL_HANDLE (indices, NULL_HANDLE); @@ -235,7 +231,7 @@ ves_icall_System_Array_GetValue (MonoArrayHandle arr, MonoArrayHandle indices, M return ves_icall_System_Array_GetValueImpl (arr, pos, error); } -ICALL_EXPORT void +void ves_icall_System_Array_SetValueImpl (MonoArrayHandle arr, MonoObjectHandle value, guint32 pos, MonoError *error) { array_set_value_impl (arr, value, pos, error); @@ -543,7 +539,7 @@ leave: return; } -ICALL_EXPORT void +void ves_icall_System_Array_SetValue (MonoArrayHandle arr, MonoObjectHandle value, MonoArrayHandle idxs, MonoError *error) { @@ -604,7 +600,7 @@ ves_icall_System_Array_SetValue (MonoArrayHandle arr, MonoObjectHandle value, array_set_value_impl (arr, value, pos, error); } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_System_Array_CreateInstanceImpl (MonoReflectionTypeHandle type, MonoArrayHandle lengths, MonoArrayHandle bounds, MonoError *error) { // FIXME? fixed could be used for lengths, bounds. @@ -662,7 +658,7 @@ ves_icall_System_Array_CreateInstanceImpl (MonoReflectionTypeHandle type, MonoAr return mono_array_new_full_handle (MONO_HANDLE_DOMAIN (type), aklass, sizes, lower_bounds, error); } -ICALL_EXPORT gint32 +gint32 ves_icall_System_Array_GetRank (MonoObjectHandle arr, MonoError *error) { gint32 const result = m_class_get_rank (mono_handle_class (arr)); @@ -684,7 +680,7 @@ mono_array_get_length (MonoArrayHandle arr, gint32 dimension, MonoError *error) : MONO_HANDLE_GETVAL (arr, max_length); } -ICALL_EXPORT gint32 +gint32 ves_icall_System_Array_GetLength (MonoArrayHandle arr, gint32 dimension, MonoError *error) { icallarray_print ("%s arr:%p dimension:%d\n", __func__, MONO_HANDLE_RAW (arr), (int)dimension); @@ -697,7 +693,7 @@ ves_icall_System_Array_GetLength (MonoArrayHandle arr, gint32 dimension, MonoErr return (gint32)length; } -ICALL_EXPORT gint64 +gint64 ves_icall_System_Array_GetLongLength (MonoArrayHandle arr, gint32 dimension, MonoError *error) { icallarray_print ("%s arr:%p dimension:%d\n", __func__, MONO_HANDLE_RAW (arr), (int)dimension); @@ -705,7 +701,7 @@ ves_icall_System_Array_GetLongLength (MonoArrayHandle arr, gint32 dimension, Mon return (gint64)mono_array_get_length (arr, dimension, error); } -ICALL_EXPORT gint32 +gint32 ves_icall_System_Array_GetLowerBound (MonoArrayHandle arr, gint32 dimension, MonoError *error) { icallarray_print ("%s arr:%p dimension:%d\n", __func__, MONO_HANDLE_RAW (arr), (int)dimension); @@ -719,7 +715,7 @@ ves_icall_System_Array_GetLowerBound (MonoArrayHandle arr, gint32 dimension, Mon : 0; } -ICALL_EXPORT void +void ves_icall_System_Array_ClearInternal (MonoArrayHandle arr, int idx, int length, MonoError *error) { icallarray_print ("%s arr:%p idx:%d len:%d\n", __func__, MONO_HANDLE_RAW (arr), (int)idx, (int)length); @@ -729,7 +725,7 @@ ves_icall_System_Array_ClearInternal (MonoArrayHandle arr, int idx, int length, } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Array_FastCopy (MonoArray *source, int source_idx, MonoArray* dest, int dest_idx, int length) { int element_size; @@ -794,7 +790,7 @@ ves_icall_System_Array_FastCopy (MonoArray *source, int source_idx, MonoArray* d return TRUE; } -ICALL_EXPORT void +void ves_icall_System_Array_GetGenericValueImpl (MonoArray *arr, guint32 pos, gpointer value) { // Generic ref/out parameters are not supported by HANDLES(), so NOHANDLES(). @@ -815,7 +811,7 @@ ves_icall_System_Array_GetGenericValueImpl (MonoArray *arr, guint32 pos, gpointe mono_gc_memmove_atomic (value, ea, esize); } -ICALL_EXPORT void +void ves_icall_System_Array_SetGenericValueImpl (MonoArray *arr, guint32 pos, gpointer value) { // Generic ref/out parameters are not supported by HANDLES(), so NOHANDLES(). @@ -847,13 +843,13 @@ ves_icall_System_Array_SetGenericValueImpl (MonoArray *arr, guint32 pos, gpointe } } -ICALL_EXPORT void +void ves_icall_System_Runtime_RuntimeImports_Memmove (guint8 *destination, guint8 *source, guint byte_count) { mono_gc_memmove_atomic (destination, source, byte_count); } -ICALL_EXPORT void +void ves_icall_System_Runtime_RuntimeImports_Memmove_wbarrier (guint8 *destination, guint8 *source, guint len, MonoType *type) { if (MONO_TYPE_IS_REFERENCE (type)) @@ -862,13 +858,13 @@ ves_icall_System_Runtime_RuntimeImports_Memmove_wbarrier (guint8 *destination, g mono_gc_wbarrier_value_copy_internal (destination, source, len, mono_class_from_mono_type_internal (type)); } -ICALL_EXPORT void +void ves_icall_System_Runtime_RuntimeImports_ZeroMemory (guint8 *p, guint byte_length) { memset (p, 0, byte_length); } -ICALL_EXPORT void +void ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_InitializeArray (MonoArrayHandle array, MonoClassField *field_handle, MonoError *error) { MonoClass *klass = mono_handle_class (array); @@ -938,13 +934,13 @@ ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_InitializeArray (MonoAr #endif } -ICALL_EXPORT gint +gint ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_GetOffsetToStringData (void) { return offsetof (MonoString, chars); } -ICALL_EXPORT MonoObject * +MonoObject * ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_GetObjectValue (MonoObject *obj) { if ((obj == NULL) || !m_class_is_valuetype (mono_object_class (obj))) @@ -958,7 +954,7 @@ ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_GetObjectValue (MonoObj } } -ICALL_EXPORT void +void ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_RunClassConstructor (MonoType *handle) { ERROR_DECL (error); @@ -984,7 +980,7 @@ ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_RunClassConstructor (Mo mono_error_set_pending_exception (error); } -ICALL_EXPORT void +void ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_RunModuleConstructor (MonoImage *image) { ERROR_DECL (error); @@ -1007,7 +1003,7 @@ ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_RunModuleConstructor (M } } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_SufficientExecutionStack (void) { #if defined(TARGET_WIN32) || defined(HOST_WIN32) @@ -1046,7 +1042,7 @@ ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_SufficientExecutionStac return TRUE; } -ICALL_EXPORT MonoObject * +MonoObject * ves_icall_System_Object_MemberwiseClone (MonoObject *this_obj) { ERROR_DECL (error); @@ -1056,7 +1052,7 @@ ves_icall_System_Object_MemberwiseClone (MonoObject *this_obj) return ret; } -ICALL_EXPORT gint32 +gint32 ves_icall_System_ValueType_InternalGetHashCode (MonoObject *this_obj, MonoArray **fields) { ERROR_DECL (error); @@ -1125,7 +1121,7 @@ ves_icall_System_ValueType_InternalGetHashCode (MonoObject *this_obj, MonoArray return result; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_ValueType_Equals (MonoObject *this_obj, MonoObject *that, MonoArray **fields) { ERROR_DECL (error); @@ -1295,7 +1291,7 @@ ves_icall_System_ValueType_Equals (MonoObject *this_obj, MonoObject *that, MonoA } } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_System_Object_GetType (MonoObjectHandle obj, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (obj); @@ -1504,7 +1500,7 @@ fail: return MONO_HANDLE_NEW (MonoReflectionType, NULL); } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_System_Type_internal_from_name (MonoStringHandle name, MonoBoolean throwOnError, MonoBoolean ignoreCase, @@ -1558,7 +1554,7 @@ leave: } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_System_Type_internal_from_handle (MonoType *handle, MonoError *error) { MonoDomain *domain = mono_domain_get (); @@ -1566,25 +1562,25 @@ ves_icall_System_Type_internal_from_handle (MonoType *handle, MonoError *error) return mono_type_get_object_handle (domain, handle, error); } -ICALL_EXPORT MonoType* +MonoType* ves_icall_Mono_RuntimeClassHandle_GetTypeFromClass (MonoClass *klass, MonoError *error) { return m_class_get_byval_arg (klass); } -ICALL_EXPORT void +void ves_icall_Mono_RuntimeGPtrArrayHandle_GPtrArrayFree (GPtrArray *ptr_array, MonoError *error) { g_ptr_array_free (ptr_array, TRUE); } -ICALL_EXPORT void +void ves_icall_Mono_SafeStringMarshal_GFree (void *c_str, MonoError *error) { g_free (c_str); } -ICALL_EXPORT char* +char* ves_icall_Mono_SafeStringMarshal_StringToUtf8 (MonoStringHandle s, MonoError *error) { return mono_string_handle_to_utf8 (s, error); @@ -1612,7 +1608,7 @@ typedef enum { TYPECODE_STRING = 18 } TypeCode; -ICALL_EXPORT guint32 +guint32 ves_icall_type_GetTypeCodeInternal (MonoReflectionTypeHandle ref_type, MonoError *error) { MonoType *type = MONO_HANDLE_GETVAL (ref_type, type); @@ -1705,7 +1701,7 @@ mono_type_get_underlying_type_ignore_byref (MonoType *type) return type; } -ICALL_EXPORT guint32 +guint32 ves_icall_RuntimeTypeHandle_type_is_assignable_from (MonoReflectionTypeHandle ref_type, MonoReflectionTypeHandle ref_c, MonoError *error) { g_assert (!MONO_HANDLE_IS_NULL (ref_type)); @@ -1743,7 +1739,7 @@ ves_icall_RuntimeTypeHandle_type_is_assignable_from (MonoReflectionTypeHandle re return mono_class_is_assignable_from_internal (klass, klassc); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_RuntimeTypeHandle_is_subclass_of (MonoType *childType, MonoType *baseType) { ERROR_DECL (error); @@ -1797,7 +1793,7 @@ done: return result; } -ICALL_EXPORT guint32 +guint32 ves_icall_RuntimeTypeHandle_IsInstanceOfType (MonoReflectionTypeHandle ref_type, MonoObjectHandle obj, MonoError *error) { MonoType *type = MONO_HANDLE_GETVAL (ref_type, type); @@ -1809,7 +1805,7 @@ ves_icall_RuntimeTypeHandle_IsInstanceOfType (MonoReflectionTypeHandle ref_type, return !MONO_HANDLE_IS_NULL (inst); } -ICALL_EXPORT guint32 +guint32 ves_icall_RuntimeTypeHandle_GetAttributes (MonoReflectionTypeHandle ref_type, MonoError *error) { MonoType *type = MONO_HANDLE_GETVAL (ref_type, type); @@ -1817,7 +1813,7 @@ ves_icall_RuntimeTypeHandle_GetAttributes (MonoReflectionTypeHandle ref_type, Mo return mono_class_get_flags (klass); } -ICALL_EXPORT MonoReflectionMarshalAsAttributeHandle +MonoReflectionMarshalAsAttributeHandle ves_icall_System_Reflection_FieldInfo_get_marshal_info (MonoReflectionFieldHandle field_h, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (field_h); @@ -1848,7 +1844,7 @@ ves_icall_System_Reflection_FieldInfo_get_marshal_info (MonoReflectionFieldHandl return MONO_HANDLE_CAST (MonoReflectionMarshalAsAttribute, NULL_HANDLE); } -ICALL_EXPORT MonoReflectionFieldHandle +MonoReflectionFieldHandle ves_icall_System_Reflection_FieldInfo_internal_from_handle_type (MonoClassField *handle, MonoType *type, MonoError *error) { MonoClass *klass; @@ -1870,7 +1866,7 @@ ves_icall_System_Reflection_FieldInfo_internal_from_handle_type (MonoClassField return mono_field_get_object_handle (mono_domain_get (), klass, handle, error); } -ICALL_EXPORT MonoReflectionEventHandle +MonoReflectionEventHandle ves_icall_System_Reflection_EventInfo_internal_from_handle_type (MonoEvent *handle, MonoType *type, MonoError *error) { MonoClass *klass; @@ -1892,7 +1888,7 @@ ves_icall_System_Reflection_EventInfo_internal_from_handle_type (MonoEvent *hand } -ICALL_EXPORT MonoReflectionPropertyHandle +MonoReflectionPropertyHandle ves_icall_System_Reflection_PropertyInfo_internal_from_handle_type (MonoProperty *handle, MonoType *type, MonoError *error) { MonoClass *klass; @@ -1913,7 +1909,7 @@ ves_icall_System_Reflection_PropertyInfo_internal_from_handle_type (MonoProperty return mono_property_get_object_handle (mono_domain_get (), klass, handle, error); } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_System_Reflection_FieldInfo_GetTypeModifiers (MonoReflectionFieldHandle field_h, MonoBoolean optional, MonoError *error) { MonoClassField *field = MONO_HANDLE_GETVAL (field_h, field); @@ -1925,13 +1921,13 @@ ves_icall_System_Reflection_FieldInfo_GetTypeModifiers (MonoReflectionFieldHandl return type_array_from_modifiers (m_class_get_image (field->parent), type, optional, error); } -ICALL_EXPORT int +int ves_icall_get_method_attributes (MonoMethod *method) { return method->flags; } -ICALL_EXPORT void +void ves_icall_get_method_info (MonoMethod *method, MonoMethodInfo *info, MonoError *error) { MonoDomain *domain = mono_domain_get (); @@ -1964,7 +1960,7 @@ ves_icall_get_method_info (MonoMethod *method, MonoMethodInfo *info, MonoError * info->callconv = callconv; } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_System_Reflection_MonoMethodInfo_get_parameter_info (MonoMethod *method, MonoReflectionMethodHandle member, MonoError *error) { MonoDomain *domain = mono_domain_get (); @@ -1977,7 +1973,7 @@ ves_icall_System_Reflection_MonoMethodInfo_get_parameter_info (MonoMethod *metho return mono_param_get_objects_internal (domain, method, klass, error); } -ICALL_EXPORT MonoReflectionMarshalAsAttributeHandle +MonoReflectionMarshalAsAttributeHandle ves_icall_System_MonoMethodInfo_get_retval_marshal (MonoMethod *method, MonoError *error) { MonoDomain *domain = mono_domain_get (); @@ -2000,7 +1996,7 @@ leave: return res; } -ICALL_EXPORT gint32 +gint32 ves_icall_MonoField_GetFieldOffset (MonoReflectionFieldHandle field, MonoError *error) { MonoClassField *class_field = MONO_HANDLE_GETVAL (field, field); @@ -2009,7 +2005,7 @@ ves_icall_MonoField_GetFieldOffset (MonoReflectionFieldHandle field, MonoError * return class_field->offset - MONO_ABI_SIZEOF (MonoObject); } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_MonoField_GetParentType (MonoReflectionFieldHandle field, MonoBoolean declaring, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (field); @@ -2025,7 +2021,7 @@ ves_icall_MonoField_GetParentType (MonoReflectionFieldHandle field, MonoBoolean return mono_type_get_object_handle (domain, m_class_get_byval_arg (parent), error); } -ICALL_EXPORT MonoObject * +MonoObject * ves_icall_MonoField_GetValueInternal (MonoReflectionField *field, MonoObject *obj) { ERROR_DECL (error); @@ -2063,7 +2059,7 @@ ves_icall_MonoField_GetValueInternal (MonoReflectionField *field, MonoObject *ob return result; } -ICALL_EXPORT void +void ves_icall_MonoField_SetValueInternal (MonoReflectionFieldHandle field, MonoObjectHandle obj, MonoObjectHandle value, MonoError *error) { MonoClassField *cf = MONO_HANDLE_GETVAL (field, field); @@ -2211,7 +2207,7 @@ typed_reference_to_object (MonoTypedRef *tref, MonoError *error) HANDLE_FUNCTION_RETURN_REF (MonoObject, result); } -ICALL_EXPORT void +void ves_icall_System_RuntimeFieldHandle_SetValueDirect (MonoReflectionField *field, MonoReflectionType *field_type, MonoTypedRef *obj, MonoObject *value, MonoReflectionType *context_type) { ICALL_ENTRY (); @@ -2238,7 +2234,7 @@ leave: ICALL_RETURN (); } -ICALL_EXPORT MonoObject * +MonoObject * ves_icall_MonoField_GetRawConstantValue (MonoReflectionField *rfield) { MonoObject *o = NULL; @@ -2336,7 +2332,7 @@ ves_icall_MonoField_GetRawConstantValue (MonoReflectionField *rfield) return o; } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_MonoField_ResolveType (MonoReflectionFieldHandle ref_field, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (ref_field); @@ -2348,7 +2344,7 @@ ves_icall_MonoField_ResolveType (MonoReflectionFieldHandle ref_field, MonoError return mono_type_get_object_handle (domain, type, error); } -ICALL_EXPORT void +void ves_icall_MonoPropertyInfo_get_property_info (MonoReflectionPropertyHandle property, MonoPropertyInfo *info, PInfo req_info, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (property); @@ -2424,7 +2420,7 @@ leave: HANDLE_FUNCTION_RETURN_VAL (is_ok (error)); } -ICALL_EXPORT void +void ves_icall_MonoEventInfo_get_event_info (MonoReflectionMonoEventHandle ref_event, MonoEventInfo *info, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (ref_event); @@ -2558,7 +2554,7 @@ get_interfaces_hash (gconstpointer v1) return m_class_get_type_token (k); } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_RuntimeType_GetInterfaces (MonoReflectionTypeHandle ref_type, MonoError *error) { MonoType *type = MONO_HANDLE_GETVAL (ref_type, type); @@ -2632,7 +2628,7 @@ leave: HANDLE_FUNCTION_RETURN_VAL (is_ok (error)); } -ICALL_EXPORT void +void ves_icall_RuntimeType_GetInterfaceMapData (MonoReflectionTypeHandle ref_type, MonoReflectionTypeHandle ref_iface, MonoArrayHandleOut targets, MonoArrayHandleOut methods, MonoError *error) { MonoType *type = MONO_HANDLE_GETVAL (ref_type, type); @@ -2672,7 +2668,7 @@ ves_icall_RuntimeType_GetInterfaceMapData (MonoReflectionTypeHandle ref_type, Mo } } -ICALL_EXPORT void +void ves_icall_RuntimeType_GetPacking (MonoReflectionTypeHandle ref_type, guint32 *packing, guint32 *size, MonoError *error) { MonoType *type = MONO_HANDLE_GETVAL (ref_type, type); @@ -2691,7 +2687,7 @@ ves_icall_RuntimeType_GetPacking (MonoReflectionTypeHandle ref_type, guint32 *pa } } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_RuntimeTypeHandle_GetElementType (MonoReflectionTypeHandle ref_type, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (ref_type); @@ -2718,7 +2714,7 @@ ves_icall_RuntimeTypeHandle_GetElementType (MonoReflectionTypeHandle ref_type, M return MONO_HANDLE_CAST (MonoReflectionType, NULL_HANDLE); } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_RuntimeTypeHandle_GetBaseType (MonoReflectionTypeHandle ref_type, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (ref_type); @@ -2734,21 +2730,21 @@ ves_icall_RuntimeTypeHandle_GetBaseType (MonoReflectionTypeHandle ref_type, Mono return mono_type_get_object_handle (domain, m_class_get_byval_arg (m_class_get_parent (klass)), error); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_RuntimeTypeHandle_IsPointer (MonoReflectionTypeHandle ref_type, MonoError *error) { MonoType *type = MONO_HANDLE_GETVAL (ref_type, type); return type->type == MONO_TYPE_PTR; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_RuntimeTypeHandle_IsPrimitive (MonoReflectionTypeHandle ref_type, MonoError *error) { MonoType *type = MONO_HANDLE_GETVAL (ref_type, type); return (!type->byref && (((type->type >= MONO_TYPE_BOOLEAN) && (type->type <= MONO_TYPE_R8)) || (type->type == MONO_TYPE_I) || (type->type == MONO_TYPE_U))); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_RuntimeTypeHandle_HasReferences (MonoReflectionTypeHandle ref_type, MonoError *error) { MonoType *type = MONO_HANDLE_GETVAL (ref_type, type); @@ -2759,14 +2755,14 @@ ves_icall_RuntimeTypeHandle_HasReferences (MonoReflectionTypeHandle ref_type, Mo return m_class_has_references (klass); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_RuntimeTypeHandle_IsByRef (MonoReflectionTypeHandle ref_type, MonoError *error) { MonoType *type = MONO_HANDLE_GETVAL (ref_type, type); return type->byref; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_RuntimeTypeHandle_IsComObject (MonoReflectionTypeHandle ref_type, MonoError *error) { MonoType *type = MONO_HANDLE_GETVAL (ref_type, type); @@ -2778,14 +2774,14 @@ ves_icall_RuntimeTypeHandle_IsComObject (MonoReflectionTypeHandle ref_type, Mono return mono_class_is_com_object (klass); } -ICALL_EXPORT guint32 +guint32 ves_icall_reflection_get_token (MonoObjectHandle obj, MonoError *error) { error_init (error); return mono_reflection_get_token_checked (obj, error); } -ICALL_EXPORT MonoReflectionModuleHandle +MonoReflectionModuleHandle ves_icall_RuntimeTypeHandle_GetModule (MonoReflectionTypeHandle type, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (type); @@ -2794,7 +2790,7 @@ ves_icall_RuntimeTypeHandle_GetModule (MonoReflectionTypeHandle type, MonoError return mono_module_get_object_handle (domain, m_class_get_image (klass), error); } -ICALL_EXPORT MonoReflectionAssemblyHandle +MonoReflectionAssemblyHandle ves_icall_RuntimeTypeHandle_GetAssembly (MonoReflectionTypeHandle type, MonoError *error) { MonoDomain *domain = mono_domain_get (); @@ -2803,7 +2799,7 @@ ves_icall_RuntimeTypeHandle_GetAssembly (MonoReflectionTypeHandle type, MonoErro return mono_assembly_get_object_handle (domain, m_class_get_image (klass)->assembly, error); } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_RuntimeType_get_DeclaringType (MonoReflectionTypeHandle ref_type, MonoError *error) { MonoDomain *domain = mono_domain_get (); @@ -2828,7 +2824,7 @@ ves_icall_RuntimeType_get_DeclaringType (MonoReflectionTypeHandle ref_type, Mono return mono_type_get_object_handle (domain, m_class_get_byval_arg (klass), error); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_RuntimeType_get_Name (MonoReflectionTypeHandle reftype, MonoError *error) { MonoDomain *domain = mono_domain_get (); @@ -2847,7 +2843,7 @@ ves_icall_RuntimeType_get_Name (MonoReflectionTypeHandle reftype, MonoError *err } } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_RuntimeType_get_Namespace (MonoReflectionTypeHandle type, MonoError *error) { MonoDomain *domain = mono_domain_get (); @@ -2863,7 +2859,7 @@ ves_icall_RuntimeType_get_Namespace (MonoReflectionTypeHandle type, MonoError *e return mono_string_new_handle (domain, m_class_get_name_space (klass), error); } -ICALL_EXPORT gint32 +gint32 ves_icall_RuntimeTypeHandle_GetArrayRank (MonoReflectionTypeHandle ref_type, MonoError *error) { error_init (error); @@ -2899,7 +2895,7 @@ leave: HANDLE_FUNCTION_RETURN_VAL (is_ok (error)); } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_RuntimeType_GetGenericArguments (MonoReflectionTypeHandle ref_type, MonoBoolean runtimeTypeArray, MonoError *error) { error_init (error); @@ -2934,7 +2930,7 @@ leave: return res; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_RuntimeTypeHandle_IsGenericTypeDefinition (MonoReflectionTypeHandle ref_type, MonoError *error) { error_init (error); @@ -2950,7 +2946,7 @@ ves_icall_RuntimeTypeHandle_IsGenericTypeDefinition (MonoReflectionTypeHandle re return mono_class_is_gtd (klass); } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_RuntimeTypeHandle_GetGenericTypeDefinition_impl (MonoReflectionTypeHandle ref_type, MonoError *error) { error_init (error); @@ -2987,7 +2983,7 @@ leave: return ret; } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_RuntimeType_MakeGenericType (MonoReflectionTypeHandle reftype, MonoArrayHandle type_array, MonoError *error) { error_init (error); @@ -3025,7 +3021,7 @@ ves_icall_RuntimeType_MakeGenericType (MonoReflectionTypeHandle reftype, MonoArr return mono_type_get_object_handle (domain, geninst, error); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_RuntimeTypeHandle_HasInstantiation (MonoReflectionTypeHandle ref_type, MonoError *error) { error_init (error); @@ -3042,7 +3038,7 @@ ves_icall_RuntimeTypeHandle_HasInstantiation (MonoReflectionTypeHandle ref_type, return mono_class_is_ginst (klass) || mono_class_is_gtd (klass); } -ICALL_EXPORT gint32 +gint32 ves_icall_RuntimeType_GetGenericParameterPosition (MonoReflectionTypeHandle ref_type, MonoError *error) { error_init (error); @@ -3055,7 +3051,7 @@ ves_icall_RuntimeType_GetGenericParameterPosition (MonoReflectionTypeHandle ref_ return -1; } -ICALL_EXPORT MonoGenericParamInfo * +MonoGenericParamInfo * ves_icall_RuntimeTypeHandle_GetGenericParameterInfo (MonoReflectionTypeHandle ref_type, MonoError *error) { error_init (error); @@ -3063,14 +3059,14 @@ ves_icall_RuntimeTypeHandle_GetGenericParameterInfo (MonoReflectionTypeHandle re return mono_generic_param_info (type->data.generic_param); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_RuntimeTypeHandle_IsGenericVariable (MonoReflectionTypeHandle ref_type, MonoError *error) { MonoType *type = MONO_HANDLE_GETVAL(ref_type, type); return is_generic_parameter (type); } -ICALL_EXPORT MonoReflectionMethodHandle +MonoReflectionMethodHandle ves_icall_RuntimeType_GetCorrespondingInflatedMethod (MonoReflectionTypeHandle ref_type, MonoReflectionMethodHandle generic, MonoError *error) @@ -3100,7 +3096,7 @@ ves_icall_RuntimeType_GetCorrespondingInflatedMethod (MonoReflectionTypeHandle r return ret; } -ICALL_EXPORT MonoReflectionMethodHandle +MonoReflectionMethodHandle ves_icall_RuntimeType_get_DeclaringMethod (MonoReflectionTypeHandle ref_type, MonoError *error) { error_init (error); @@ -3126,7 +3122,7 @@ leave: return ret; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_RuntimeType_IsTypeExportedToWindowsRuntime (MonoError *error) { error_init (error); @@ -3134,7 +3130,7 @@ ves_icall_System_RuntimeType_IsTypeExportedToWindowsRuntime (MonoError *error) return FALSE; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_RuntimeType_IsWindowsRuntimeObjectType (MonoError *error) { error_init (error); @@ -3142,7 +3138,7 @@ ves_icall_System_RuntimeType_IsWindowsRuntimeObjectType (MonoError *error) return FALSE; } -ICALL_EXPORT void +void ves_icall_MonoMethod_GetPInvoke (MonoReflectionMethodHandle ref_method, int* flags, MonoStringHandleOut entry_point, MonoStringHandleOut dll_name, MonoError *error) { MonoDomain *domain = mono_domain_get (); @@ -3189,7 +3185,7 @@ ves_icall_MonoMethod_GetPInvoke (MonoReflectionMethodHandle ref_method, int* fla MONO_HANDLE_ASSIGN (dll_name, mono_string_new_handle (domain, scope, error)); } -ICALL_EXPORT MonoReflectionMethodHandle +MonoReflectionMethodHandle ves_icall_MonoMethod_GetGenericMethodDefinition (MonoReflectionMethodHandle ref_method, MonoError *error) { error_init (error); @@ -3235,14 +3231,14 @@ ves_icall_MonoMethod_GetGenericMethodDefinition (MonoReflectionMethodHandle ref_ return mono_method_get_object_handle (MONO_HANDLE_DOMAIN (ref_method), result, NULL, error); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_MonoMethod_get_IsGenericMethod (MonoReflectionMethodHandle ref_method, MonoError *erro) { MonoMethod *method = MONO_HANDLE_GETVAL (ref_method, method); return mono_method_signature_internal (method)->generic_param_count != 0; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_MonoMethod_get_IsGenericMethodDefinition (MonoReflectionMethodHandle ref_method, MonoError *Error) { MonoMethod *method = MONO_HANDLE_GETVAL (ref_method, method); @@ -3275,7 +3271,7 @@ leave: HANDLE_FUNCTION_RETURN_VAL (is_ok (error)); } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_MonoMethod_GetGenericArguments (MonoReflectionMethodHandle ref_method, MonoError *error) { error_init (error); @@ -3312,7 +3308,7 @@ ves_icall_MonoMethod_GetGenericArguments (MonoReflectionMethodHandle ref_method, return res; } -ICALL_EXPORT MonoObject * +MonoObject * ves_icall_InternalInvoke (MonoReflectionMethod *method, MonoObject *this_arg, MonoArray *params, MonoException **exc) { ERROR_DECL (error); @@ -3555,7 +3551,7 @@ internal_execute_field_setter (MonoDomain *domain, MonoObject *this_arg, MonoArr g_assert_not_reached (); } -ICALL_EXPORT MonoObject * +MonoObject * ves_icall_InternalExecute (MonoReflectionMethod *method, MonoObject *this_arg, MonoArray *params, MonoArray **outArgs) { ERROR_DECL (error); @@ -3674,7 +3670,7 @@ write_enum_value (void *mem, int type, guint64 value) return; } -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle ves_icall_System_Enum_ToObject (MonoReflectionTypeHandle enumType, guint64 value, MonoError *error) { MonoDomain *domain; @@ -3701,7 +3697,7 @@ return_null: return MONO_HANDLE_NEW (MonoObject, NULL); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Enum_InternalHasFlag (MonoObjectHandle a, MonoObjectHandle b, MonoError *error) { int size = mono_class_value_size (mono_handle_class (a), NULL); @@ -3713,7 +3709,7 @@ ves_icall_System_Enum_InternalHasFlag (MonoObjectHandle a, MonoObjectHandle b, M return (a_val & b_val) == b_val; } -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle ves_icall_System_Enum_get_value (MonoObjectHandle ehandle, MonoError *error) { MonoObjectHandle resultHandle; @@ -3737,7 +3733,7 @@ return_null: return MONO_HANDLE_NEW (MonoObject, NULL); } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_System_Enum_get_underlying_type (MonoReflectionTypeHandle type, MonoError *error) { MonoType *etype; @@ -3759,7 +3755,7 @@ return_null: return MONO_HANDLE_NEW (MonoReflectionType, NULL); } -ICALL_EXPORT int +int ves_icall_System_Enum_compare_value_to (MonoObjectHandle enumHandle, MonoObjectHandle otherHandle, MonoError *error) { if (MONO_HANDLE_IS_NULL (otherHandle)) @@ -3805,7 +3801,7 @@ ves_icall_System_Enum_compare_value_to (MonoObjectHandle enumHandle, MonoObjectH return 3; } -ICALL_EXPORT int +int ves_icall_System_Enum_get_hashcode (MonoObjectHandle enumHandle, MonoError *error) { gpointer data = mono_handle_unbox_unsafe (enumHandle); @@ -3877,7 +3873,7 @@ leave: HANDLE_FUNCTION_RETURN(); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Enum_GetEnumValuesAndNames (MonoReflectionTypeHandle type, MonoArrayHandleOut values, MonoArrayHandleOut names, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (type); @@ -3943,7 +3939,7 @@ enum { MLISTTYPE_HandleToInfo = 3 }; -ICALL_EXPORT GPtrArray* +GPtrArray* ves_icall_RuntimeType_GetFields_native (MonoReflectionTypeHandle ref_type, char *utf8_name, guint32 bflags, guint32 mlisttype, MonoError *error) { error_init (error); @@ -4136,7 +4132,7 @@ loader_error: return NULL; } -ICALL_EXPORT GPtrArray* +GPtrArray* ves_icall_RuntimeType_GetMethodsByName_native (MonoReflectionTypeHandle ref_type, const char *mname, guint32 bflags, guint32 mlisttype, MonoError *error) { error_init (error); @@ -4150,7 +4146,7 @@ ves_icall_RuntimeType_GetMethodsByName_native (MonoReflectionTypeHandle ref_type return mono_class_get_methods_by_name (klass, mname, bflags, mlisttype, FALSE, error); } -ICALL_EXPORT GPtrArray* +GPtrArray* ves_icall_RuntimeType_GetConstructors_native (MonoReflectionTypeHandle ref_type, guint32 bflags, MonoError *error) { error_init (error); @@ -4267,7 +4263,7 @@ property_accessor_nonpublic (MonoMethod* accessor, gboolean start_klass) return method_nonpublic (accessor, start_klass); } -ICALL_EXPORT GPtrArray* +GPtrArray* ves_icall_RuntimeType_GetPropertiesByName_native (MonoReflectionTypeHandle ref_type, gchar *propname, guint32 bflags, guint32 mlisttype, MonoError *error) { error_init (error); @@ -4374,7 +4370,7 @@ event_equal (MonoEvent *event1, MonoEvent *event2) return g_str_equal (event1->name, event2->name); } -ICALL_EXPORT GPtrArray* +GPtrArray* ves_icall_RuntimeType_GetEvents_native (MonoReflectionTypeHandle ref_type, char *utf8_name, guint32 bflags, guint32 mlisttype, MonoError *error) { error_init (error); @@ -4467,7 +4463,7 @@ failure: return NULL; } -ICALL_EXPORT GPtrArray * +GPtrArray * ves_icall_RuntimeType_GetNestedTypes_native (MonoReflectionTypeHandle ref_type, char *str, guint32 bflags, guint32 mlisttype, MonoError *error) { error_init (error); @@ -4544,7 +4540,7 @@ get_type_from_module_builder_loaded_modules (MonoArrayHandle loaded_modules, int HANDLE_FUNCTION_RETURN_VAL (type); } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_System_Reflection_Assembly_InternalGetType (MonoReflectionAssemblyHandle assembly_h, MonoReflectionModuleHandle module, MonoStringHandle name, MonoBoolean throwOnError, MonoBoolean ignoreCase, MonoError *error) { error_init (error); @@ -4709,7 +4705,7 @@ replace_shadow_path (MonoDomain *domain, gchar *dirname, gchar **filename) return FALSE; } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Reflection_Assembly_get_code_base (MonoReflectionAssemblyHandle assembly, MonoBoolean escaped, MonoError *error) { error_init (error); @@ -4751,7 +4747,7 @@ ves_icall_System_Reflection_Assembly_get_code_base (MonoReflectionAssemblyHandle return res; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Reflection_Assembly_get_global_assembly_cache (MonoReflectionAssemblyHandle assembly, MonoError *error) { error_init (error); @@ -4760,7 +4756,7 @@ ves_icall_System_Reflection_Assembly_get_global_assembly_cache (MonoReflectionAs return mass->in_gac; } -ICALL_EXPORT MonoReflectionAssemblyHandle +MonoReflectionAssemblyHandle ves_icall_System_Reflection_Assembly_load_with_partial_name (MonoStringHandle mname, MonoObjectHandle evidence, MonoError *error) { gchar *name; @@ -4781,7 +4777,7 @@ leave: return result; } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Reflection_Assembly_get_location (MonoReflectionAssemblyHandle refassembly, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (refassembly); @@ -4789,7 +4785,7 @@ ves_icall_System_Reflection_Assembly_get_location (MonoReflectionAssemblyHandle return mono_string_new_handle (domain, mono_image_get_filename (assembly->image), error); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Reflection_Assembly_get_ReflectionOnly (MonoReflectionAssemblyHandle assembly_h, MonoError *error) { error_init (error); @@ -4797,7 +4793,7 @@ ves_icall_System_Reflection_Assembly_get_ReflectionOnly (MonoReflectionAssemblyH return mono_asmctx_get_kind (&assembly->context) == MONO_ASMCTX_REFONLY; } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Reflection_Assembly_InternalImageRuntimeVersion (MonoReflectionAssemblyHandle refassembly, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (refassembly); @@ -4806,7 +4802,7 @@ ves_icall_System_Reflection_Assembly_InternalImageRuntimeVersion (MonoReflection return mono_string_new_handle (domain, assembly->image->version, error); } -ICALL_EXPORT MonoReflectionMethodHandle +MonoReflectionMethodHandle ves_icall_System_Reflection_Assembly_get_EntryPoint (MonoReflectionAssemblyHandle assembly_h, MonoError *error) { error_init (error); @@ -4827,7 +4823,7 @@ leave: return res; } -ICALL_EXPORT MonoReflectionModuleHandle +MonoReflectionModuleHandle ves_icall_System_Reflection_Assembly_GetManifestModuleInternal (MonoReflectionAssemblyHandle assembly, MonoError *error) { error_init (error); @@ -4849,7 +4845,7 @@ leave: HANDLE_FUNCTION_RETURN_VAL (is_ok (error)); } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_System_Reflection_Assembly_GetManifestResourceNames (MonoReflectionAssemblyHandle assembly_h, MonoError *error) { error_init (error); @@ -4869,7 +4865,7 @@ fail: return MONO_HANDLE_CAST (MonoArray, NULL_HANDLE); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Reflection_Assembly_GetAotId (MonoError *error) { char *guid = mono_runtime_get_aotid (); @@ -4904,7 +4900,7 @@ create_referenced_assembly_name (MonoDomain *domain, MonoImage *image, MonoTable return aname; } -ICALL_EXPORT GPtrArray* +GPtrArray* ves_icall_System_Reflection_Assembly_InternalGetReferencedAssemblies (MonoReflectionAssemblyHandle assembly, MonoError *error) { error_init (error); @@ -4943,7 +4939,7 @@ g_concat_dir_and_file (const char *dir, const char *file) return g_strconcat (dir, file, NULL); } -ICALL_EXPORT void * +void * ves_icall_System_Reflection_Assembly_GetManifestResourceInternal (MonoReflectionAssemblyHandle assembly_h, MonoStringHandle name, gint32 *size, MonoReflectionModuleHandleOut ref_module, MonoError *error) { error_init (error); @@ -5071,7 +5067,7 @@ leave: HANDLE_FUNCTION_RETURN_VAL (result); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Reflection_Assembly_GetManifestResourceInfoInternal (MonoReflectionAssemblyHandle assembly_h, MonoStringHandle name, MonoManifestResourceInfoHandle info_h, MonoError *error) { error_init (error); @@ -5093,7 +5089,7 @@ leave: HANDLE_FUNCTION_RETURN_VAL (is_ok (error)); } -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle ves_icall_System_Reflection_Assembly_GetFilesInternal (MonoReflectionAssemblyHandle assembly_h, MonoStringHandle name, MonoBoolean resource_modules, MonoError *error) { error_init (error); @@ -5191,7 +5187,7 @@ leave: HANDLE_FUNCTION_RETURN_VAL (is_ok (error)); } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_System_Reflection_Assembly_GetModulesInternal (MonoReflectionAssemblyHandle assembly_h, MonoError *error) { error_init (error); @@ -5243,7 +5239,7 @@ fail: return MONO_HANDLE_CAST (MonoArray, NULL_HANDLE); } -ICALL_EXPORT MonoReflectionMethodHandle +MonoReflectionMethodHandle ves_icall_GetCurrentMethod (MonoError *error) { error_init (error); @@ -5301,7 +5297,7 @@ mono_method_get_equivalent_method (MonoMethod *method, MonoClass *klass) return m_class_get_methods (klass) [offset]; } -ICALL_EXPORT MonoReflectionMethodHandle +MonoReflectionMethodHandle ves_icall_System_Reflection_MethodBase_GetMethodFromHandleInternalType_native (MonoMethod *method, MonoType *type, MonoBoolean generic_check, MonoError *error) { error_init (error); @@ -5323,14 +5319,14 @@ ves_icall_System_Reflection_MethodBase_GetMethodFromHandleInternalType_native (M return mono_method_get_object_handle (mono_domain_get (), method, klass, error); } -ICALL_EXPORT MonoReflectionMethodBodyHandle +MonoReflectionMethodBodyHandle ves_icall_System_Reflection_MethodBase_GetMethodBodyInternal (MonoMethod *method, MonoError *error) { error_init (error); return mono_method_body_get_object_handle (mono_domain_get (), method, error); } -ICALL_EXPORT MonoReflectionAssemblyHandle +MonoReflectionAssemblyHandle ves_icall_System_Reflection_Assembly_GetExecutingAssembly (MonoError *error) { error_init (error); @@ -5342,7 +5338,7 @@ ves_icall_System_Reflection_Assembly_GetExecutingAssembly (MonoError *error) } -ICALL_EXPORT MonoReflectionAssemblyHandle +MonoReflectionAssemblyHandle ves_icall_System_Reflection_Assembly_GetEntryAssembly (MonoError *error) { error_init (error); @@ -5355,7 +5351,7 @@ ves_icall_System_Reflection_Assembly_GetEntryAssembly (MonoError *error) return mono_assembly_get_object_handle (domain, domain->entry_assembly, error); } -ICALL_EXPORT MonoReflectionAssemblyHandle +MonoReflectionAssemblyHandle ves_icall_System_Reflection_Assembly_GetCallingAssembly (MonoError *error) { error_init (error); @@ -5375,7 +5371,7 @@ ves_icall_System_Reflection_Assembly_GetCallingAssembly (MonoError *error) return mono_assembly_get_object_handle (mono_domain_get (), m_class_get_image (dest->klass)->assembly, error); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_RuntimeType_getFullName (MonoReflectionTypeHandle object, MonoBoolean full_name, MonoBoolean assembly_qualified, MonoError *error) { @@ -5407,7 +5403,7 @@ ves_icall_System_RuntimeType_getFullName (MonoReflectionTypeHandle object, MonoB return res; } -ICALL_EXPORT int +int ves_icall_RuntimeType_get_core_clr_security_level (MonoReflectionTypeHandle rfield, MonoError *error) { error_init (error); @@ -5420,14 +5416,14 @@ ves_icall_RuntimeType_get_core_clr_security_level (MonoReflectionTypeHandle rfie return mono_security_core_clr_class_level (klass); } -ICALL_EXPORT int +int ves_icall_MonoField_get_core_clr_security_level (MonoReflectionField *rfield) { MonoClassField *field = rfield->field; return mono_security_core_clr_field_level (field, TRUE); } -ICALL_EXPORT int +int ves_icall_MonoMethod_get_core_clr_security_level (MonoReflectionMethodHandle rfield, MonoError *error) { error_init (error); @@ -5435,7 +5431,7 @@ ves_icall_MonoMethod_get_core_clr_security_level (MonoReflectionMethodHandle rfi return mono_security_core_clr_method_level (method, TRUE); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Reflection_Assembly_get_fullName (MonoReflectionAssemblyHandle assembly, MonoError *error) { error_init (error); @@ -5449,13 +5445,13 @@ ves_icall_System_Reflection_Assembly_get_fullName (MonoReflectionAssemblyHandle return res; } -ICALL_EXPORT MonoAssemblyName * +MonoAssemblyName * ves_icall_System_Reflection_AssemblyName_GetNativeName (MonoAssembly *mass) { return &mass->aname; } -ICALL_EXPORT void +void ves_icall_System_Reflection_Assembly_InternalGetAssemblyName (MonoStringHandle fname, MonoAssemblyName *name, MonoStringHandleOut normalized_codebase, MonoError *error) { char *filename; @@ -5515,7 +5511,7 @@ ves_icall_System_Reflection_Assembly_InternalGetAssemblyName (MonoStringHandle f g_free (filename); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Reflection_Assembly_LoadPermissions (MonoReflectionAssemblyHandle assembly_h, char **minimum, guint32 *minLength, char **optional, guint32 *optLength, char **refused, guint32 *refLength, MonoError *error) { @@ -5662,7 +5658,7 @@ set_class_failure_in_array (MonoArrayHandle exl, int i, MonoClass *klass) HANDLE_FUNCTION_RETURN (); } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_System_Reflection_Assembly_GetTypes (MonoReflectionAssemblyHandle assembly_handle, MonoBoolean exportedOnly, MonoError *error) { MonoArrayHandle exceptions = MONO_HANDLE_NEW(MonoArray, NULL); @@ -5753,7 +5749,7 @@ ves_icall_System_Reflection_Assembly_GetTypes (MonoReflectionAssemblyHandle asse return res; } -ICALL_EXPORT void +void ves_icall_Mono_RuntimeMarshal_FreeAssemblyName (MonoAssemblyName *aname, MonoBoolean free_struct, MonoError *error) { mono_assembly_name_free (aname); @@ -5761,7 +5757,7 @@ ves_icall_Mono_RuntimeMarshal_FreeAssemblyName (MonoAssemblyName *aname, MonoBoo g_free (aname); } -ICALL_EXPORT void +void ves_icall_Mono_Runtime_DisableMicrosoftTelemetry (MonoError *error) { #ifdef TARGET_OSX @@ -5772,7 +5768,7 @@ ves_icall_Mono_Runtime_DisableMicrosoftTelemetry (MonoError *error) #endif } -ICALL_EXPORT void +void ves_icall_Mono_Runtime_EnableMicrosoftTelemetry (char *appBundleID, char *appSignature, char *appVersion, char *merpGUIPath, char *eventType, char *appPath, MonoError *error) { #ifdef TARGET_OSX @@ -5785,7 +5781,7 @@ ves_icall_Mono_Runtime_EnableMicrosoftTelemetry (char *appBundleID, char *appSig #endif } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_Mono_Runtime_ExceptionToState (MonoExceptionHandle exc_handle, guint64 *portable_hash_out, guint64 *unportable_hash_out, MonoError *error) { MonoStringHandle result; @@ -5816,7 +5812,7 @@ ves_icall_Mono_Runtime_ExceptionToState (MonoExceptionHandle exc_handle, guint64 return result; } -ICALL_EXPORT void +void ves_icall_Mono_Runtime_SendMicrosoftTelemetry (char *payload, guint64 portable_hash, guint64 unportable_hash, MonoError *error) { #ifdef TARGET_OSX @@ -5840,7 +5836,7 @@ ves_icall_Mono_Runtime_SendMicrosoftTelemetry (char *payload, guint64 portable_h #endif } -ICALL_EXPORT void +void ves_icall_Mono_Runtime_DumpTelemetry (char *payload, guint64 portable_hash, guint64 unportable_hash, MonoError *error) { #ifndef DISABLE_CRASH_REPORTING @@ -5854,7 +5850,7 @@ ves_icall_Mono_Runtime_DumpTelemetry (char *payload, guint64 portable_hash, guin #endif } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_Mono_Runtime_DumpStateSingle (guint64 *portable_hash, guint64 *unportable_hash, MonoError *error) { MonoStringHandle result; @@ -5889,7 +5885,7 @@ ves_icall_Mono_Runtime_DumpStateSingle (guint64 *portable_hash, guint64 *unporta } -ICALL_EXPORT void +void ves_icall_Mono_Runtime_RegisterReportingForNativeLib (const char *path_suffix, const char *module_name) { #ifndef DISABLE_CRASH_REPORTING @@ -5902,7 +5898,7 @@ ves_icall_Mono_Runtime_RegisterReportingForNativeLib (const char *path_suffix, c // before doing so. #define MONO_MAX_SUMMARY_LEN_ICALL 500000 -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_Mono_Runtime_DumpStateTotal (guint64 *portable_hash, guint64 *unportable_hash, MonoError *error) { MonoStringHandle result; @@ -5941,7 +5937,7 @@ ves_icall_Mono_Runtime_DumpStateTotal (guint64 *portable_hash, guint64 *unportab return result; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Reflection_AssemblyName_ParseAssemblyName (const char *name, MonoAssemblyName *aname, MonoBoolean *is_version_defined_arg, MonoBoolean *is_token_defined_arg) { gboolean is_version_defined = FALSE; @@ -5956,7 +5952,7 @@ ves_icall_System_Reflection_AssemblyName_ParseAssemblyName (const char *name, Mo return result; } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_System_Reflection_Module_GetGlobalType (MonoReflectionModuleHandle module, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (module); @@ -5979,14 +5975,14 @@ leave: return ret; } -ICALL_EXPORT void +void ves_icall_System_Reflection_Module_Close (MonoReflectionModuleHandle module, MonoError *error) { /*if (module->image) mono_image_close (module->image);*/ } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Reflection_Module_GetGuidInternal (MonoReflectionModuleHandle refmodule, MonoError *error) { MonoDomain *domain = MONO_HANDLE_DOMAIN (refmodule); @@ -6004,13 +6000,13 @@ mono_icall_module_get_hinstance (MonoReflectionModuleHandle module) } #endif /* HOST_WIN32 */ -ICALL_EXPORT gpointer +gpointer ves_icall_System_Reflection_Module_GetHINSTANCE (MonoReflectionModuleHandle module, MonoError *error) { return mono_icall_module_get_hinstance (module); } -ICALL_EXPORT void +void ves_icall_System_Reflection_Module_GetPEKind (MonoImage *image, gint32 *pe_kind, gint32 *machine, MonoError *error) { if (image_is_dynamic (image)) { @@ -6024,13 +6020,13 @@ ves_icall_System_Reflection_Module_GetPEKind (MonoImage *image, gint32 *pe_kind, } } -ICALL_EXPORT gint32 +gint32 ves_icall_System_Reflection_Module_GetMDStreamVersion (MonoImage *image, MonoError *error) { return (image->md_version_major << 16) | (image->md_version_minor); } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_System_Reflection_Module_InternalGetTypes (MonoReflectionModuleHandle module, MonoError *error) { error_init (error); @@ -6180,7 +6176,7 @@ leave: HANDLE_FUNCTION_RETURN_VAL (result); } -ICALL_EXPORT MonoType* +MonoType* ves_icall_System_Reflection_Module_ResolveTypeToken (MonoImage *image, guint32 token, MonoArrayHandle type_args, MonoArrayHandle method_args, MonoResolveTokenError *resolve_error, MonoError *error) { return module_resolve_type_token (image, token, type_args, method_args, resolve_error, error); @@ -6241,13 +6237,13 @@ leave: HANDLE_FUNCTION_RETURN_VAL (method); } -ICALL_EXPORT MonoMethod* +MonoMethod* ves_icall_System_Reflection_Module_ResolveMethodToken (MonoImage *image, guint32 token, MonoArrayHandle type_args, MonoArrayHandle method_args, MonoResolveTokenError *resolve_error, MonoError *error) { return module_resolve_method_token (image, token, type_args, method_args, resolve_error, error); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Reflection_Module_ResolveStringToken (MonoImage *image, guint32 token, MonoResolveTokenError *resolve_error, MonoError *error) { int index = mono_metadata_token_index (token); @@ -6333,13 +6329,13 @@ leave: HANDLE_FUNCTION_RETURN_VAL (field); } -ICALL_EXPORT MonoClassField* +MonoClassField* ves_icall_System_Reflection_Module_ResolveFieldToken (MonoImage *image, guint32 token, MonoArrayHandle type_args, MonoArrayHandle method_args, MonoResolveTokenError *resolve_error, MonoError *error) { return module_resolve_field_token (image, token, type_args, method_args, resolve_error, error); } -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle ves_icall_System_Reflection_Module_ResolveMemberToken (MonoImage *image, guint32 token, MonoArrayHandle type_args, MonoArrayHandle method_args, MonoResolveTokenError *error, MonoError *merror) { int table = mono_metadata_token_table (token); @@ -6399,7 +6395,7 @@ ves_icall_System_Reflection_Module_ResolveMemberToken (MonoImage *image, guint32 return NULL_HANDLE; } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_System_Reflection_Module_ResolveSignature (MonoImage *image, guint32 token, MonoResolveTokenError *resolve_error, MonoError *error) { error_init (error); @@ -6436,7 +6432,7 @@ ves_icall_System_Reflection_Module_ResolveSignature (MonoImage *image, guint32 t return res; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_RuntimeTypeHandle_IsArray (MonoReflectionTypeHandle ref_type, MonoError *error) { error_init (error); @@ -6461,7 +6457,7 @@ check_for_invalid_type (MonoClass *klass, MonoError *error) mono_error_set_type_load_name (error, name, g_strdup (""), ""); } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_RuntimeType_make_array_type (MonoReflectionTypeHandle ref_type, int rank, MonoError *error) { error_init (error); @@ -6487,7 +6483,7 @@ ves_icall_RuntimeType_make_array_type (MonoReflectionTypeHandle ref_type, int ra return mono_type_get_object_handle (domain, m_class_get_byval_arg (aklass), error); } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_RuntimeType_make_byref_type (MonoReflectionTypeHandle ref_type, MonoError *error) { error_init (error); @@ -6506,7 +6502,7 @@ ves_icall_RuntimeType_make_byref_type (MonoReflectionTypeHandle ref_type, MonoEr return mono_type_get_object_handle (domain, m_class_get_this_arg (klass), error); } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_RuntimeType_MakePointerType (MonoReflectionTypeHandle ref_type, MonoError *error) { error_init (error); @@ -6526,7 +6522,7 @@ ves_icall_RuntimeType_MakePointerType (MonoReflectionTypeHandle ref_type, MonoEr return mono_type_get_object_handle (domain, m_class_get_byval_arg (pklass), error); } -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle ves_icall_System_Delegate_CreateDelegate_internal (MonoReflectionTypeHandle ref_type, MonoObjectHandle target, MonoReflectionMethodHandle info, MonoBoolean throwOnBindFailure, MonoError *error) { @@ -6587,7 +6583,7 @@ ves_icall_System_Delegate_CreateDelegate_internal (MonoReflectionTypeHandle ref_ return delegate; } -ICALL_EXPORT MonoMulticastDelegateHandle +MonoMulticastDelegateHandle ves_icall_System_Delegate_AllocDelegateLike_internal (MonoDelegateHandle delegate, MonoError *error) { error_init (error); @@ -6603,7 +6599,7 @@ ves_icall_System_Delegate_AllocDelegateLike_internal (MonoDelegateHandle delegat return ret; } -ICALL_EXPORT MonoReflectionMethodHandle +MonoReflectionMethodHandle ves_icall_System_Delegate_GetVirtualMethod_internal (MonoDelegateHandle delegate, MonoError *error) { error_init (error); @@ -6659,25 +6655,25 @@ mono_array_get_byte_length (MonoArray *array) } } -ICALL_EXPORT gint32 +gint32 ves_icall_System_Buffer_ByteLengthInternal (MonoArray *array) { return mono_array_get_byte_length (array); } -ICALL_EXPORT gint8 +gint8 ves_icall_System_Buffer_GetByteInternal (MonoArray *array, gint32 idx) { return mono_array_get_internal (array, gint8, idx); } -ICALL_EXPORT void +void ves_icall_System_Buffer_SetByteInternal (MonoArray *array, gint32 idx, gint8 value) { mono_array_set_internal (array, gint8, idx, value); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Buffer_BlockCopyInternal (MonoArray *src, gint32 src_offset, MonoArray *dest, gint32 dest_offset, gint32 count) { guint8 *src_buf, *dest_buf; @@ -6711,7 +6707,7 @@ ves_icall_System_Buffer_BlockCopyInternal (MonoArray *src, gint32 src_offset, Mo } #ifndef DISABLE_REMOTING -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle ves_icall_Remoting_RealProxy_GetTransparentProxy (MonoObjectHandle this_obj, MonoStringHandle class_name, MonoError *error) { error_init (error); @@ -6754,7 +6750,7 @@ ves_icall_Remoting_RealProxy_GetTransparentProxy (MonoObjectHandle this_obj, Mon return res; } -ICALL_EXPORT MonoReflectionType * +MonoReflectionType * ves_icall_Remoting_RealProxy_InternalGetProxyType (MonoTransparentProxy *tp) { ERROR_DECL (error); @@ -6814,7 +6810,7 @@ mono_icall_get_machine_name (MonoError *error) } #endif /* !HOST_WIN32 */ -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Environment_get_MachineName (MonoError *error) { error_init (error); @@ -6842,7 +6838,7 @@ mono_icall_get_platform (void) } #endif /* !HOST_WIN32 */ -ICALL_EXPORT int +int ves_icall_System_Environment_get_Platform (void) { return mono_icall_get_platform (); @@ -6857,7 +6853,7 @@ mono_icall_get_new_line (MonoError *error) } #endif /* !HOST_WIN32 */ -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Environment_get_NewLine (MonoError *error) { return mono_icall_get_new_line (error); @@ -6882,13 +6878,13 @@ mono_icall_is_64bit_os (void) } #endif /* !HOST_WIN32 */ -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Environment_GetIs64BitOperatingSystem (void) { return mono_icall_is_64bit_os (); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Environment_GetEnvironmentVariable_native (const gchar *utf8_name, MonoError *error) { gchar *value; @@ -6934,7 +6930,7 @@ G_END_DECLS #endif #endif -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_System_Environment_GetCommandLineArgs (MonoError *error) { error_init (error); @@ -6982,7 +6978,7 @@ mono_icall_get_environment_variable_names (MonoError *error) } #endif /* !HOST_WIN32 */ -ICALL_EXPORT MonoArray * +MonoArray * ves_icall_System_Environment_GetEnvironmentVariableNames (void) { ERROR_DECL (error); @@ -7021,13 +7017,13 @@ mono_icall_set_environment_variable (MonoString *name, MonoString *value) } #endif /* !HOST_WIN32 */ -ICALL_EXPORT void +void ves_icall_System_Environment_InternalSetEnvironmentVariable (MonoString *name, MonoString *value) { mono_icall_set_environment_variable (name, value); } -ICALL_EXPORT void +void ves_icall_System_Environment_Exit (int result) { mono_environment_exitcode_set (result); @@ -7044,7 +7040,7 @@ ves_icall_System_Environment_Exit (int result) exit (result); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Environment_GetGacPath (MonoError *error) { return mono_string_new_handle (mono_domain_get (), mono_assembly_getrootdir (), error); @@ -7060,7 +7056,7 @@ mono_icall_get_windows_folder_path (int folder, MonoError *error) } #endif /* !HOST_WIN32 */ -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Environment_GetWindowsFolderPath (int folder, MonoError *error) { return mono_icall_get_windows_folder_path (folder, error); @@ -7128,13 +7124,13 @@ leave: } #endif /* G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT) */ -ICALL_EXPORT MonoArray * +MonoArray * ves_icall_System_Environment_GetLogicalDrives (void) { return mono_icall_get_logical_drives (); } -ICALL_EXPORT MonoString * +MonoString * ves_icall_System_IO_DriveInfo_GetDriveFormat (MonoString *path) { ERROR_DECL (error); @@ -7147,7 +7143,7 @@ ves_icall_System_IO_DriveInfo_GetDriveFormat (MonoString *path) return result; } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Environment_InternalGetHome (MonoError *error) { return mono_string_new_handle (mono_domain_get (), g_get_home_dir (), error); @@ -7180,7 +7176,7 @@ static const char *encodings [] = { * 1 at entry, and we can not compute a suitable code page number, * returns the code page as a string */ -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Text_EncodingHelper_InternalCodePage (gint32 *int_code_page, MonoError *error) { error_init (error); @@ -7230,7 +7226,7 @@ ves_icall_System_Text_EncodingHelper_InternalCodePage (gint32 *int_code_page, Mo return MONO_HANDLE_CAST (MonoString, NULL_HANDLE); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Environment_get_HasShutdownStarted (void) { if (mono_runtime_is_shutting_down ()) @@ -7251,14 +7247,14 @@ mono_icall_broadcast_setting_change (MonoError *error) } #endif /* !HOST_WIN32 */ -ICALL_EXPORT void +void ves_icall_System_Environment_BroadcastSettingChange (MonoError *error) { error_init (error); mono_icall_broadcast_setting_change (error); } -ICALL_EXPORT + gint32 ves_icall_System_Environment_get_TickCount (void) { @@ -7266,14 +7262,14 @@ ves_icall_System_Environment_get_TickCount (void) return (gint32) (mono_msec_boottime () & 0xffffffff); } -ICALL_EXPORT gint32 +gint32 ves_icall_System_Runtime_Versioning_VersioningHelper_GetRuntimeId (MonoError *error) { return 9; } #ifndef DISABLE_REMOTING -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_IsTransparentProxy (MonoObjectHandle proxy, MonoError *error) { error_init (error); @@ -7286,7 +7282,7 @@ ves_icall_IsTransparentProxy (MonoObjectHandle proxy, MonoError *error) return 0; } -ICALL_EXPORT MonoReflectionMethodHandle +MonoReflectionMethodHandle ves_icall_Remoting_RemotingServices_GetVirtualMethod ( MonoReflectionTypeHandle rtype, MonoReflectionMethodHandle rmethod, MonoError *error) { @@ -7345,7 +7341,7 @@ ves_icall_Remoting_RemotingServices_GetVirtualMethod ( return ret; } -ICALL_EXPORT void +void ves_icall_System_Runtime_Activation_ActivationServices_EnableProxyActivation (MonoReflectionTypeHandle type, MonoBoolean enable, MonoError *error) { error_init (error); @@ -7359,7 +7355,7 @@ ves_icall_System_Runtime_Activation_ActivationServices_EnableProxyActivation (Mo #else /* DISABLE_REMOTING */ -ICALL_EXPORT void +void ves_icall_System_Runtime_Activation_ActivationServices_EnableProxyActivation (MonoReflectionTypeHandle type, MonoBoolean enable, MonoError *error) { error_init (error); @@ -7368,7 +7364,7 @@ ves_icall_System_Runtime_Activation_ActivationServices_EnableProxyActivation (Mo #endif -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle ves_icall_System_Runtime_Activation_ActivationServices_AllocateUninitializedClassInstance (MonoReflectionTypeHandle type, MonoError *error) { error_init (error); @@ -7395,14 +7391,14 @@ ves_icall_System_Runtime_Activation_ActivationServices_AllocateUninitializedClas } } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_IO_get_temp_path (MonoError *error) { return mono_string_new_handle (mono_domain_get (), g_get_tmp_dir (), error); } #ifndef PLATFORM_NO_DRIVEINFO -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_IO_DriveInfo_GetDiskFreeSpace (MonoString *path_name, guint64 *free_bytes_avail, guint64 *total_number_of_bytes, guint64 *total_number_of_free_bytes, gint32 *error) @@ -7426,7 +7422,7 @@ mono_icall_drive_info_get_drive_type (MonoString *root_path_name) } #endif /* G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT) */ -ICALL_EXPORT guint32 +guint32 ves_icall_System_IO_DriveInfo_GetDriveType (MonoString *root_path_name) { return mono_icall_drive_info_get_drive_type (root_path_name); @@ -7434,14 +7430,14 @@ ves_icall_System_IO_DriveInfo_GetDriveType (MonoString *root_path_name) #endif /* PLATFORM_NO_DRIVEINFO */ -ICALL_EXPORT gpointer +gpointer ves_icall_RuntimeMethodHandle_GetFunctionPointer (MonoMethod *method, MonoError *error) { error_init (error); return mono_compile_method_checked (method, error); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Configuration_DefaultConfig_get_machine_config_path (MonoError *error) { error_init (error); @@ -7459,7 +7455,7 @@ ves_icall_System_Configuration_DefaultConfig_get_machine_config_path (MonoError return mcpath; } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Configuration_InternalConfigurationHost_get_bundled_app_config (MonoError *error) { error_init (error); @@ -7520,27 +7516,27 @@ get_bundled_machine_config (MonoError *error) return mono_string_new_handle (mono_domain_get (), machine_config, error); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Environment_get_bundled_machine_config (MonoError *error) { return get_bundled_machine_config (error); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Configuration_DefaultConfig_get_bundled_machine_config (MonoError *error) { return get_bundled_machine_config (error); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Configuration_InternalConfigurationHost_get_bundled_machine_config (MonoError *error) { return get_bundled_machine_config (error); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Web_Util_ICalls_get_machine_install_dir (MonoError *error) { error_init (error); @@ -7556,7 +7552,7 @@ ves_icall_System_Web_Util_ICalls_get_machine_install_dir (MonoError *error) return ipath; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_get_resources_ptr (MonoReflectionAssemblyHandle assembly, gpointer *result, gint32 *size, MonoError *error) { error_init (error); @@ -7584,13 +7580,13 @@ ves_icall_get_resources_ptr (MonoReflectionAssemblyHandle assembly, gpointer *re return TRUE; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Diagnostics_Debugger_IsAttached_internal (MonoError *error) { return mono_is_debugger_attached (); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Diagnostics_Debugger_IsLogging (MonoError *error) { if (mono_get_runtime_callbacks ()->debug_log_is_enabled) @@ -7599,7 +7595,7 @@ ves_icall_System_Diagnostics_Debugger_IsLogging (MonoError *error) return FALSE; } -ICALL_EXPORT void +void ves_icall_System_Diagnostics_Debugger_Log (int level, MonoStringHandle category, MonoStringHandle message, MonoError *error) { if (mono_get_runtime_callbacks ()->debug_log) @@ -7614,14 +7610,14 @@ mono_icall_write_windows_debug_string (const gunichar2 *message) } #endif /* !HOST_WIN32 */ -ICALL_EXPORT void +void ves_icall_System_Diagnostics_DefaultTraceListener_WriteWindowsDebugString (const gunichar2 *message, MonoError *error) { mono_icall_write_windows_debug_string (message); } /* Only used for value types */ -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle ves_icall_System_Activator_CreateInstanceInternal (MonoReflectionTypeHandle ref_type, MonoError *error) { error_init (error); @@ -7640,7 +7636,7 @@ ves_icall_System_Activator_CreateInstanceInternal (MonoReflectionTypeHandle ref_ return mono_object_new_handle (domain, klass, error); } -ICALL_EXPORT MonoReflectionMethodHandle +MonoReflectionMethodHandle ves_icall_MonoMethod_get_base_method (MonoReflectionMethodHandle m, MonoBoolean definition, MonoError *error) { error_init (error); @@ -7664,7 +7660,7 @@ ves_icall_MonoMethod_get_base_method (MonoReflectionMethodHandle m, MonoBoolean return mono_method_get_object_handle (mono_domain_get (), base, NULL, error); } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_MonoMethod_get_name (MonoReflectionMethodHandle m, MonoError *error) { error_init (error); @@ -7677,7 +7673,7 @@ ves_icall_MonoMethod_get_name (MonoReflectionMethodHandle m, MonoError *error) return s; } -ICALL_EXPORT void +void mono_ArgIterator_Setup (MonoArgIterator *iter, char* argsp, char* start) { iter->sig = *(MonoMethodSignature**)argsp; @@ -7697,7 +7693,7 @@ mono_ArgIterator_Setup (MonoArgIterator *iter, char* argsp, char* start) /* g_print ("sig %p, param_count: %d, sent: %d\n", iter->sig, iter->sig->param_count, iter->sig->sentinelpos); */ } -ICALL_EXPORT MonoTypedRef +MonoTypedRef mono_ArgIterator_IntGetNextArg (MonoArgIterator *iter) { guint32 i, arg_size; @@ -7730,7 +7726,7 @@ mono_ArgIterator_IntGetNextArg (MonoArgIterator *iter) return res; } -ICALL_EXPORT MonoTypedRef +MonoTypedRef mono_ArgIterator_IntGetNextArgT (MonoArgIterator *iter, MonoType *type) { guint32 i, arg_size; @@ -7765,7 +7761,7 @@ mono_ArgIterator_IntGetNextArgT (MonoArgIterator *iter, MonoType *type) return res; } -ICALL_EXPORT MonoType* +MonoType* mono_ArgIterator_IntGetNextArgType (MonoArgIterator *iter) { gint i; @@ -7777,13 +7773,13 @@ mono_ArgIterator_IntGetNextArgType (MonoArgIterator *iter) return iter->sig->params [i]; } -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle mono_TypedReference_ToObject (MonoTypedRef* tref, MonoError *error) { return typed_reference_to_object (tref, error); } -ICALL_EXPORT MonoTypedRef +MonoTypedRef mono_TypedReference_MakeTypedReferenceInternal (MonoObject *target, MonoArray *fields) { MonoTypedRef res; @@ -7835,7 +7831,7 @@ prelink_method (MonoMethod *method, MonoError *error) /* create the wrapper, too? */ } -ICALL_EXPORT void +void ves_icall_System_Runtime_InteropServices_Marshal_Prelink (MonoReflectionMethodHandle method, MonoError *error) { error_init (error); @@ -7843,7 +7839,7 @@ ves_icall_System_Runtime_InteropServices_Marshal_Prelink (MonoReflectionMethodHa prelink_method (MONO_HANDLE_GETVAL (method, method), error); } -ICALL_EXPORT void +void ves_icall_System_Runtime_InteropServices_Marshal_PrelinkAll (MonoReflectionTypeHandle type, MonoError *error) { error_init (error); @@ -7864,20 +7860,20 @@ ves_icall_System_Runtime_InteropServices_Marshal_PrelinkAll (MonoReflectionTypeH * used by System.Runtime.InteropServices.RuntimeInformation.(OS|Process)Architecture; * which use them in different ways for filling in an enum */ -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_System_Runtime_InteropServices_RuntimeInformation_get_RuntimeArchitecture (MonoError *error) { error_init (error); return mono_string_new_handle (mono_domain_get (), mono_config_get_cpu (), error); } -ICALL_EXPORT int +int ves_icall_Interop_Sys_DoubleToString(double value, char *format, char *buffer, int bufferLength) { return snprintf(buffer, bufferLength, format, value); } -ICALL_EXPORT void +void ves_icall_System_Runtime_RuntimeImports_ecvt_s(char *buffer, size_t sizeInBytes, double value, int count, int* dec, int* sign) { #if defined(TARGET_WIN32) || defined(HOST_WIN32) @@ -7887,7 +7883,7 @@ ves_icall_System_Runtime_RuntimeImports_ecvt_s(char *buffer, size_t sizeInBytes, /* These parameters are "readonly" in corlib/System/NumberFormatter.cs */ -ICALL_EXPORT void +void ves_icall_System_NumberFormatter_GetFormatterTables (guint64 const **mantissas, gint32 const **exponents, gunichar2 const **digitLowerTable, @@ -7958,7 +7954,7 @@ fail: return MONO_HANDLE_NEW (MonoArray, NULL); } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_ParameterInfo_GetTypeModifiers (MonoReflectionParameterHandle param, MonoBoolean optional, MonoError *error) { error_init (error); @@ -8012,7 +8008,7 @@ get_property_type (MonoProperty *prop) return NULL; } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_MonoPropertyInfo_GetTypeModifiers (MonoReflectionPropertyHandle property, MonoBoolean optional, MonoError *error) { error_init (error); @@ -8048,7 +8044,7 @@ mono_type_from_blob_type (MonoType *type, MonoTypeEnum blob_type, MonoType *real type->data.klass = mono_class_from_mono_type_internal (real_type); } -ICALL_EXPORT MonoObject* +MonoObject* ves_icall_property_info_get_default_value (MonoReflectionProperty *property) { ERROR_DECL (error); @@ -8077,7 +8073,7 @@ ves_icall_property_info_get_default_value (MonoReflectionProperty *property) return o; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_MonoCustomAttrs_IsDefinedInternal (MonoObjectHandle obj, MonoReflectionTypeHandle attr_type, MonoError *error) { error_init (error); @@ -8097,7 +8093,7 @@ ves_icall_MonoCustomAttrs_IsDefinedInternal (MonoObjectHandle obj, MonoReflectio return found; } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_MonoCustomAttrs_GetCustomAttributesInternal (MonoObjectHandle obj, MonoReflectionTypeHandle attr_type, MonoBoolean pseudoattrs, MonoError *error) { MonoClass *attr_class; @@ -8115,7 +8111,7 @@ ves_icall_MonoCustomAttrs_GetCustomAttributesInternal (MonoObjectHandle obj, Mon return mono_reflection_get_custom_attrs_by_type_handle (obj, attr_class, error); } -ICALL_EXPORT MonoArrayHandle +MonoArrayHandle ves_icall_MonoCustomAttrs_GetCustomAttributesDataInternal (MonoObjectHandle obj, MonoError *error) { error_init (error); @@ -8123,7 +8119,7 @@ ves_icall_MonoCustomAttrs_GetCustomAttributesDataInternal (MonoObjectHandle obj, } -ICALL_EXPORT MonoStringHandle +MonoStringHandle ves_icall_Mono_Runtime_GetDisplayName (MonoError *error) { char *info; @@ -8144,19 +8140,19 @@ mono_icall_wait_for_input_idle (gpointer handle, gint32 milliseconds) } #endif /* !HOST_WIN32 */ -ICALL_EXPORT gint32 +gint32 ves_icall_Microsoft_Win32_NativeMethods_WaitForInputIdle (gpointer handle, gint32 milliseconds, MonoError *error) { return mono_icall_wait_for_input_idle (handle, milliseconds); } -ICALL_EXPORT gint32 +gint32 ves_icall_Microsoft_Win32_NativeMethods_GetCurrentProcessId (MonoError *error) { return mono_process_current_pid (); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_Mono_TlsProviderFactory_IsBtlsSupported (MonoError *error) { #if HAVE_BTLS @@ -8168,62 +8164,62 @@ ves_icall_Mono_TlsProviderFactory_IsBtlsSupported (MonoError *error) #ifndef DISABLE_COM -ICALL_EXPORT int +int ves_icall_System_Runtime_InteropServices_Marshal_GetHRForException_WinRT(MonoExceptionHandle ex, MonoError *error) { mono_error_set_not_implemented (error, "System.Runtime.InteropServices.Marshal.GetHRForException_WinRT internal call is not implemented."); return 0; } -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle ves_icall_System_Runtime_InteropServices_Marshal_GetNativeActivationFactory(MonoObjectHandle type, MonoError *error) { mono_error_set_not_implemented (error, "System.Runtime.InteropServices.Marshal.GetNativeActivationFactory internal call is not implemented."); return NULL_HANDLE; } -ICALL_EXPORT void* +void* ves_icall_System_Runtime_InteropServices_Marshal_GetRawIUnknownForComObjectNoAddRef(MonoObjectHandle obj, MonoError *error) { mono_error_set_not_implemented (error, "System.Runtime.InteropServices.Marshal.GetRawIUnknownForComObjectNoAddRef internal call is not implemented."); return NULL; } -ICALL_EXPORT MonoObjectHandle +MonoObjectHandle ves_icall_System_Runtime_InteropServices_WindowsRuntime_UnsafeNativeMethods_GetRestrictedErrorInfo(MonoError *error) { mono_error_set_not_implemented (error, "System.Runtime.InteropServices.WindowsRuntime.UnsafeNativeMethods.GetRestrictedErrorInfo internal call is not implemented."); return NULL_HANDLE; } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Runtime_InteropServices_WindowsRuntime_UnsafeNativeMethods_RoOriginateLanguageException (int ierr, MonoStringHandle message, void* languageException, MonoError *error) { mono_error_set_not_implemented (error, "System.Runtime.InteropServices.WindowsRuntime.UnsafeNativeMethods.RoOriginateLanguageException internal call is not implemented."); return FALSE; } -ICALL_EXPORT void +void ves_icall_System_Runtime_InteropServices_WindowsRuntime_UnsafeNativeMethods_RoReportUnhandledError (MonoObjectHandle oerr, MonoError *error) { mono_error_set_not_implemented (error, "System.Runtime.InteropServices.WindowsRuntime.UnsafeNativeMethods.RoReportUnhandledError internal call is not implemented."); } -ICALL_EXPORT int +int ves_icall_System_Runtime_InteropServices_WindowsRuntime_UnsafeNativeMethods_WindowsCreateString(MonoStringHandle sourceString, int length, void** hstring, MonoError *error) { mono_error_set_not_implemented (error, "System.Runtime.InteropServices.WindowsRuntime.UnsafeNativeMethods.WindowsCreateString internal call is not implemented."); return 0; } -ICALL_EXPORT int +int ves_icall_System_Runtime_InteropServices_WindowsRuntime_UnsafeNativeMethods_WindowsDeleteString(void* hstring, MonoError *error) { mono_error_set_not_implemented (error, "System.Runtime.InteropServices.WindowsRuntime.UnsafeNativeMethods.WindowsDeleteString internal call is not implemented."); return 0; } -ICALL_EXPORT mono_unichar2* +mono_unichar2* ves_icall_System_Runtime_InteropServices_WindowsRuntime_UnsafeNativeMethods_WindowsGetStringRawBuffer(void* hstring, unsigned* length, MonoError *error) { mono_error_set_not_implemented (error, "System.Runtime.InteropServices.WindowsRuntime.UnsafeNativeMethods.WindowsGetStringRawBuffer internal call is not implemented."); @@ -8232,7 +8228,7 @@ ves_icall_System_Runtime_InteropServices_WindowsRuntime_UnsafeNativeMethods_Wind #endif -ICALL_EXPORT void +void ves_icall_System_IO_LogcatTextWriter_Log (const char *appname, gint32 level, const char *message) { g_log (appname, (GLogLevelFlags)level, "%s", message); @@ -8796,62 +8792,62 @@ mono_register_jit_icall (gconstpointer func, const char *name, MonoMethodSignatu return mono_register_jit_icall_full (func, name, sig, no_wrapper, NULL); } -ICALL_EXPORT int +int ves_icall_System_GC_GetCollectionCount (int generation, MonoError *error) { return mono_gc_collection_count (generation); } -ICALL_EXPORT int +int ves_icall_System_GC_GetGeneration (MonoObjectHandle object, MonoError *error) { return mono_gc_get_generation (MONO_HANDLE_RAW (object)); } -ICALL_EXPORT int +int ves_icall_System_GC_GetMaxGeneration (MonoError *error) { return mono_gc_max_generation (); } -ICALL_EXPORT void +void ves_icall_System_GC_RecordPressure (gint64 value, MonoError *error) { mono_gc_add_memory_pressure (value); } -ICALL_EXPORT gint64 +gint64 ves_icall_System_Diagnostics_Stopwatch_GetTimestamp (void) { return mono_100ns_ticks (); } -ICALL_EXPORT gint64 +gint64 ves_icall_System_Threading_Timer_GetTimeMonotonic (void) { return mono_100ns_ticks (); } -ICALL_EXPORT gint64 +gint64 ves_icall_System_DateTime_GetSystemTimeAsFileTime (void) { return mono_100ns_datetime (); } -ICALL_EXPORT int +int ves_icall_System_Threading_Thread_SystemMaxStackSize (void) { return mono_thread_info_get_system_max_stack_size (); } -ICALL_EXPORT MonoBoolean +MonoBoolean ves_icall_System_Threading_Thread_YieldInternal (void) { mono_threads_platform_yield (); return TRUE; } -ICALL_EXPORT gint32 +gint32 ves_icall_System_Environment_get_ProcessorCount (void) { return mono_cpu_count (); diff --git a/mono/metadata/object-internals.h b/mono/metadata/object-internals.h index 04c85fa16d1..01786a31e91 100644 --- a/mono/metadata/object-internals.h +++ b/mono/metadata/object-internals.h @@ -2201,6 +2201,7 @@ mono_string_equal_internal (MonoString *s1, MonoString *s2); unsigned mono_string_hash_internal (MonoString *s); +ICALL_EXPORT int mono_object_hash_internal (MonoObject* obj); @@ -2218,6 +2219,7 @@ mono_object_get_domain_internal (MonoObject *obj); void* mono_object_unbox_internal (MonoObject *obj); +ICALL_EXPORT void mono_monitor_exit_internal (MonoObject *obj); diff --git a/mono/metadata/sre.c b/mono/metadata/sre.c index 88970324458..3d6a0571a4d 100644 --- a/mono/metadata/sre.c +++ b/mono/metadata/sre.c @@ -3851,7 +3851,7 @@ reflection_setup_internal_class (MonoReflectionTypeBuilderHandle ref_tb, MonoErr } } -ICALL_EXPORT MonoReflectionTypeHandle +MonoReflectionTypeHandle ves_icall_TypeBuilder_create_runtime_class (MonoReflectionTypeBuilderHandle ref_tb, MonoError *error) { error_init (error); diff --git a/mono/metadata/sysmath.c b/mono/metadata/sysmath.c index 43ac53602ec..7e250fbaae2 100644 --- a/mono/metadata/sysmath.c +++ b/mono/metadata/sysmath.c @@ -31,14 +31,12 @@ #include "icalls.h" #include "icall-decl.h" -ICALL_EXPORT gdouble ves_icall_System_Math_Floor (gdouble x) { return floor(x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Round (gdouble x) { @@ -58,329 +56,282 @@ ves_icall_System_Math_Round (gdouble x) return copysign (floor_tmp, x); } -ICALL_EXPORT gdouble ves_icall_System_Math_FMod (gdouble x, gdouble y) { return fmod (x, y); } -ICALL_EXPORT gdouble ves_icall_System_Math_ModF (gdouble x, gdouble *d) { return modf (x, d); } -ICALL_EXPORT gdouble ves_icall_System_Math_Sin (gdouble x) { return sin (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Cos (gdouble x) { return cos (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Cbrt (gdouble x) { return cbrt (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Tan (gdouble x) { return tan (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Sinh (gdouble x) { return sinh (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Cosh (gdouble x) { return cosh (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Tanh (gdouble x) { return tanh (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Acos (gdouble x) { return acos (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Acosh (gdouble x) { return acosh (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Asin (gdouble x) { return asin (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Asinh (gdouble x) { return asinh (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Atan (gdouble x) { return atan (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Atan2 (gdouble y, gdouble x) { return atan2 (y, x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Atanh (gdouble x) { return atanh (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Exp (gdouble x) { return exp (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Log (gdouble x) { return log (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Log10 (gdouble x) { return log10 (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Pow (gdouble x, gdouble y) { return pow (x, y); } -ICALL_EXPORT gdouble ves_icall_System_Math_Sqrt (gdouble x) { return sqrt (x); } -ICALL_EXPORT gdouble ves_icall_System_Math_Abs_double (gdouble v) { return fabs (v); } -ICALL_EXPORT float ves_icall_System_Math_Abs_single (float v) { return fabsf (v); } -ICALL_EXPORT gdouble ves_icall_System_Math_Ceiling (gdouble v) { return ceil (v); } -ICALL_EXPORT float ves_icall_System_MathF_Acos (float x) { return acosf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Acosh (float x) { return acoshf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Asin (float x) { return asinf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Asinh (float x) { return asinhf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Atan (float x) { return atan (x); } -ICALL_EXPORT float ves_icall_System_MathF_Atan2 (float x, float y) { return atan2f (x, y); } -ICALL_EXPORT float ves_icall_System_MathF_Atanh (float x) { return atanhf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Cbrt (float x) { return cbrtf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Ceiling (float x) { return ceilf(x); } -ICALL_EXPORT float ves_icall_System_MathF_Cos (float x) { return cosf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Cosh (float x) { return coshf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Exp (float x) { return expf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Floor (float x) { return floorf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Log (float x) { return logf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Log10 (float x) { return log10f (x); } -ICALL_EXPORT float ves_icall_System_MathF_Pow (float x, float y) { return powf (x, y); } -ICALL_EXPORT float ves_icall_System_MathF_Sin (float x) { return sinf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Sinh (float x) { return sinh (x); } -ICALL_EXPORT float ves_icall_System_MathF_Sqrt (float x) { return sqrtf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Tan (float x) { return tanf (x); } -ICALL_EXPORT float ves_icall_System_MathF_Tanh (float x) { return tanh (x); } -ICALL_EXPORT float ves_icall_System_MathF_FMod (float x, float y) { return fmodf (x, y); } -ICALL_EXPORT float ves_icall_System_MathF_ModF (float x, float *d) { diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c index 9afb96778b8..21ca8b70117 100644 --- a/mono/metadata/threads.c +++ b/mono/metadata/threads.c @@ -1866,7 +1866,6 @@ ves_icall_System_Threading_Thread_SetName_internal (MonoInternalThread *this_obj * Gets the priority of the given thread. * @return: The priority of the given thread. */ -ICALL_EXPORT int ves_icall_System_Threading_Thread_GetPriority (MonoThreadObjectHandle this_obj, MonoError *error) { @@ -1888,7 +1887,6 @@ ves_icall_System_Threading_Thread_GetPriority (MonoThreadObjectHandle this_obj, * * Sets the priority of the given thread. */ -ICALL_EXPORT void ves_icall_System_Threading_Thread_SetPriority (MonoThreadObjectHandle this_obj, int priority, MonoError *error) { diff --git a/mono/metadata/w32socket.c b/mono/metadata/w32socket.c index 91dd59757c0..1e76ba0aabe 100644 --- a/mono/metadata/w32socket.c +++ b/mono/metadata/w32socket.c @@ -2625,7 +2625,7 @@ mono_network_cleanup (void) mono_networking_shutdown (); } -ICALL_EXPORT void +void ves_icall_cancel_blocking_socket_operation (MonoThreadObjectHandle thread, MonoError *error) { error_init (error); -- 2.11.4.GIT