X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mono%2Fmetadata%2Ficall.c;h=e6adecbc3b4bad04a018bb8258467b6a96f25f05;hb=3f2b1cf8a51de3d998328cdedddc003509945339;hp=e1086920e65927e13bdf725bb97fe0bd243b491a;hpb=6bc5cec8f23d7e8d6f36bbfb25d80a8784269d2c;p=mono.git

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index e1086920e65..e6adecbc3b4 100644
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -34,7 +34,9 @@
 #include <mono/metadata/rand.h>
 #include <mono/metadata/sysmath.h>
 #include <mono/metadata/debug-symfile.h>
+#include <mono/metadata/string-icalls.h>
 #include <mono/io-layer/io-layer.h>
+
 #include "decimal.h"
 
 static MonoString *
@@ -727,12 +729,6 @@ ves_icall_get_attributes (MonoReflectionType *type)
 	return klass->flags;
 }
 
-static MonoString*
-ves_icall_MonoMethod_get_Name (MonoReflectionMethod *method)
-{
-	return mono_string_new (mono_object_domain (method), method->method->name);
-}
-
 static void
 ves_icall_get_method_info (MonoMethod *method, MonoMethodInfo *info)
 {
@@ -740,7 +736,6 @@ ves_icall_get_method_info (MonoMethod *method, MonoMethodInfo *info)
 
 	info->parent = mono_type_get_object (domain, &method->klass->byval_arg);
 	info->ret = mono_type_get_object (domain, method->signature->ret);
-	info->name = mono_string_new (domain, method->name);
 	info->attrs = method->flags;
 	info->implattrs = method->iflags;
 }
@@ -1869,6 +1864,8 @@ ves_icall_Remoting_RealProxy_GetTransparentProxy (MonoObject *this)
 	type = ((MonoReflectionType *)rp->class_to_proxy)->type;
 	klass = mono_class_from_mono_type (type);
 
+	((MonoTransparentProxy *)res)->klass = klass;
+
 	res->vtable = mono_class_proxy_vtable (domain, klass);
 
 	return res;
@@ -2064,10 +2061,32 @@ static gconstpointer icall_map [] = {
 	/*
 	 * System.String
 	 */
-	"System.String::_IsInterned", mono_string_is_interned,
-	"System.String::_Intern", mono_string_intern,
-	"System.String::InternalIndexOfAny", ves_icall_System_String_InternalIndexOfAny,
-	"System.String::GetHashCode", ves_icall_System_String_GetHashCode,
+	
+	"System.String::InternalJoin", mono_string_InternalJoin,
+	"System.String::InternalInsert", mono_string_InternalInsert,
+	"System.String::InternalReplace(char,char)", mono_string_InternalReplaceChar,
+	"System.String::InternalReplace(string,string)", mono_string_InternalReplaceStr,
+	"System.String::InternalRemove", mono_string_InternalRemove,
+	"System.String::InternalCopyTo", mono_string_InternalCopyTo,
+	"System.String::InternalSplit", mono_string_InternalSplit,
+	"System.String::InternalTrim", mono_string_InternalTrim,
+	"System.String::InternalIndexOf(char,uint,uint)", mono_string_InternalIndexOfChar,
+	"System.String::InternalIndexOf(string,uint,uint)", mono_string_InternalIndexOfStr,
+	"System.String::InternalIndexOfAny", mono_string_InternalIndexOfAny,
+	"System.String::InternalLastIndexOf(char,uint,uint)", mono_string_InternalLastIndexOfChar,
+	"System.String::InternalLastIndexOf(string,uint,uint)", mono_string_InternalLastIndexOfStr,
+	"System.String::InternalLastIndexOfAny", mono_string_InternalLastIndexOfAny,
+	"System.String::InternalPad", mono_string_InternalPad,
+	"System.String::InternalToLower", mono_string_InternalToLower,
+	"System.String::InternalToUpper", mono_string_InternalToUpper,
+	"System.String::InternalAllocateStr", mono_string_InternalAllocateStr,
+	"System.String::InternalStrcpy(string,uint,string)", mono_string_InternalStrcpyStr,
+	"System.String::InternalStrcpy(string,uint,string,uint,uint)", mono_string_InternalStrcpyStrN,
+	"System.String::InternalIntern", mono_string_intern,
+	"System.String::InternalIsInterned", mono_string_is_interned,
+	"System.String::InternalCompare(string,uint,string,uint,uint,bool)", mono_string_InternalCompareStrN,
+	"System.String::GetHashCode", mono_string_GetHashCode,
+	"System.String::get_Chars", mono_string_get_Chars,
 
 	/*
 	 * System.AppDomain
@@ -2133,7 +2152,6 @@ static gconstpointer icall_map [] = {
 	"System.Reflection.MonoFieldInfo::get_field_info", ves_icall_get_field_info,
 	"System.Reflection.MonoPropertyInfo::get_property_info", ves_icall_get_property_info,
 	"System.Reflection.MonoMethod::InternalInvoke", ves_icall_InternalInvoke,
-	"System.Reflection.MonoMethod::get_Name", ves_icall_MonoMethod_get_Name,
 	"System.Reflection.MonoCMethod::InternalInvoke", ves_icall_InternalInvoke,
 	"System.MonoCustomAttrs::GetCustomAttributes", mono_reflection_get_custom_attrs,
 	"System.Reflection.Emit.CustomAttributeBuilder::GetBlob", mono_reflection_get_custom_attrs_blob,