2004-04-07 Martin Baulig <martin@ximian.com>

[mono.git] / mono / metadata / icall.c

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 16ba4e89bd18105b33222b27b8dae294cd83080e..b350488800af2bbcd2316e72565aa10f3446bd29 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -1608,7 +1608,7 @@ ves_icall_MonoType_GetArrayRank (MonoReflectionType *type)
 }
 
 static MonoArray*
-ves_icall_Type_GetGenericArguments (MonoReflectionType *type)
+ves_icall_MonoType_GetGenericArguments (MonoReflectionType *type)
 {
        MonoArray *res;
        MonoClass *klass, *pklass;
@@ -1760,22 +1760,6 @@ ves_icall_TypeBuilder_get_IsGenericParameter (MonoReflectionTypeBuilder *tb)
        return FALSE;
 }
 
-static MonoReflectionGenericParam*
-ves_icall_TypeBuilder_define_generic_parameter (MonoReflectionTypeBuilder *tb, MonoString *name, int index)
-{
-       MONO_ARCH_SAVE_REGS;
-
-       return mono_reflection_define_generic_parameter (tb, NULL, name, index);
-}
-
-static MonoReflectionGenericParam*
-ves_icall_MethodBuilder_define_generic_parameter (MonoReflectionMethodBuilder *mb, MonoString *name, int index)
-{
-       MONO_ARCH_SAVE_REGS;
-
-       return mono_reflection_define_generic_parameter (NULL, mb, name, index);
-}
-
 static MonoReflectionType*
 ves_icall_MonoGenericInst_GetParentType (MonoReflectionGenericInst *type)
 {
@@ -1987,13 +1971,6 @@ ves_icall_MonoGenericInst_GetEvents (MonoReflectionGenericInst *type,
        return res;
 }
 
-static void
-ves_icall_MonoGenericParam_initialize (MonoReflectionGenericParam *gparam)
-{
-       MONO_ARCH_SAVE_REGS;
-       mono_reflection_initialize_generic_parameter (gparam);
-}
-
 static MonoReflectionMethod *
 ves_icall_MonoType_get_DeclaringMethod (MonoReflectionType *type)
 {
@@ -4932,7 +4909,16 @@ static const IcallEntry environment_icalls [] = {
 };
 
 static const IcallEntry cultureinfo_icalls [] = {
-       {"construct_internal_locale(string)", ves_icall_System_Globalization_CultureInfo_construct_internal_locale}
+       {"construct_compareinfo(object,string)", ves_icall_System_Globalization_CompareInfo_construct_compareinfo},
+       {"construct_datetime_format", ves_icall_System_Globalization_CultureInfo_construct_datetime_format},
+       {"construct_internal_locale(string)", ves_icall_System_Globalization_CultureInfo_construct_internal_locale},
+       {"construct_internal_locale_from_current_locale", ves_icall_System_Globalization_CultureInfo_construct_internal_locale_from_current_locale},
+       {"construct_internal_locale_from_lcid", ves_icall_System_Globalization_CultureInfo_construct_internal_locale_from_lcid},
+       {"construct_internal_locale_from_name", ves_icall_System_Globalization_CultureInfo_construct_internal_locale_from_name},
+       {"construct_internal_locale_from_specific_name", ves_icall_System_Globalization_CultureInfo_construct_internal_locale_from_specific_name},
+       {"construct_number_format", ves_icall_System_Globalization_CultureInfo_construct_number_format},
+       {"internal_get_cultures", ves_icall_System_Globalization_CultureInfo_internal_get_cultures},
+       {"internal_is_lcid_neutral", ves_icall_System_Globalization_CultureInfo_internal_is_lcid_neutral}
 };
 
 static const IcallEntry compareinfo_icalls [] = {
@@ -5048,6 +5034,7 @@ static const IcallEntry monotype_icalls [] = {
        {"GetEvents_internal", ves_icall_Type_GetEvents_internal},
        {"GetField", ves_icall_Type_GetField},
        {"GetFields_internal", ves_icall_Type_GetFields_internal},
+       {"GetGenericArguments", ves_icall_MonoType_GetGenericArguments},
        {"GetInterfaces", ves_icall_Type_GetInterfaces},
        {"GetMethodsByName", ves_icall_Type_GetMethodsByName},
        {"GetNestedType", ves_icall_Type_GetNestedType},
@@ -5140,8 +5127,8 @@ static const IcallEntry monogenericinst_icalls [] = {
        {"initialize", mono_reflection_generic_inst_initialize}
 };
 
-static const IcallEntry monogenericparam_icalls [] = {
-       {"initialize", ves_icall_MonoGenericParam_initialize}
+static const IcallEntry generictypeparambuilder_icalls [] = {
+       {"initialize", mono_reflection_initialize_generic_parameter}
 };
 
 static const IcallEntry monomethod_icalls [] = {
@@ -5218,8 +5205,7 @@ static const IcallEntry dynamicmethod_icalls [] = {
 };
 
 static const IcallEntry methodbuilder_icalls [] = {
-       {"BindGenericParameters", mono_reflection_bind_generic_method_parameters},
-       {"define_generic_parameter", ves_icall_MethodBuilder_define_generic_parameter}
+       {"BindGenericParameters", mono_reflection_bind_generic_method_parameters}
 };
 
 static const IcallEntry modulebuilder_icalls [] = {
@@ -5239,7 +5225,6 @@ static const IcallEntry signaturehelper_icalls [] = {
 static const IcallEntry typebuilder_icalls [] = {
        {"create_internal_class", mono_reflection_create_internal_class},
        {"create_runtime_class", mono_reflection_create_runtime_class},
-       {"define_generic_parameter", ves_icall_TypeBuilder_define_generic_parameter},
        {"get_IsGenericParameter", ves_icall_TypeBuilder_get_IsGenericParameter},
        {"get_event_info", mono_reflection_event_builder_get_event_info},
        {"setup_generic_class", mono_reflection_setup_generic_class},
@@ -5454,7 +5439,6 @@ static const IcallEntry waithandle_icalls [] = {
 static const IcallEntry type_icalls [] = {
        {"BindGenericParameters", ves_icall_Type_BindGenericParameters},
        {"Equals", ves_icall_type_Equals},
-       {"GetGenericArguments", ves_icall_Type_GetGenericArguments},
        {"GetGenericParameterPosition", ves_icall_Type_GetGenericParameterPosition},
        {"GetGenericTypeDefinition_impl", ves_icall_Type_GetGenericTypeDefinition_impl},
        {"GetInterfaceMapData", ves_icall_Type_GetInterfaceMapData},
@@ -5530,6 +5514,7 @@ static const IcallMap icall_entries [] = {
        {"System.Reflection.Emit.AssemblyBuilder", assemblybuilder_icalls, G_N_ELEMENTS (assemblybuilder_icalls)},
        {"System.Reflection.Emit.CustomAttributeBuilder", customattrbuilder_icalls, G_N_ELEMENTS (customattrbuilder_icalls)},
        {"System.Reflection.Emit.DynamicMethod", dynamicmethod_icalls, G_N_ELEMENTS (dynamicmethod_icalls)},
+       {"System.Reflection.Emit.GenericTypeParameterBuilder", generictypeparambuilder_icalls, G_N_ELEMENTS (generictypeparambuilder_icalls)},
        {"System.Reflection.Emit.MethodBuilder", methodbuilder_icalls, G_N_ELEMENTS (methodbuilder_icalls)},
        {"System.Reflection.Emit.ModuleBuilder", modulebuilder_icalls, G_N_ELEMENTS (modulebuilder_icalls)},
        {"System.Reflection.Emit.SignatureHelper", signaturehelper_icalls, G_N_ELEMENTS (signaturehelper_icalls)},
@@ -5541,7 +5526,6 @@ static const IcallMap icall_entries [] = {
        {"System.Reflection.MonoEventInfo", monoeventinfo_icalls, G_N_ELEMENTS (monoeventinfo_icalls)},
        {"System.Reflection.MonoField", monofield_icalls, G_N_ELEMENTS (monofield_icalls)},
        {"System.Reflection.MonoGenericInst", monogenericinst_icalls, G_N_ELEMENTS (monogenericinst_icalls)},
-       {"System.Reflection.MonoGenericParam", monogenericparam_icalls, G_N_ELEMENTS (monogenericparam_icalls)},
        {"System.Reflection.MonoMethod", monomethod_icalls, G_N_ELEMENTS (monomethod_icalls)},
        {"System.Reflection.MonoMethodInfo", monomethodinfo_icalls, G_N_ELEMENTS (monomethodinfo_icalls)},
        {"System.Reflection.MonoPropertyInfo", monopropertyinfo_icalls, G_N_ELEMENTS (monopropertyinfo_icalls)},