* src/native/vm/gnu/java_lang_VMString.c

(native/vm/java_lang_String.h): Added.
(intern): Call _Jv_java_lang_String_intern.

* src/native/vm/java_lang_String.c: New file.
* src/native/vm/java_lang_String.h: Likewise.

* src/native/vm/Makefile.am (libnativevm_la_SOURCES): Added
java_lang_String.[ch].

diff --git a/src/native/vm/Makefile.am b/src/native/vm/Makefile.am
index 9eb2907095132caa0400906ad647cec0793eacd5..9c8aa4be961a6c3b212469e9a81e558bc5809419 100644 (file)
--- a/src/native/vm/Makefile.am
+++ b/src/native/vm/Makefile.am
@@ -73,6 +73,8 @@ libnativevm_la_SOURCES = \
        java_lang_Object.h \
        java_lang_Runtime.c \
        java_lang_Runtime.h \
+       java_lang_String.c \
+       java_lang_String.h \
        java_lang_Thread.c \
        java_lang_Thread.h \
        $(SUN_MISC_UNSAFE_SOURCES)

diff --git a/src/native/vm/gnu/java_lang_VMString.c b/src/native/vm/gnu/java_lang_VMString.c
index d860c2175e1680429fb006c6e48009c60446b150..cec8d0bc9839de645055b3677739b281c219b45e 100644 (file)
--- a/src/native/vm/gnu/java_lang_VMString.c
+++ b/src/native/vm/gnu/java_lang_VMString.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: java_lang_VMString.c 7910 2007-05-16 08:02:52Z twisti $
+   $Id: java_lang_VMString.c 8017 2007-06-05 23:46:59Z twisti $
 
 */
 
@@ -35,9 +35,10 @@
 #include "native/native.h"
 
 #include "native/include/java_lang_String.h"
-
 #include "native/include/java_lang_VMString.h"
 
+#include "native/vm/java_lang_String.h"
+
 #include "vm/stringlocal.h"
 
 
@@ -71,16 +72,7 @@ void _Jv_java_lang_VMString_init(void)
  */
 JNIEXPORT java_lang_String* JNICALL Java_java_lang_VMString_intern(JNIEnv *env, jclass clazz, java_lang_String *str)
 {
-       java_objectheader *o;
-
-       if (str == NULL)
-               return NULL;
-
-       /* search table so identical strings will get identical pointers */
-
-       o = literalstring_u2(str->value, str->count, str->offset, true);
-
-       return (java_lang_String *) o;
+       return _Jv_java_lang_String_intern(str);
 }
 
 

diff --git a/src/native/vm/java_lang_String.c b/src/native/vm/java_lang_String.c
new file mode 100644 (file)
index 0000000..4ce1368
--- /dev/null
+++ b/src/native/vm/java_lang_String.c
@@ -0,0 +1,72 @@
+/* src/native/vm/java_lang_String.c
+
+   Copyright (C) 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.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   $Id: java_lang_VMString.c 7910 2007-05-16 08:02:52Z twisti $
+
+*/
+
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include "native/jni.h"
+
+#include "native/include/java_lang_String.h"
+
+#include "vm/stringlocal.h"
+
+
+/*
+ * Class:     java/lang/String
+ * Method:    intern
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
+ */
+java_lang_String *_Jv_java_lang_String_intern(java_lang_String *s)
+{
+       java_objectheader *o;
+
+       if (s == NULL)
+               return NULL;
+
+       /* search table so identical strings will get identical pointers */
+
+       o = literalstring_u2(s->value, s->count, s->offset, true);
+
+       return (java_lang_String *) o;
+}
+
+
+/*
+ * These are local overrides for various environment variables in Emacs.
+ * Please do not remove this and leave it at the end of the file, where
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: c
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */

diff --git a/src/native/vm/java_lang_String.h b/src/native/vm/java_lang_String.h
new file mode 100644 (file)
index 0000000..506ce33
--- /dev/null
+++ b/src/native/vm/java_lang_String.h
@@ -0,0 +1,59 @@
+/* src/native/vm/java_lang_String.h - java/lang/String functions
+
+   Copyright (C) 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.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   $Id: java_lang_VMObject.c 6213 2006-12-18 17:36:06Z twisti $
+
+*/
+
+
+#ifndef _JV_JAVA_LANG_STRING_H
+#define _JV_JAVA_LANG_STRING_H
+
+#include "config.h"
+#include "vm/types.h"
+
+#include "native/jni.h"
+
+#include "native/include/java_lang_String.h"
+
+
+/* function prototypes ********************************************************/
+
+java_lang_String *_Jv_java_lang_String_intern(java_lang_String *s);
+
+#endif /* _JV_JAVA_LANG_STRING_H */
+
+
+/*
+ * These are local overrides for various environment variables in Emacs.
+ * Please do not remove this and leave it at the end of the file, where
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: c
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */