-/* vm/string.c - java.lang.String related functions
+/* src/vm/string.c - java.lang.String related functions
- Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
- R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
- C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
- Institut f. Computersprachen - TU Wien
+ Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
+ C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+ E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+ J. Wenninger, Institut f. Computersprachen - TU Wien
This file is part of CACAO.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
- Contact: cacao@complang.tuwien.ac.at
-
- Authors: Reinhard Grafl
- Roman Obermaisser
- Andreas Krall
-
- Changes: Christian Thalinger
-
- $Id: string.c 1926 2005-02-10 10:47:29Z twisti $
+ $Id: string.c 7522 2007-03-14 21:54:49Z twisti $
*/
#include "config.h"
-#include "types.h"
+
+#include <assert.h>
+
+#include "vm/types.h"
#include "vm/global.h"
#include "mm/memory.h"
+
+#include "native/jni.h"
+
#include "native/include/java_lang_String.h"
+
+#if defined(ENABLE_THREADS)
+# include "threads/native/lock.h"
+#else
+# include "threads/none/lock.h"
+#endif
+
+#include "vm/builtin.h"
#include "vm/exceptions.h"
-#include "vm/loader.h"
-#include "vm/options.h"
#include "vm/stringlocal.h"
-#include "vm/utf8.h"
+
+#include "vmcore/options.h"
+#include "vmcore/statistics.h"
+#include "vmcore/utf8.h"
+
+
+/* global variables ***********************************************************/
+
+/* hashsize must be power of 2 */
+
+#define HASHTABLE_STRING_SIZE 2048 /* initial size of javastring-hash */
+
+hashtable hashtable_string; /* hashtable for javastrings */
+
+#if defined(ENABLE_THREADS)
+static java_objectheader *lock_hashtable_string;
+#endif
+
+
+/* string_init *****************************************************************
+
+ Initialize the string hashtable lock.
+
+*******************************************************************************/
+
+bool string_init(void)
+{
+ /* create string (javastring) hashtable */
+
+ hashtable_create(&hashtable_string, HASHTABLE_STRING_SIZE);
+
+#if defined(ENABLE_THREADS)
+ /* create string hashtable lock object */
+
+ lock_hashtable_string = NEW(java_objectheader);
+
+ lock_init_object_lock(lock_hashtable_string);
+#endif
+
+ /* everything's ok */
+
+ return true;
+}
/* stringtable_update **********************************************************
literalstring *s; /* hashtable entry */
int i;
- for (i = 0; i < string_hash.size; i++) {
- s = string_hash.ptr[i];
+ for (i = 0; i < hashtable_string.size; i++) {
+ s = hashtable_string.ptr[i];
if (s) {
while (s) {
js = (java_lang_String *) s->string;
- if (!js || !js->value)
+ if (!js || !js->value) {
/* error in hashtable found */
- panic("invalid literalstring in hashtable");
+ log_text("invalid literalstring in hashtable");
+ assert(0);
+ }
a = js->value;
}
+/* javastring_new_from_utf_buffer **********************************************
+
+ Create a new object of type java/lang/String with the text from
+ the specified utf8 buffer.
+
+ IN:
+ buffer.......points to first char in the buffer
+ blength......number of bytes to read from the buffer
+
+ RETURN VALUE:
+ the java.lang.String object, or
+ NULL if an exception has been thrown
+
+*******************************************************************************/
+
+java_objectheader *javastring_new_from_utf_buffer(const char *buffer, u4 blength)
+{
+ const char *utf_ptr; /* current utf character in utf string */
+ u4 utflength; /* length of utf-string if uncompressed */
+ java_objectheader *o;
+ java_lang_String *s; /* result-string */
+ java_chararray *a;
+ u4 i;
+
+ assert(buffer);
+
+ utflength = utf_get_number_of_u2s_for_buffer(buffer,blength);
+
+ o = builtin_new(class_java_lang_String);
+ a = builtin_newarray_char(utflength);
+
+ /* javastring or character-array could not be created */
+
+ if ((o == NULL) || (a == NULL))
+ return NULL;
+
+ /* decompress utf-string */
+
+ utf_ptr = buffer;
+
+ for (i = 0; i < utflength; i++)
+ a->data[i] = utf_nextu2((char **) &utf_ptr);
+
+ /* set fields of the javastring-object */
+
+ s = (java_lang_String *) o;
+
+ s->value = a;
+ s->offset = 0;
+ s->count = utflength;
+
+ return o;
+}
+
+
+/* javastring_safe_new_from_utf8 ***********************************************
+
+ Create a new object of type java/lang/String with the text from
+ the specified UTF-8 string. This function is safe for invalid UTF-8.
+ (Invalid characters will be replaced by U+fffd.)
+
+ IN:
+ text.........the UTF-8 string, zero-terminated.
+
+ RETURN VALUE:
+ the java.lang.String object, or
+ NULL if an exception has been thrown
+
+*******************************************************************************/
+
+java_objectheader *javastring_safe_new_from_utf8(const char *text)
+{
+ java_objectheader *o;
+ java_chararray *a;
+ java_lang_String *s;
+ s4 nbytes;
+ s4 len;
+
+ assert(text);
+
+ /* Get number of bytes. We need this to completely emulate the messy */
+ /* behaviour of the RI. :( */
+
+ nbytes = strlen(text);
+
+ /* calculate number of Java characters */
+
+ len = utf8_safe_number_of_u2s(text, nbytes);
+
+ /* allocate the String object and the char array */
+
+ o = builtin_new(class_java_lang_String);
+ a = builtin_newarray_char(len);
+
+ /* javastring or character-array could not be created? */
+
+ if ((o == NULL) || (a == NULL))
+ return NULL;
+
+ /* decompress UTF-8 string */
+
+ utf8_safe_convert_to_u2s(text, nbytes, a->data);
+
+ /* set fields of the String object */
+
+ s = (java_lang_String *) o;
+
+ s->value = a;
+ s->offset = 0;
+ s->count = len;
+
+ return o;
+}
+
+
+/* javastring_new_from_utf_string **********************************************
+
+ Create a new object of type java/lang/String with the text from
+ the specified zero-terminated utf8 string.
+
+ IN:
+ buffer.......points to first char in the buffer
+ blength......number of bytes to read from the buffer
+
+ RETURN VALUE:
+ the java.lang.String object, or
+ NULL if an exception has been thrown
+
+*******************************************************************************/
+
+java_objectheader *javastring_new_from_utf_string(const char *utfstr)
+{
+ assert(utfstr);
+
+ return javastring_new_from_utf_buffer(utfstr, strlen(utfstr));
+}
+
+
/* javastring_new **************************************************************
creates a new object of type java/lang/String with the text of
*******************************************************************************/
-java_lang_String *javastring_new(utf *u)
+java_objectheader *javastring_new(utf *u)
{
char *utf_ptr; /* current utf character in utf string */
u4 utflength; /* length of utf-string if uncompressed */
- java_lang_String *s; /* result-string */
- java_chararray *a;
+ java_objectheader *o;
+ java_chararray *a;
+ java_lang_String *s;
s4 i;
- if (!u) {
- *exceptionptr = new_nullpointerexception();
+ if (u == NULL) {
+ exceptions_throw_nullpointerexception();
return NULL;
}
utf_ptr = u->text;
- utflength = utf_strlen(u);
+ utflength = utf_get_number_of_u2s(u);
- s = (java_lang_String *) builtin_new(class_java_lang_String);
+ o = builtin_new(class_java_lang_String);
a = builtin_newarray_char(utflength);
/* javastring or character-array could not be created */
- if (!a || !s)
+
+ if ((o == NULL) || (a == NULL))
return NULL;
/* decompress utf-string */
+
for (i = 0; i < utflength; i++)
a->data[i] = utf_nextu2(&utf_ptr);
/* set fields of the javastring-object */
+
+ s = (java_lang_String *) o;
+
s->value = a;
s->offset = 0;
s->count = utflength;
- return s;
+ return o;
}
-/* javastring_new_char *********************************************************
+/* javastring_new_slash_to_dot *************************************************
- creates a new java/lang/String object which contains the convertet
- C-string passed via text.
+ creates a new object of type java/lang/String with the text of
+ the specified utf8-string with slashes changed to dots
- return: the object pointer or NULL if memory is exhausted.
+ return: pointer to the string or NULL if memory is exhausted.
*******************************************************************************/
-java_lang_String *javastring_new_char(const char *text)
+java_objectheader *javastring_new_slash_to_dot(utf *u)
+{
+ char *utf_ptr; /* current utf character in utf string */
+ u4 utflength; /* length of utf-string if uncompressed */
+ java_objectheader *o;
+ java_chararray *a;
+ java_lang_String *s;
+ s4 i;
+ u2 ch;
+
+ if (u == NULL) {
+ exceptions_throw_nullpointerexception();
+ return NULL;
+ }
+
+ utf_ptr = u->text;
+ utflength = utf_get_number_of_u2s(u);
+
+ o = builtin_new(class_java_lang_String);
+ a = builtin_newarray_char(utflength);
+
+ /* javastring or character-array could not be created */
+ if ((o == NULL) || (a == NULL))
+ return NULL;
+
+ /* decompress utf-string */
+
+ for (i = 0; i < utflength; i++) {
+ ch = utf_nextu2(&utf_ptr);
+ if (ch == '/')
+ ch = '.';
+ a->data[i] = ch;
+ }
+
+ /* set fields of the javastring-object */
+
+ s = (java_lang_String *) o;
+
+ s->value = a;
+ s->offset = 0;
+ s->count = utflength;
+
+ return o;
+}
+
+
+/* javastring_new_from_ascii ***************************************************
+
+ creates a new java/lang/String object which contains the given ASCII
+ C-string converted to UTF-16.
+
+ IN:
+ text.........string of ASCII characters
+
+ RETURN VALUE:
+ the java.lang.String object, or
+ NULL if an exception has been thrown.
+
+*******************************************************************************/
+
+java_objectheader *javastring_new_from_ascii(const char *text)
{
s4 i;
s4 len; /* length of the string */
- java_lang_String *s; /* result-string */
- java_chararray *a;
+ java_objectheader *o;
+ java_lang_String *s;
+ java_chararray *a;
- if (!text) {
- *exceptionptr = new_nullpointerexception();
+ if (text == NULL) {
+ exceptions_throw_nullpointerexception();
return NULL;
}
len = strlen(text);
- s = (java_lang_String *) builtin_new(class_java_lang_String);
+ o = builtin_new(class_java_lang_String);
a = builtin_newarray_char(len);
/* javastring or character-array could not be created */
- if (!a || !s)
+
+ if ((o == NULL) || (a == NULL))
return NULL;
/* copy text */
+
for (i = 0; i < len; i++)
a->data[i] = text[i];
/* set fields of the javastring-object */
+
+ s = (java_lang_String *) o;
+
s->value = a;
s->offset = 0;
s->count = len;
- return s;
+ return o;
}
*******************************************************************************/
-utf *javastring_toutf(java_lang_String *string, bool isclassname)
+utf *javastring_toutf(java_objectheader *string, bool isclassname)
{
- java_lang_String *str = (java_lang_String *) string;
+ java_lang_String *s;
+
+ s = (java_lang_String *) string;
- return utf_new_u2(str->value->data + str->offset, str->count, isclassname);
+ if (s == NULL)
+ return utf_null;
+
+ return utf_new_u2(s->value->data + s->offset, s->count, isclassname);
}
java_objectheader *literalstring_u2(java_chararray *a, u4 length, u4 offset,
bool copymode)
{
- literalstring *s; /* hashtable element */
- java_lang_String *js; /* u2-array wrapped in javastring */
- java_chararray *stringdata; /* copy of u2-array */
- u4 key;
- u4 slot;
- u2 i;
+ literalstring *s; /* hashtable element */
+ java_lang_String *js; /* u2-array wrapped in javastring */
+ java_chararray *stringdata; /* copy of u2-array */
+ u4 key;
+ u4 slot;
+ u2 i;
+
+ LOCK_MONITOR_ENTER(lock_hashtable_string);
/* find location in hashtable */
+
key = unicode_hashkey(a->data + offset, length);
- slot = key & (string_hash.size - 1);
- s = string_hash.ptr[slot];
+ slot = key & (hashtable_string.size - 1);
+ s = hashtable_string.ptr[slot];
while (s) {
js = (java_lang_String *) s->string;
if (length == js->count) {
/* compare text */
- for (i = 0; i < length; i++) {
+
+ for (i = 0; i < length; i++)
if (a->data[offset + i] != js->value->data[i])
goto nomatch;
- }
/* string already in hashtable, free memory */
+
if (!copymode)
mem_free(a, sizeof(java_chararray) + sizeof(u2) * (length - 1) + 10);
+ LOCK_MONITOR_EXIT(lock_hashtable_string);
+
return (java_objectheader *) js;
}
}
/* location in hashtable found, complete arrayheader */
- stringdata->header.objheader.vftbl = primitivetype_table[ARRAYTYPE_CHAR].arrayvftbl;
+
+ stringdata->header.objheader.vftbl =
+ primitivetype_table[ARRAYTYPE_CHAR].arrayvftbl;
stringdata->header.size = length;
+ assert(class_java_lang_String);
+ assert(class_java_lang_String->state & CLASS_LOADED);
+
/* if we use eager loading, we have to check loaded String class */
- if (opt_eager) {
- if (!class_load(class_java_lang_String))
- return NULL;
- list_addfirst(&unlinkedclasses, class_java_lang_String);
- }
+ if (opt_eager)
+ list_add_first(&unlinkedclasses, class_java_lang_String);
/* create new javastring */
+
js = NEW(java_lang_String);
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- initObjectLock(&js->header);
+
+#if defined(ENABLE_STATISTICS)
+ if (opt_stat)
+ size_string += sizeof(java_lang_String);
+#endif
+
+#if defined(ENABLE_THREADS)
+ lock_init_object_lock(&js->header);
#endif
+
js->header.vftbl = class_java_lang_String->vftbl;
js->value = stringdata;
js->offset = 0;
js->count = length;
/* create new literalstring */
+
s = NEW(literalstring);
- s->hashlink = string_hash.ptr[slot];
+
+#if defined(ENABLE_STATISTICS)
+ if (opt_stat)
+ size_string += sizeof(literalstring);
+#endif
+
+ s->hashlink = hashtable_string.ptr[slot];
s->string = (java_objectheader *) js;
- string_hash.ptr[slot] = s;
+ hashtable_string.ptr[slot] = s;
/* update number of hashtable entries */
- string_hash.entries++;
+
+ hashtable_string.entries++;
/* reorganization of hashtable */
- if (string_hash.entries > (string_hash.size * 2)) {
- /* reorganization of hashtable, average length of
- the external chains is approx. 2 */
- u4 i;
- literalstring *s;
- hashtable newhash; /* the new hashtable */
+ if (hashtable_string.entries > (hashtable_string.size * 2)) {
+ /* reorganization of hashtable, average length of the external
+ chains is approx. 2 */
+
+ u4 i;
+ literalstring *s;
+ literalstring *nexts;
+ java_lang_String *tmpjs;
+ hashtable newhash; /* the new hashtable */
/* create new hashtable, double the size */
- init_hashtable(&newhash, string_hash.size * 2);
- newhash.entries = string_hash.entries;
+
+ hashtable_create(&newhash, hashtable_string.size * 2);
+ newhash.entries = hashtable_string.entries;
/* transfer elements to new hashtable */
- for (i = 0; i < string_hash.size; i++) {
- s = string_hash.ptr[i];
+
+ for (i = 0; i < hashtable_string.size; i++) {
+ s = hashtable_string.ptr[i];
+
while (s) {
- literalstring *nexts = s->hashlink;
- js = (java_lang_String *) s->string;
- slot = unicode_hashkey(js->value->data, js->count) & (newhash.size - 1);
+ nexts = s->hashlink;
+ tmpjs = (java_lang_String *) s->string;
+ slot = unicode_hashkey(tmpjs->value->data, tmpjs->count) & (newhash.size - 1);
s->hashlink = newhash.ptr[slot];
newhash.ptr[slot] = s;
- /* follow link in external hash chain */
+ /* follow link in external hash chain */
s = nexts;
}
}
- /* dispose old table */
- MFREE(string_hash.ptr, void*, string_hash.size);
- string_hash = newhash;
+ /* dispose old table */
+
+ MFREE(hashtable_string.ptr, void*, hashtable_string.size);
+ hashtable_string = newhash;
}
+ LOCK_MONITOR_EXIT(lock_hashtable_string);
+
return (java_objectheader *) js;
}
java_objectheader *literalstring_new(utf *u)
{
- char *utf_ptr; /* pointer to current unicode character */
+ char *utf_ptr; /* pointer to current unicode character */
/* utf string */
- u4 utflength; /* length of utf-string if uncompressed */
+ u4 utflength; /* length of utf-string if uncompressed */
java_chararray *a; /* u2-array constructed from utf string */
- u4 i;
+ u4 i;
utf_ptr = u->text;
- utflength = utf_strlen(u);
+ utflength = utf_get_number_of_u2s(u);
/* allocate memory */
a = mem_alloc(sizeof(java_chararray) + sizeof(u2) * (utflength - 1) + 10);
*******************************************************************************/
-void literalstring_free(java_objectheader* sobj)
+void literalstring_free(java_objectheader* string)
{
java_lang_String *s;
java_chararray *a;
- s = (java_lang_String *) sobj;
+ s = (java_lang_String *) string;
a = s->value;
/* dispose memory of java.lang.String object */
* c-basic-offset: 4
* tab-width: 4
* End:
+ * vim:noexpandtab:sw=4:ts=4:
*/