X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fstring-icalls.c;h=9d7a1c503a035a113fdb6f4fffc8474873dcf5e2;hb=86ea70695089e3a2abd48259da93fd55a09b15d0;hp=71bd1f7ebe0f84a29f8570e354c3669b487aec17;hpb=1fabd87b02f8d2e359150ed7a9e92613e60383bc;p=mono.git

diff --git a/mono/metadata/string-icalls.c b/mono/metadata/string-icalls.c
index 71bd1f7ebe0..9d7a1c503a0 100644
--- a/mono/metadata/string-icalls.c
+++ b/mono/metadata/string-icalls.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
+#include "mono/utils/mono-membar.h"
 #include <mono/metadata/string-icalls.h>
 #include <mono/metadata/class-internals.h>
 #include <mono/metadata/appdomain.h>
@@ -26,217 +27,6 @@
 static gboolean
 string_icall_is_in_array (MonoArray *chars, gint32 arraylength, gunichar2 chr);
 
-static MonoString*
-empty_string (MonoDomain *domain)
-{
-	MonoVTable *vtable = mono_class_vtable (domain, mono_defaults.string_class);
-	MonoObject *o;
-	static MonoClassField *empty_field = NULL;
-
-	if (!empty_field) {
-		MonoClassField *field;
-		gpointer iter;
-
-		iter = NULL;
-		while ((field = mono_class_get_fields (mono_defaults.string_class, &iter))) {
-			if (!strcmp (field->name, "Empty"))
-				break;
-		}
-
-		g_assert (field);
-		empty_field = field;
-	}
-
-	mono_field_static_get_value (vtable, empty_field, &o);
-	g_assert (o);
-	return (MonoString*)o;
-}
-
-MonoString *
-ves_icall_System_String_ctor_charp (gpointer dummy, gunichar2 *value)
-{
-	gint32 i, length;
-	MonoDomain *domain;
-
-	MONO_ARCH_SAVE_REGS;
-
-	domain = mono_domain_get ();
-
-	if (value == NULL)
-		return empty_string (domain);
-
-	for (i = 0; *(value + i) != '\0'; i++);
-	length = i;
-
-	return mono_string_new_utf16 (domain, value, length);
-}
-
-MonoString *
-ves_icall_System_String_ctor_char_int (gpointer dummy, gunichar2 value, gint32 count)
-{
-	MonoDomain *domain;
-	MonoString *res;
-	gunichar2 *chars;
-	gint32 i;
-
-	MONO_ARCH_SAVE_REGS;
-
-	if (count < 0)
-		mono_raise_exception (mono_get_exception_argument_out_of_range ("count"));
-
-	domain = mono_domain_get ();
-	res = mono_string_new_size (domain, count);
-
-	chars = mono_string_chars (res);
-	for (i = 0; i < count; i++)
-		chars [i] = value;
-	
-	return res;
-}
-
-MonoString *
-ves_icall_System_String_ctor_charp_int_int (gpointer dummy, gunichar2 *value, gint32 sindex, gint32 length)
-{
-	gunichar2 *begin;
-	MonoDomain * domain;
-	
-	MONO_ARCH_SAVE_REGS;
-
-	domain = mono_domain_get ();
-
-	if ((value == NULL) && (length != 0))
-		mono_raise_exception (mono_get_exception_argument_out_of_range ("Out of range"));
-
-	if ((sindex < 0) || (length < 0))
-		mono_raise_exception (mono_get_exception_argument_out_of_range ("Out of range"));
-	
-	if (length == 0)
-		return empty_string (domain);
-	
-	begin = (gunichar2 *) (value + sindex);
-
-	return mono_string_new_utf16 (domain, begin, length);
-}
-
-MonoString *
-ves_icall_System_String_ctor_sbytep (gpointer dummy, gint8 *value)
-{
-	MonoDomain *domain;
-	
-	MONO_ARCH_SAVE_REGS;
-
-	domain = mono_domain_get ();
-
-	if (NULL == value)
-		return empty_string (domain);
-
-	return mono_string_new (domain, (const char *) value);
-}
-
-MonoString *
-ves_icall_System_String_ctor_sbytep_int_int (gpointer dummy, gint8 *value, gint32 sindex, gint32 length)
-{
-	guchar *begin;
-	MonoDomain *domain;
-	MonoString *res;
-	gunichar2 *chars;
-	int i;
-	
-	MONO_ARCH_SAVE_REGS;
-
-	domain = mono_domain_get ();
-
-	if ((value == NULL) && (length != 0))
-		mono_raise_exception (mono_get_exception_argument_out_of_range ("Out of range"));
-
-	if ((sindex < 0) || (length < 0))
-		mono_raise_exception (mono_get_exception_argument_out_of_range ("Out of range"));
-
-	begin = (guchar *) (value + sindex);
-	res = mono_string_new_size (domain, length);
-	chars = mono_string_chars (res);
-	for (i = 0; i < length; ++i)
-		chars [i] = begin [i];
-
-	return res;
-}
-
-MonoString *
-ves_icall_System_String_ctor_chara (gpointer dummy, MonoArray *value)
-{
-	MonoDomain *domain;
-
-	MONO_ARCH_SAVE_REGS;
-
-	domain = mono_domain_get ();
-
-	if (value == NULL)
-		return mono_string_new_utf16 (domain, NULL, 0);
-	else
-		return mono_string_new_utf16 (domain, (gunichar2 *) mono_array_addr(value, gunichar2, 0),  value->max_length);
-}
-
-MonoString *
-ves_icall_System_String_ctor_chara_int_int (gpointer dummy, MonoArray *value, 
-					 gint32 sindex, gint32 length)
-{
-	MonoDomain *domain;
-
-	MONO_ARCH_SAVE_REGS;
-
-	if (value == NULL)
-		mono_raise_exception (mono_get_exception_argument_null ("value"));
-	if (sindex < 0)
-		mono_raise_exception (mono_get_exception_argument_out_of_range ("startIndex"));		
-	if (length < 0)
-		mono_raise_exception (mono_get_exception_argument_out_of_range ("length"));
-	if (sindex + length > mono_array_length (value))
-		mono_raise_exception (mono_get_exception_argument_out_of_range ("Out of range"));
-
-	domain = mono_domain_get ();
-	
-	return mono_string_new_utf16 (domain, (gunichar2 *) mono_array_addr(value, gunichar2, sindex), length);
-}
-
-MonoString *
-ves_icall_System_String_ctor_encoding (gpointer dummy, gint8 *value, gint32 sindex, 
-				       gint32 length, MonoObject *enc)
-{
-	MonoArray *arr;
-	MonoString *s;
-	MonoObject *exc;
-	MonoDomain *domain = mono_domain_get ();
-	MonoMethod *get_string;
-	gpointer args [1];
-	MonoClass *klass;
-
-	MONO_ARCH_SAVE_REGS;
-
-	if ((value == NULL) || (length == 0))
-		return mono_string_new_size (mono_domain_get (), 0);
-	if (enc == NULL)
-		mono_raise_exception (mono_get_exception_argument_null ("enc"));
-	if (sindex < 0)
-		mono_raise_exception (mono_get_exception_argument_out_of_range ("startIndex"));		
-	if (length < 0)
-		mono_raise_exception (mono_get_exception_argument_out_of_range ("length"));
-
-	arr = mono_array_new (domain, mono_defaults.byte_class, length);
-	memcpy (mono_array_addr (arr, guint8, 0), value + sindex, length);
-
-	/* Find the System.Text.Encoding class */
-	for (klass = enc->vtable->klass; klass->parent->parent != NULL; klass = klass->parent)
-		;
-	
-	get_string = mono_class_get_method_from_name (klass, "GetString", 1);
-	args [0] = arr;
-	s = (MonoString*)mono_runtime_invoke (get_string, enc, args, &exc);
-	if (!s || exc)
-		mono_raise_exception (mono_get_exception_argument ("", "Unable to decode the array into a valid string."));
-
-	return s;
-}
-
 /* This function is redirected to String.CreateString ()
    by mono_marshal_get_native_wrapper () */
 void
@@ -297,82 +87,6 @@ ves_icall_System_String_InternalJoin (MonoString *separator, MonoArray * value,
 	return ret;
 }
 
-MonoString * 
-ves_icall_System_String_InternalInsert (MonoString *me, gint32 sindex, MonoString *value)
-{
-	MonoString * ret;
-	gunichar2 *src;
-	gunichar2 *insertsrc;
-	gunichar2 *dest;
-	gint32 srclen;
-	gint32 insertlen;
-
-	MONO_ARCH_SAVE_REGS;
-
-	src = mono_string_chars(me);
-	srclen = mono_string_length(me);
-
-	insertsrc = mono_string_chars(value);
-	insertlen = mono_string_length(value);
-
-	ret = mono_string_new_size( mono_domain_get (), srclen + insertlen);
-	dest = mono_string_chars(ret);
-
-	memcpy(dest, src, sindex * sizeof(gunichar2));
-	memcpy(dest + sindex, insertsrc, insertlen * sizeof(gunichar2));
-	memcpy(dest + sindex + insertlen, src + sindex, (srclen - sindex) * sizeof(gunichar2));
-
-	return ret;
-}
-
-MonoString * 
-ves_icall_System_String_InternalReplace_Char (MonoString *me, gunichar2 oldChar, gunichar2 newChar)
-{
-	MonoString *ret;
-	gunichar2 *src;
-	gunichar2 *dest;
-	gint32 i, srclen;
-
-	MONO_ARCH_SAVE_REGS;
-
-	src = mono_string_chars(me);
-	srclen = mono_string_length(me);
-
-	ret = mono_string_new_size( mono_domain_get (), srclen);
-	dest = mono_string_chars(ret);
-
-	for (i = 0; i != srclen; i++) {
-		if (src[i] == oldChar)
-			dest[i] = newChar;
-		else
-			dest[i] = src[i];
-	}
-
-	return ret;
-}
-
-MonoString * 
-ves_icall_System_String_InternalRemove (MonoString *me, gint32 sindex, gint32 count)
-{
-	MonoString * ret;
-	gint32 srclen;
-	gunichar2 *dest;
-	gunichar2 *src;
-
-	MONO_ARCH_SAVE_REGS;
-
-	srclen = mono_string_length(me);
-	ret = mono_string_new_size( mono_domain_get (), srclen - count);
-
-	src = mono_string_chars(me);
-	dest = mono_string_chars(ret);
-
-	memcpy(dest, src, sindex * sizeof(gunichar2));
-	memcpy(dest + sindex, src + sindex + count, (srclen - count - sindex) * sizeof(gunichar2));
-
-	return ret;
-}
-
 void
 ves_icall_System_String_InternalCopyTo (MonoString *me, gint32 sindex, MonoArray *dest, gint32 dindex, gint32 count)
 {
@@ -384,74 +98,156 @@ ves_icall_System_String_InternalCopyTo (MonoString *me, gint32 sindex, MonoArray
 	memcpy(destptr, src + sindex, sizeof(gunichar2) * count);
 }
 
+/* System.StringSplitOptions */
+typedef enum {
+	STRINGSPLITOPTIONS_NONE = 0,
+	STRINGSPLITOPTIONS_REMOVE_EMPTY_ENTRIES = 1
+} StringSplitOptions;
+
 MonoArray * 
-ves_icall_System_String_InternalSplit (MonoString *me, MonoArray *separator, gint32 count)
+ves_icall_System_String_InternalSplit (MonoString *me, MonoArray *separator, gint32 count, gint32 options)
 {
+	static MonoClass *String_array;
 	MonoString * tmpstr;
 	MonoArray * retarr;
 	gunichar2 *src;
 	gint32 arrsize, srcsize, splitsize;
 	gint32 i, lastpos, arrpos;
 	gint32 tmpstrsize;
+	gint32 remempty;
+	gint32 flag;
 	gunichar2 *tmpstrptr;
 
-	gunichar2 cmpchar;
-
-	MONO_ARCH_SAVE_REGS;
+	remempty = options & STRINGSPLITOPTIONS_REMOVE_EMPTY_ENTRIES;
+	src = mono_string_chars (me);
+	srcsize = mono_string_length (me);
+	arrsize = mono_array_length (separator);
 
-	src = mono_string_chars(me);
-	srcsize = mono_string_length(me);
-	arrsize = mono_array_length(separator);
+	if (!String_array) {
+		MonoClass *klass = mono_array_class_get (mono_get_string_class (), 1);
+		mono_memory_barrier ();
+		String_array = klass;
+	}
 
-	cmpchar = mono_array_get(separator, gunichar2, 0);
+	splitsize = 1;
+	/* Count the number of elements we will return. Note that this operation
+	 * guarantees that we will return exactly splitsize elements, and we will
+	 * have enough data to fill each. This allows us to skip some checks later on.
+	 */
+	if (remempty == 0) {
+		for (i = 0; i != srcsize && splitsize < count; i++) {
+			if (string_icall_is_in_array (separator, arrsize, src [i]))
+				splitsize++;
+		}
+	} else if (count > 1) {
+		/* Require pattern "Nondelim + Delim + Nondelim" to increment counter.
+		 * Lastpos != 0 means first nondelim found.
+		 * Flag = 0 means last char was delim.
+		 * Efficient, though perhaps confusing.
+		 */
+		lastpos = 0;
+		flag = 0;
+		for (i = 0; i != srcsize && splitsize < count; i++) {
+			if (string_icall_is_in_array (separator, arrsize, src [i])) {
+				flag = 0;
+			} else if (flag == 0) {
+				if (lastpos == 1)
+					splitsize++;
+				flag = 1;
+				lastpos = 1;
+			}
+		}
 
-	splitsize = 0;
-	for (i = 0; i != srcsize && splitsize < count; i++) {
-		if (string_icall_is_in_array(separator, arrsize, src[i]))
-			splitsize++;
+		/* Nothing but separators */
+		if (lastpos == 0) {
+			retarr = mono_array_new_specific (mono_class_vtable (mono_domain_get (), String_array), 0);
+			return retarr;
+		}
 	}
 
-	lastpos = 0;
-	arrpos = 0;
-
 	/* if no split chars found return the string */
-	if (splitsize == 0) {
-		retarr = mono_array_new(mono_domain_get(), mono_get_string_class (), 1);
-		mono_array_setref (retarr, 0, me);
-
+	if (splitsize == 1) {
+		if (remempty == 0 || count == 1) {
+			/* Copy the whole string */
+			retarr = mono_array_new_specific (mono_class_vtable (mono_domain_get (), String_array), 1);
+			mono_array_setref (retarr, 0, me);
+		} else {
+			/* otherwise we have to filter out leading & trailing delims */
+
+			/* find first non-delim char */
+			for (; srcsize != 0; srcsize--, src++) {
+				if (!string_icall_is_in_array (separator, arrsize, src [0]))
+					break;
+			}
+			/* find last non-delim char */
+			for (; srcsize != 0; srcsize--) {
+				if (!string_icall_is_in_array (separator, arrsize, src [srcsize - 1]))
+					break;
+			}
+			tmpstr = mono_string_new_size (mono_domain_get (), srcsize);
+			tmpstrptr = mono_string_chars (tmpstr);
+
+			memcpy (tmpstrptr, src, srcsize * sizeof (gunichar2));
+			retarr = mono_array_new_specific (mono_class_vtable (mono_domain_get (), String_array), 1);
+			mono_array_setref (retarr, 0, tmpstr);
+		}
 		return retarr;
 	}
 
-	if (splitsize != count)
-		splitsize++;
+	lastpos = 0;
+	arrpos = 0;
+	
+	retarr = mono_array_new_specific (mono_class_vtable (mono_domain_get (), String_array), splitsize);
 
-	retarr = mono_array_new(mono_domain_get(), mono_get_string_class (), splitsize);
-	for (i = 0; i != srcsize && arrpos != count; i++) {
-		if (string_icall_is_in_array(separator, arrsize, src[i])) {
-			if (arrpos == count - 1)
-				tmpstrsize = srcsize - lastpos;
-			else
+	for (i = 0; i != srcsize && arrpos != splitsize; i++) {
+		if (string_icall_is_in_array (separator, arrsize, src [i])) {
+			
+			if (lastpos != i || remempty == 0) {
 				tmpstrsize = i - lastpos;
-
-			tmpstr = mono_string_new_size( mono_domain_get (), tmpstrsize);
-			tmpstrptr = mono_string_chars(tmpstr);
-
-			memcpy(tmpstrptr, src + lastpos, tmpstrsize * sizeof(gunichar2));
-			mono_array_setref (retarr, arrpos, tmpstr);
-			arrpos++;
+				tmpstr = mono_string_new_size (mono_domain_get (), tmpstrsize);
+				tmpstrptr = mono_string_chars (tmpstr);
+
+				memcpy (tmpstrptr, src + lastpos, tmpstrsize * sizeof (gunichar2));
+				mono_array_setref (retarr, arrpos, tmpstr);
+				arrpos++;
+
+				if (arrpos == splitsize - 1) {
+					/* Shortcut the last array element */
+
+					lastpos = i + 1;
+					if (remempty != 0) {
+						/* Search for non-delim starting char (guaranteed to find one) Note that loop
+						 * condition is only there for safety. It will never actually terminate the loop. */
+						for (; lastpos != srcsize ; lastpos++) {
+							if (!string_icall_is_in_array (separator, arrsize, src [lastpos])) 
+								break;
+						}
+						if (count > splitsize) {
+							/* Since we have fewer results than our limit, we must remove
+							 * trailing delimiters as well. 
+							 */
+							for (; srcsize != lastpos + 1 ; srcsize--) {
+								if (!string_icall_is_in_array (separator, arrsize, src [srcsize - 1])) 
+									break;
+							}
+						}
+					}
+
+					tmpstrsize = srcsize - lastpos;
+					tmpstr = mono_string_new_size (mono_domain_get (), tmpstrsize);
+					tmpstrptr = mono_string_chars (tmpstr);
+
+					memcpy (tmpstrptr, src + lastpos, tmpstrsize * sizeof (gunichar2));
+					mono_array_setref (retarr, arrpos, tmpstr);
+
+					/* Loop will ALWAYS end here. Test criteria in the FOR loop is technically unnecessary. */
+					break;
+				}
+			}
 			lastpos = i + 1;
 		}
 	}
 
-	if (arrpos < count) {
-		tmpstrsize = srcsize - lastpos;
-		tmpstr = mono_string_new_size( mono_domain_get (), tmpstrsize);
-		tmpstrptr = mono_string_chars(tmpstr);
-
-		memcpy(tmpstrptr, src + lastpos, tmpstrsize * sizeof(gunichar2));
-		mono_array_setref (retarr, arrpos, tmpstr);
-	}
-
 	return retarr;
 }
 
@@ -517,68 +313,6 @@ ves_icall_System_String_InternalTrim (MonoString *me, MonoArray *chars, gint32 t
 	return ret;
 }
 
-gint32 
-ves_icall_System_String_InternalIndexOfAny (MonoString *me, MonoArray *arr, gint32 sindex, gint32 count)
-{
-	gint32 pos;
-	gint32 loop;
-	gint32 arraysize;
-	gunichar2 *src;
-
-	MONO_ARCH_SAVE_REGS;
-
-	arraysize = mono_array_length(arr);
-	src = mono_string_chars(me);
-
-	for (pos = sindex; pos != count + sindex; pos++) {
-		for (loop = 0; loop != arraysize; loop++)
-			if ( src [pos] == mono_array_get(arr, gunichar2, loop) )
-				return pos;
-	}
-
-	return -1;
-}
-
-gint32 
-ves_icall_System_String_InternalLastIndexOf_Char (MonoString *me, gunichar2 value, gint32 sindex, gint32 count)
-{
-	gint32 pos;
-	gunichar2 *src;
-
-	MONO_ARCH_SAVE_REGS;
-
-	src = mono_string_chars(me);
-	for (pos = sindex; pos > sindex - count; pos--) {
-		if (src [pos] == value)
-			return pos;
-	}
-
-	return -1;
-}
-
-gint32 
-ves_icall_System_String_InternalLastIndexOf_Str (MonoString *me, MonoString *value, gint32 sindex, gint32 count)
-{
-	gint32 lencmpstr;
-	gint32 pos;
-	gunichar2 *src;
-	gunichar2 *cmpstr;
-
-	MONO_ARCH_SAVE_REGS;
-
-	lencmpstr = mono_string_length(value);
-
-	src = mono_string_chars(me);
-	cmpstr = mono_string_chars(value);
-
-	for (pos = sindex - lencmpstr + 1; pos > sindex - count; pos--) {
-		if (0 == memcmp(src + pos, cmpstr, lencmpstr * sizeof(gunichar2)))
-			return pos;
-	}
-
-	return -1;
-}
-
 gint32 
 ves_icall_System_String_InternalLastIndexOfAny (MonoString *me, MonoArray *anyOf, gint32 sindex, gint32 count)
 {
@@ -726,10 +460,3 @@ ves_icall_System_String_get_Chars (MonoString *me, gint32 idx)
 	return mono_string_chars(me)[idx];
 }
 
-void
-ves_icall_System_String_InternalCharCopy (gunichar2 *src, gunichar2 *dest, gint32 count)
-{
-	MONO_ARCH_SAVE_REGS;
-
-	memcpy (dest, src, sizeof (gunichar2) * count);
-}