X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Ficall-def.h;h=cb5cdd2141db223214c1e50f722705eda67737f9;hb=59ce8a23634c6ea6027696a91804d57df0d8a900;hp=bb9099b9c30fb7890cf813687697027bdab02c38;hpb=993b18ec7ea500f3abec2566b8f387dd1c6b3a1e;p=mono.git diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h index bb9099b9c30..cb5cdd2141d 100644 --- a/mono/metadata/icall-def.h +++ b/mono/metadata/icall-def.h @@ -111,9 +111,13 @@ ICALL_TYPE(CHAR, "System.Char", CHAR_1) ICALL(CHAR_1, "GetDataTablePointers", ves_icall_System_Char_GetDataTablePointers) ICALL_TYPE(DEFAULTC, "System.Configuration.DefaultConfig", DEFAULTC_1) -ICALL(DEFAULTC_1, "get_bundled_machine_config", ves_icall_System_Configuration_DefaultConfig_get_bundled_machine_config) +ICALL(DEFAULTC_1, "get_bundled_machine_config", get_bundled_machine_config) ICALL(DEFAULTC_2, "get_machine_config_path", ves_icall_System_Configuration_DefaultConfig_get_machine_config_path) +/* Note that the below icall shares the same function as DefaultConfig uses */ +ICALL_TYPE(INTCFGHOST, "System.Configuration.InternalConfigurationHost", INTCFGHOST_1) +ICALL(INTCFGHOST_1, "get_bundled_machine_config", get_bundled_machine_config) + ICALL_TYPE(CONSOLE, "System.ConsoleDriver", CONSOLE_1) ICALL(CONSOLE_1, "GetTtySize", ves_icall_System_ConsoleDriver_GetTtySize ) ICALL(CONSOLE_2, "InternalKeyAvailable", ves_icall_System_ConsoleDriver_InternalKeyAvailable ) @@ -130,7 +134,8 @@ ICALL_TYPE(TZONE, "System.CurrentSystemTimeZone", TZONE_1) ICALL(TZONE_1, "GetTimeZoneData", ves_icall_System_CurrentSystemTimeZone_GetTimeZoneData) ICALL_TYPE(DTIME, "System.DateTime", DTIME_1) -ICALL(DTIME_1, "GetNow", ves_icall_System_DateTime_GetNow) +ICALL(DTIME_1, "GetNow", mono_100ns_datetime) +ICALL(DTIME_2, "GetTimeMonotonic", mono_100ns_ticks) #ifndef DISABLE_DECIMAL ICALL_TYPE(DECIMAL, "System.Decimal", DECIMAL_1) @@ -160,11 +165,27 @@ ICALL(TRACEL_1, "WriteWindowsDebugString", ves_icall_System_Diagnostics_DefaultT ICALL_TYPE(FILEV, "System.Diagnostics.FileVersionInfo", FILEV_1) ICALL(FILEV_1, "GetVersionInfo_internal(string)", ves_icall_System_Diagnostics_FileVersionInfo_GetVersionInfo_internal) +ICALL_TYPE(PERFCTR, "System.Diagnostics.PerformanceCounter", PERFCTR_1) +ICALL(PERFCTR_1, "FreeData", mono_perfcounter_free_data) +ICALL(PERFCTR_2, "GetImpl", mono_perfcounter_get_impl) +ICALL(PERFCTR_3, "GetSample", mono_perfcounter_get_sample) +ICALL(PERFCTR_4, "UpdateValue", mono_perfcounter_update_value) + +ICALL_TYPE(PERFCTRCAT, "System.Diagnostics.PerformanceCounterCategory", PERFCTRCAT_1) +ICALL(PERFCTRCAT_1, "CategoryDelete", mono_perfcounter_category_del) +ICALL(PERFCTRCAT_2, "CategoryHelpInternal", mono_perfcounter_category_help) +ICALL(PERFCTRCAT_3, "CounterCategoryExists", mono_perfcounter_category_exists) +ICALL(PERFCTRCAT_4, "Create", mono_perfcounter_create) +ICALL(PERFCTRCAT_5, "GetCategoryNames", mono_perfcounter_category_names) +ICALL(PERFCTRCAT_6, "GetCounterNames", mono_perfcounter_counter_names) +ICALL(PERFCTRCAT_8, "GetInstanceNames", mono_perfcounter_instance_names) +ICALL(PERFCTRCAT_7, "InstanceExistsInternal", mono_perfcounter_instance_exists) + ICALL_TYPE(PROCESS, "System.Diagnostics.Process", PROCESS_1) ICALL(PROCESS_1, "CreateProcess_internal(System.Diagnostics.ProcessStartInfo,intptr,intptr,intptr,System.Diagnostics.Process/ProcInfo&)", ves_icall_System_Diagnostics_Process_CreateProcess_internal) ICALL(PROCESS_2, "ExitCode_internal(intptr)", ves_icall_System_Diagnostics_Process_ExitCode_internal) ICALL(PROCESS_3, "ExitTime_internal(intptr)", ves_icall_System_Diagnostics_Process_ExitTime_internal) -ICALL(PROCESS_4, "GetModules_internal()", ves_icall_System_Diagnostics_Process_GetModules_internal) +ICALL(PROCESS_4, "GetModules_internal(intptr)", ves_icall_System_Diagnostics_Process_GetModules_internal) ICALL(PROCESS_5, "GetPid_internal()", ves_icall_System_Diagnostics_Process_GetPid_internal) ICALL(PROCESS_5B, "GetPriorityClass(intptr,int&)", ves_icall_System_Diagnostics_Process_GetPriorityClass) ICALL(PROCESS_6, "GetProcess_internal(int)", ves_icall_System_Diagnostics_Process_GetProcess_internal) @@ -180,6 +201,9 @@ ICALL(PROCESS_14, "StartTime_internal(intptr)", ves_icall_System_Diagnostics_Pro ICALL(PROCESS_14M, "Times", ves_icall_System_Diagnostics_Process_Times) ICALL(PROCESS_15, "WaitForExit_internal(intptr,int)", ves_icall_System_Diagnostics_Process_WaitForExit_internal) +ICALL_TYPE(STOPWATCH, "System.Diagnostics.Stopwatch", STOPWATCH_1) +ICALL(STOPWATCH_1, "GetTimestamp", mono_100ns_ticks) + ICALL_TYPE(DOUBLE, "System.Double", DOUBLE_1) ICALL(DOUBLE_1, "ParseImpl", mono_double_ParseImpl) @@ -202,7 +226,7 @@ ICALL(ENV_11, "get_MachineName", ves_icall_System_Environment_get_MachineName) ICALL(ENV_12, "get_NewLine", ves_icall_System_Environment_get_NewLine) ICALL(ENV_13, "get_Platform", ves_icall_System_Environment_get_Platform) ICALL(ENV_14, "get_ProcessorCount", ves_icall_System_Environment_get_ProcessorCount) -ICALL(ENV_15, "get_TickCount", ves_icall_System_Environment_get_TickCount) +ICALL(ENV_15, "get_TickCount", mono_msec_ticks) ICALL(ENV_16, "get_UserName", ves_icall_System_Environment_get_UserName) ICALL(ENV_17, "internalGetEnvironmentVariable", ves_icall_System_Environment_GetEnvironmentVariable) ICALL(ENV_18, "internalGetGacPath", ves_icall_System_Environment_GetGacPath) @@ -387,6 +411,9 @@ ICALL(SOCK_21, "WSAIoctl(intptr,int,byte[],byte[],int&)", ves_icall_System_Net_S ICALL_TYPE(SOCKEX, "System.Net.Sockets.SocketException", SOCKEX_1) ICALL(SOCKEX_1, "WSAGetLastError_internal", ves_icall_System_Net_Sockets_SocketException_WSAGetLastError_internal) +ICALL_TYPE(NUMBER_FORMATTER, "System.NumberFormatter", NUMBER_FORMATTER_1) +ICALL(NUMBER_FORMATTER_1, "GetFormatterTables", ves_icall_System_NumberFormatter_GetFormatterTables) + ICALL_TYPE(OBJ, "System.Object", OBJ_1) ICALL(OBJ_1, "GetType", ves_icall_System_Object_GetType) ICALL(OBJ_2, "InternalGetHashCode", mono_object_hash) @@ -399,31 +426,32 @@ ICALL(ASSEM_2, "GetCallingAssembly", ves_icall_System_Reflection_Assembly_GetCal ICALL(ASSEM_3, "GetEntryAssembly", ves_icall_System_Reflection_Assembly_GetEntryAssembly) ICALL(ASSEM_4, "GetExecutingAssembly", ves_icall_System_Reflection_Assembly_GetExecutingAssembly) ICALL(ASSEM_5, "GetFilesInternal", ves_icall_System_Reflection_Assembly_GetFilesInternal) -ICALL(ASSEM_6, "GetManifestResourceInfoInternal", ves_icall_System_Reflection_Assembly_GetManifestResourceInfoInternal) -ICALL(ASSEM_7, "GetManifestResourceInternal", ves_icall_System_Reflection_Assembly_GetManifestResourceInternal) -ICALL(ASSEM_8, "GetManifestResourceNames", ves_icall_System_Reflection_Assembly_GetManifestResourceNames) -ICALL(ASSEM_9, "GetModulesInternal", ves_icall_System_Reflection_Assembly_GetModulesInternal) -ICALL(ASSEM_10, "GetNamespaces", ves_icall_System_Reflection_Assembly_GetNamespaces) -ICALL(ASSEM_11, "GetReferencedAssemblies", ves_icall_System_Reflection_Assembly_GetReferencedAssemblies) -ICALL(ASSEM_12, "GetTypes", ves_icall_System_Reflection_Assembly_GetTypes) -ICALL(ASSEM_13, "InternalGetAssemblyName", ves_icall_System_Reflection_Assembly_InternalGetAssemblyName) -ICALL(ASSEM_14, "InternalGetType", ves_icall_System_Reflection_Assembly_InternalGetType) -ICALL(ASSEM_15, "InternalImageRuntimeVersion", ves_icall_System_Reflection_Assembly_InternalImageRuntimeVersion) -ICALL(ASSEM_16, "LoadFrom", ves_icall_System_Reflection_Assembly_LoadFrom) -ICALL(ASSEM_17, "LoadPermissions", ves_icall_System_Reflection_Assembly_LoadPermissions) +ICALL(ASSEM_6, "GetManifestModuleInternal", ves_icall_System_Reflection_Assembly_GetManifestModuleInternal) +ICALL(ASSEM_7, "GetManifestResourceInfoInternal", ves_icall_System_Reflection_Assembly_GetManifestResourceInfoInternal) +ICALL(ASSEM_8, "GetManifestResourceInternal", ves_icall_System_Reflection_Assembly_GetManifestResourceInternal) +ICALL(ASSEM_9, "GetManifestResourceNames", ves_icall_System_Reflection_Assembly_GetManifestResourceNames) +ICALL(ASSEM_10, "GetModulesInternal", ves_icall_System_Reflection_Assembly_GetModulesInternal) +ICALL(ASSEM_11, "GetNamespaces", ves_icall_System_Reflection_Assembly_GetNamespaces) +ICALL(ASSEM_12, "GetReferencedAssemblies", ves_icall_System_Reflection_Assembly_GetReferencedAssemblies) +ICALL(ASSEM_13, "GetTypes", ves_icall_System_Reflection_Assembly_GetTypes) +ICALL(ASSEM_14, "InternalGetAssemblyName", ves_icall_System_Reflection_Assembly_InternalGetAssemblyName) +ICALL(ASSEM_15, "InternalGetType", ves_icall_System_Reflection_Assembly_InternalGetType) +ICALL(ASSEM_16, "InternalImageRuntimeVersion", ves_icall_System_Reflection_Assembly_InternalImageRuntimeVersion) +ICALL(ASSEM_17, "LoadFrom", ves_icall_System_Reflection_Assembly_LoadFrom) +ICALL(ASSEM_18, "LoadPermissions", ves_icall_System_Reflection_Assembly_LoadPermissions) /* * Private icalls for the Mono Debugger */ -ICALL(ASSEM_18, "MonoDebugger_GetMethodToken", ves_icall_MonoDebugger_GetMethodToken) +ICALL(ASSEM_19, "MonoDebugger_GetMethodToken", ves_icall_MonoDebugger_GetMethodToken) /* normal icalls again */ -ICALL(ASSEM_19, "get_EntryPoint", ves_icall_System_Reflection_Assembly_get_EntryPoint) -ICALL(ASSEM_20, "get_ManifestModule", ves_icall_System_Reflection_Assembly_get_ManifestModule) +ICALL(ASSEM_20, "get_EntryPoint", ves_icall_System_Reflection_Assembly_get_EntryPoint) ICALL(ASSEM_21, "get_ReflectionOnly", ves_icall_System_Reflection_Assembly_get_ReflectionOnly) ICALL(ASSEM_22, "get_code_base", ves_icall_System_Reflection_Assembly_get_code_base) -ICALL(ASSEM_23, "get_global_assembly_cache", ves_icall_System_Reflection_Assembly_get_global_assembly_cache) -ICALL(ASSEM_24, "get_location", ves_icall_System_Reflection_Assembly_get_location) -ICALL(ASSEM_25, "load_with_partial_name", ves_icall_System_Reflection_Assembly_load_with_partial_name) +ICALL(ASSEM_23, "get_fullname", ves_icall_System_Reflection_Assembly_get_fullName) +ICALL(ASSEM_24, "get_global_assembly_cache", ves_icall_System_Reflection_Assembly_get_global_assembly_cache) +ICALL(ASSEM_25, "get_location", ves_icall_System_Reflection_Assembly_get_location) +ICALL(ASSEM_26, "load_with_partial_name", ves_icall_System_Reflection_Assembly_load_with_partial_name) ICALL_TYPE(ASSEMN, "System.Reflection.AssemblyName", ASSEMN_1) ICALL(ASSEMN_1, "ParseName", ves_icall_System_Reflection_AssemblyName_ParseName) @@ -448,7 +476,8 @@ ICALL(GPARB_1, "initialize", mono_reflection_initialize_generic_parameter) ICALL_TYPE(METHODB, "System.Reflection.Emit.MethodBuilder", METHODB_1) ICALL(METHODB_1, "MakeGenericMethod", mono_reflection_bind_generic_method_parameters) -ICALL_TYPE(MODULEB, "System.Reflection.Emit.ModuleBuilder", MODULEB_1) +ICALL_TYPE(MODULEB, "System.Reflection.Emit.ModuleBuilder", MODULEB_8) +ICALL(MODULEB_8, "RegisterToken", ves_icall_ModuleBuilder_RegisterToken) ICALL(MODULEB_1, "WriteToFile", ves_icall_ModuleBuilder_WriteToFile) ICALL(MODULEB_2, "basic_init", mono_image_module_basic_init) ICALL(MODULEB_3, "build_metadata", ves_icall_ModuleBuilder_build_metadata) @@ -510,8 +539,9 @@ ICALL(MEVIN_1, "get_event_info", ves_icall_get_event_info) ICALL_TYPE(MFIELD, "System.Reflection.MonoField", MFIELD_1) ICALL(MFIELD_1, "GetFieldOffset", ves_icall_MonoField_GetFieldOffset) ICALL(MFIELD_2, "GetParentType", ves_icall_MonoField_GetParentType) +ICALL(MFIELD_5, "GetRawConstantValue", ves_icall_MonoField_GetRawConstantValue) ICALL(MFIELD_3, "GetValueInternal", ves_icall_MonoField_GetValueInternal) -ICALL(MFIELD_4, "SetValueInternal", ves_icall_FieldInfo_SetValueInternal) +ICALL(MFIELD_4, "SetValueInternal", ves_icall_MonoField_SetValueInternal) ICALL_TYPE(MGENCM, "System.Reflection.MonoGenericCMethod", MGENCM_1) ICALL(MGENCM_1, "get_ReflectedType", ves_icall_MonoGenericMethod_get_ReflectedType) @@ -542,6 +572,7 @@ ICALL(MMETH_5, "MakeGenericMethod_impl", mono_reflection_bind_generic_method_par ICALL(MMETH_6, "get_IsGenericMethod", ves_icall_MonoMethod_get_IsGenericMethod) ICALL(MMETH_7, "get_IsGenericMethodDefinition", ves_icall_MonoMethod_get_IsGenericMethodDefinition) ICALL(MMETH_8, "get_base_definition", ves_icall_MonoMethod_get_base_definition) +ICALL(MMETH_9, "get_name", ves_icall_MonoMethod_get_name) ICALL_TYPE(MMETHI, "System.Reflection.MonoMethodInfo", MMETHI_1) ICALL(MMETHI_1, "get_method_info", ves_icall_get_method_info) @@ -634,7 +665,8 @@ ICALL_TYPE(REALP, "System.Runtime.Remoting.Proxies.RealProxy", REALP_1) ICALL(REALP_1, "InternalGetProxyType", ves_icall_Remoting_RealProxy_InternalGetProxyType) ICALL(REALP_2, "InternalGetTransparentProxy", ves_icall_Remoting_RealProxy_GetTransparentProxy) -ICALL_TYPE(REMSER, "System.Runtime.Remoting.RemotingServices", REMSER_1) +ICALL_TYPE(REMSER, "System.Runtime.Remoting.RemotingServices", REMSER_0) +ICALL(REMSER_0, "GetVirtualMethod", ves_icall_Remoting_RemotingServices_GetVirtualMethod) ICALL(REMSER_1, "InternalExecute", ves_icall_InternalExecute) ICALL(REMSER_2, "IsTransparentProxy", ves_icall_IsTransparentProxy) @@ -678,26 +710,21 @@ ICALL(SECMAN_4, "set_CheckExecutionRights", ves_icall_System_Security_SecurityMa ICALL(SECMAN_5, "set_SecurityEnabled", ves_icall_System_Security_SecurityManager_set_SecurityEnabled) ICALL_TYPE(STRING, "System.String", STRING_1) -ICALL(STRING_1, ".ctor(char*)", ves_icall_System_String_ctor_charp) -ICALL(STRING_2, ".ctor(char*,int,int)", ves_icall_System_String_ctor_charp_int_int) -ICALL(STRING_3, ".ctor(char,int)", ves_icall_System_String_ctor_char_int) -ICALL(STRING_4, ".ctor(char[])", ves_icall_System_String_ctor_chara) -ICALL(STRING_5, ".ctor(char[],int,int)", ves_icall_System_String_ctor_chara_int_int) +ICALL(STRING_1, ".ctor(char*)", ves_icall_System_String_ctor_RedirectToCreateString) +ICALL(STRING_2, ".ctor(char*,int,int)", ves_icall_System_String_ctor_RedirectToCreateString) +ICALL(STRING_3, ".ctor(char,int)", ves_icall_System_String_ctor_RedirectToCreateString) +ICALL(STRING_4, ".ctor(char[])", ves_icall_System_String_ctor_RedirectToCreateString) +ICALL(STRING_5, ".ctor(char[],int,int)", ves_icall_System_String_ctor_RedirectToCreateString) ICALL(STRING_6, ".ctor(sbyte*)", ves_icall_System_String_ctor_RedirectToCreateString) ICALL(STRING_7, ".ctor(sbyte*,int,int)", ves_icall_System_String_ctor_RedirectToCreateString) ICALL(STRING_8, ".ctor(sbyte*,int,int,System.Text.Encoding)", ves_icall_System_String_ctor_RedirectToCreateString) ICALL(STRING_9, "InternalAllocateStr", ves_icall_System_String_InternalAllocateStr) -ICALL(STRING_10, "InternalCharCopy", ves_icall_System_String_InternalCharCopy) ICALL(STRING_11, "InternalCopyTo", ves_icall_System_String_InternalCopyTo) -ICALL(STRING_12, "InternalIndexOfAny", ves_icall_System_String_InternalIndexOfAny) -ICALL(STRING_13, "InternalInsert", ves_icall_System_String_InternalInsert) ICALL(STRING_14, "InternalIntern", ves_icall_System_String_InternalIntern) ICALL(STRING_15, "InternalIsInterned", ves_icall_System_String_InternalIsInterned) ICALL(STRING_16, "InternalJoin", ves_icall_System_String_InternalJoin) ICALL(STRING_17, "InternalLastIndexOfAny", ves_icall_System_String_InternalLastIndexOfAny) ICALL(STRING_18, "InternalPad", ves_icall_System_String_InternalPad) -ICALL(STRING_19, "InternalRemove", ves_icall_System_String_InternalRemove) -ICALL(STRING_20, "InternalReplace(char,char)", ves_icall_System_String_InternalReplace_Char) ICALL(STRING_21, "InternalReplace(string,string,System.Globalization.CompareInfo)", ves_icall_System_String_InternalReplace_Str_Comp) ICALL(STRING_22, "InternalSplit", ves_icall_System_String_InternalSplit) ICALL(STRING_23, "InternalStrcpy(string,int,char[])", ves_icall_System_String_InternalStrcpy_Chars) @@ -786,6 +813,7 @@ ICALL(THREAD_22, "Sleep_internal", ves_icall_System_Threading_Thread_Sleep_inter ICALL(THREAD_54, "SpinWait_internal", ves_icall_System_Threading_Thread_SpinWait_internal) ICALL(THREAD_23, "Suspend_internal", ves_icall_System_Threading_Thread_Suspend) ICALL(THREAD_24, "Thread_free_internal", ves_icall_System_Threading_Thread_Thread_free_internal) +ICALL(THREAD_24a, "Thread_init", ves_icall_System_Threading_Thread_Thread_init) ICALL(THREAD_25, "Thread_internal", ves_icall_System_Threading_Thread_Thread_internal) ICALL(THREAD_26, "VolatileRead(byte&)", ves_icall_System_Threading_Thread_VolatileRead1) ICALL(THREAD_27, "VolatileRead(double&)", ves_icall_System_Threading_Thread_VolatileRead8)