From 0936cea298756085eaa4b6cf1ee863e657a81981 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Thu, 25 Feb 2016 17:09:56 -0800 Subject: [PATCH] [runtime] Remove some declarations from marshal.h which are not used outside of marshal.c. --- mono/metadata/icall-def.h | 2 +- mono/metadata/marshal.c | 55 ++++++++++++++++++++++++++++++++++++++- mono/metadata/marshal.h | 42 +++--------------------------- 3 files changed, 58 insertions(+), 41 deletions(-) diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h index 7bacf3cbb20..7fcdcb9f8eb 100644 --- a/mono/metadata/icall-def.h +++ b/mono/metadata/icall-def.h @@ -660,7 +660,7 @@ ICALL(MARSHAL_44, "GetCCW", ves_icall_System_Runtime_InteropServices_Marshal_Get ICALL(MARSHAL_8, "GetComSlotForMethodInfoInternal", ves_icall_System_Runtime_InteropServices_Marshal_GetComSlotForMethodInfoInternal) #endif ICALL(MARSHAL_9, "GetDelegateForFunctionPointerInternal", ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerInternal) -ICALL(MARSHAL_10, "GetFunctionPointerForDelegateInternal", mono_delegate_to_ftnptr) +ICALL(MARSHAL_10, "GetFunctionPointerForDelegateInternal", ves_icall_System_Runtime_InteropServices_Marshal_GetFunctionPointerForDelegateInternal) #ifndef DISABLE_COM ICALL(MARSHAL_45, "GetIDispatchForObjectInternal", ves_icall_System_Runtime_InteropServices_Marshal_GetIDispatchForObjectInternal) ICALL(MARSHAL_46, "GetIUnknownForObjectInternal", ves_icall_System_Runtime_InteropServices_Marshal_GetIUnknownForObjectInternal) diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c index 82e0b9b69fb..08fe68e92f8 100644 --- a/mono/metadata/marshal.c +++ b/mono/metadata/marshal.c @@ -143,6 +143,54 @@ static void init_safe_handle (void); static void* ves_icall_marshal_alloc (gulong size); +void +mono_string_utf8_to_builder (MonoStringBuilder *sb, char *text); + +void +mono_string_utf16_to_builder (MonoStringBuilder *sb, gunichar2 *text); + +gchar* +mono_string_builder_to_utf8 (MonoStringBuilder *sb); + +gunichar2* +mono_string_builder_to_utf16 (MonoStringBuilder *sb); + +void +mono_string_to_byvalstr (gpointer dst, MonoString *src, int size); + +void +mono_string_to_byvalwstr (gpointer dst, MonoString *src, int size); + +gpointer +mono_delegate_to_ftnptr (MonoDelegate *delegate); + +MonoDelegate* +mono_ftnptr_to_delegate (MonoClass *klass, gpointer ftn); + +gpointer +mono_array_to_savearray (MonoArray *array); + +gpointer +mono_array_to_lparray (MonoArray *array); + +void +mono_free_lparray (MonoArray *array, gpointer* nativeArray); + +gpointer +mono_marshal_asany (MonoObject *obj, MonoMarshalNative string_encoding, int param_attrs); + +void +mono_marshal_free_asany (MonoObject *o, gpointer ptr, MonoMarshalNative string_encoding, int param_attrs); + +gpointer +mono_array_to_savearray (MonoArray *array); + +gpointer +mono_array_to_lparray (MonoArray *array); + +void +mono_free_lparray (MonoArray *array, gpointer* nativeArray); + /* Lazy class loading functions */ static GENERATE_GET_CLASS_WITH_CACHE (string_builder, System.Text, StringBuilder) static GENERATE_GET_CLASS_WITH_CACHE (date_time, System, DateTime) @@ -153,7 +201,6 @@ static GENERATE_TRY_GET_CLASS_WITH_CACHE (icustom_marshaler, System.Runtime.Inte static MonoMethod *sh_dangerous_add_ref; static MonoMethod *sh_dangerous_release; - static void init_safe_handle () { @@ -10740,6 +10787,12 @@ ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerIn return mono_ftnptr_to_delegate (klass, ftn); } +gpointer +ves_icall_System_Runtime_InteropServices_Marshal_GetFunctionPointerForDelegateInternal (MonoDelegate *delegate) +{ + return mono_delegate_to_ftnptr (delegate); +} + /** * mono_marshal_is_loading_type_info: * diff --git a/mono/metadata/marshal.h b/mono/metadata/marshal.h index 6ef4f19390c..66fa99a91d5 100644 --- a/mono/metadata/marshal.h +++ b/mono/metadata/marshal.h @@ -264,56 +264,17 @@ mono_marshal_type_size (MonoType *type, MonoMarshalSpec *mspec, guint32 *align, int mono_type_native_stack_size (MonoType *type, guint32 *alignment); -gpointer -mono_array_to_savearray (MonoArray *array); - -gpointer -mono_array_to_lparray (MonoArray *array); - -void -mono_free_lparray (MonoArray *array, gpointer* nativeArray); - -void -mono_string_utf8_to_builder (MonoStringBuilder *sb, char *text); - -void -mono_string_utf16_to_builder (MonoStringBuilder *sb, gunichar2 *text); - -gchar* -mono_string_builder_to_utf8 (MonoStringBuilder *sb); - -gunichar2* -mono_string_builder_to_utf16 (MonoStringBuilder *sb); - gpointer mono_string_to_ansibstr (MonoString *string_obj); gpointer mono_string_to_bstr (MonoString *string_obj); -void -mono_string_to_byvalstr (gpointer dst, MonoString *src, int size); - -void -mono_string_to_byvalwstr (gpointer dst, MonoString *src, int size); - -gpointer -mono_delegate_to_ftnptr (MonoDelegate *delegate); - -MonoDelegate* -mono_ftnptr_to_delegate (MonoClass *klass, gpointer ftn); - void mono_delegate_free_ftnptr (MonoDelegate *delegate); void mono_marshal_set_last_error (void); -gpointer -mono_marshal_asany (MonoObject *obj, MonoMarshalNative string_encoding, int param_attrs); - -void -mono_marshal_free_asany (MonoObject *o, gpointer ptr, MonoMarshalNative string_encoding, int param_attrs); - guint mono_type_to_ldind (MonoType *type); @@ -540,6 +501,9 @@ ves_icall_System_Runtime_InteropServices_Marshal_UnsafeAddrOfPinnedArrayElement MonoDelegate* ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerInternal (void *ftn, MonoReflectionType *type); +gpointer +ves_icall_System_Runtime_InteropServices_Marshal_GetFunctionPointerForDelegateInternal (MonoDelegate *delegate); + int ves_icall_System_Runtime_InteropServices_Marshal_AddRefInternal (gpointer pUnk); -- 2.25.1