* src/vm/jit/stack.c (stack_analyse): Do not set argintreguse to

[cacao.git] / src / vm / stringlocal.h

diff --git a/src/vm/stringlocal.h b/src/vm/stringlocal.h
index 335fe5d71b041830aa1c3912aca7d12850476abc..ce9b5e1c4bd17e67c7f935145117a4a8f8e0f0e9 100644 (file)
--- a/src/vm/stringlocal.h
+++ b/src/vm/stringlocal.h
@@ -1,9 +1,9 @@
-/* vm/stringlocal.h - java.lang.String header
+/* src/vm/stringlocal.h - string header
 
-   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 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.
 
@@ -19,16 +19,16 @@
 
    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
+   Contact: cacao@cacaojvm.org
 
    Authors: Christian Thalinger
 
-   Changes:
+   Changes: Edwin Steiner
 
-   $Id: stringlocal.h 2593 2005-06-08 11:04:14Z twisti $
+   $Id: stringlocal.h 4876 2006-05-05 15:26:04Z edwin $
 
 */
 
@@ -39,10 +39,14 @@
 typedef struct literalstring literalstring;
 
 
+#include "config.h"
+#include "vm/types.h"
+
+#include "vm/global.h"                  /* required before java_lang_String.h */
 #include "native/include/java_lang_String.h"
-#include "vm/global.h"
+
+#include "vm/hashtable.h"
 #include "vm/utf8.h"
-#include "vm/tables.h"
 
 
 /* data structure of internal javastrings stored in global hashtable **********/
@@ -52,8 +56,9 @@ struct literalstring {
        java_objectheader *string;  
 };
 
+
 /* javastring-hashtable */
-extern hashtable string_hash;
+extern hashtable hashtable_string;
 
 
 /* global string definitions **************************************************/
@@ -84,6 +89,7 @@ extern const char *string_java_lang_NegativeArraySizeException;
 extern const char *string_java_lang_NoSuchFieldException;
 extern const char *string_java_lang_NoSuchMethodException;
 extern const char *string_java_lang_NullPointerException;
+extern const char *string_java_lang_StringIndexOutOfBoundsException;
 extern const char *string_java_lang_reflect_InvocationTargetException;
 
 
@@ -96,11 +102,13 @@ extern const char *string_java_lang_Error;
 extern const char *string_java_lang_ExceptionInInitializerError;
 extern const char *string_java_lang_IncompatibleClassChangeError;
 extern const char *string_java_lang_InternalError;
+extern const char *string_java_lang_InstantiationError;
 extern const char *string_java_lang_LinkageError;
 extern const char *string_java_lang_NoClassDefFoundError;
 extern const char *string_java_lang_NoSuchFieldError;
 extern const char *string_java_lang_NoSuchMethodError;
 extern const char *string_java_lang_OutOfMemoryError;
+extern const char *string_java_lang_UnsatisfiedLinkError;
 extern const char *string_java_lang_UnsupportedClassVersionError;
 extern const char *string_java_lang_VerifyError;
 extern const char *string_java_lang_VirtualMachineError;
@@ -108,6 +116,9 @@ extern const char *string_java_lang_VirtualMachineError;
 
 /* function prototypes ********************************************************/
 
+/* initialize string subsystem */
+bool string_init(void);
+
 void stringtable_update(void);
 
 /* creates a new object of type java/lang/String from a utf-text */
@@ -116,8 +127,12 @@ java_lang_String *javastring_new(utf *text);
 /* creates a new object of type java/lang/String from a utf-text, changes slashes to dots */
 java_lang_String *javastring_new_slash_to_dot(utf *text);
 
-/* creates a new object of type java/lang/String from a c-string */
-java_lang_String *javastring_new_char(const char *text);
+/* creates a new object of type java/lang/String from an ASCII c-string */
+java_lang_String *javastring_new_from_ascii(const char *text);
+
+/* creates a new object of type java/lang/String from UTF-8 */
+java_lang_String *javastring_new_from_utf_buffer(const char *buffer, u4 blength);
+java_lang_String *javastring_new_from_utf_string(const char *utfstr);
 
 /* make c-string from a javastring (debugging) */
 char *javastring_tochar(java_objectheader *s);
@@ -126,7 +141,7 @@ char *javastring_tochar(java_objectheader *s);
 utf *javastring_toutf(java_lang_String *string, bool isclassname);
 
 /* returns length of javastring */
-s4 javastring_strlen(java_objectheader *so);
+s4 javastring_strlen(java_lang_String *s);
 
 /* creates a new javastring with the text of the u2-array */
 java_objectheader *literalstring_u2(java_chararray *a, u4 length, u4 offset,
@@ -152,4 +167,5 @@ void literalstring_free(java_objectheader*);
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */