* Updated header: Added 2006. Changed address of FSF. Changed email

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

diff --git a/src/vm/utf8.h b/src/vm/utf8.h
index d5b648a56c23f0b90c5a28a2411807894ebd96df..81e233191d1795d76ccca75c25a1818cf0c0e0ef 100644 (file)
--- a/src/vm/utf8.h
+++ b/src/vm/utf8.h
@@ -1,9 +1,9 @@
 /* src/vm/utf.h - utf 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:
 
-   $Id: utf8.h 2158 2005-03-30 20:06:37Z twisti $
+   $Id: utf8.h 4357 2006-01-22 23:33:38Z twisti $
 
 */
 
@@ -43,8 +43,9 @@
 
 typedef struct utf utf;
 
+#include "config.h"
+#include "vm/types.h"
 
-#include "types.h"
 #include "vm/global.h"
 
 
@@ -52,10 +53,14 @@ typedef struct utf utf;
 
 struct utf {
        utf  *hashlink;                     /* link for external hash chain       */
-       int   blength;                      /* text length in bytes               */
+       s4    blength;                      /* text length in bytes               */
        char *text;                         /* pointer to text                    */
 };
 
+/* to determine the end of utf strings */
+
+#define UTF_END(u)    ((char *) u->text + u->blength)
+
 
 /* utf-symbols for pointer comparison of frequently used strings **************/
 
@@ -67,14 +72,23 @@ extern utf *utf_java_lang_Cloneable;
 extern utf *utf_java_lang_SecurityManager;
 extern utf *utf_java_lang_String;
 extern utf *utf_java_lang_System;
+extern utf *utf_java_lang_ThreadGroup;
 extern utf *utf_java_io_Serializable;
 
 extern utf *utf_java_lang_Throwable;
 extern utf *utf_java_lang_VMThrowable;
-extern utf *utf_java_lang_Exception;
 extern utf *utf_java_lang_Error;
-extern utf *utf_java_lang_OutOfMemoryError;
 extern utf *utf_java_lang_NoClassDefFoundError;
+extern utf *utf_java_lang_LinkageError;
+extern utf *utf_java_lang_NoSuchMethodError;
+extern utf *utf_java_lang_OutOfMemoryError;
+
+extern utf *utf_java_lang_Exception;
+extern utf *utf_java_lang_ClassNotFoundException;
+extern utf *utf_java_lang_IllegalArgumentException;
+extern utf *utf_java_lang_IllegalMonitorStateException;
+
+extern utf *utf_java_lang_NullPointerException;
 
 extern utf* utf_java_lang_Void;
 extern utf* utf_java_lang_Boolean;
@@ -86,8 +100,13 @@ extern utf* utf_java_lang_Long;
 extern utf* utf_java_lang_Float;
 extern utf* utf_java_lang_Double;
 
+extern utf *utf_java_lang_StackTraceElement;
+extern utf *utf_java_lang_reflect_Constructor;
+extern utf *utf_java_lang_reflect_Field;
+extern utf *utf_java_lang_reflect_Method;
 extern utf *utf_java_util_Vector;
 
+
 extern utf *utf_InnerClasses;
 extern utf *utf_ConstantValue;
 extern utf *utf_Code;
@@ -97,11 +116,29 @@ extern utf *utf_SourceFile;
 
 extern utf *utf_init;
 extern utf *utf_clinit;
+extern utf *utf_clone;
 extern utf *utf_finalize;
+extern utf *utf_run;
+
+extern utf *utf_add;
+extern utf *utf_remove;
+extern utf *utf_put;
+extern utf *utf_get;
+extern utf *utf_value;
 
-extern utf *utf_printStackTrace;
 extern utf *utf_fillInStackTrace;
+extern utf *utf_getSystemClassLoader;
 extern utf *utf_loadClass;
+extern utf *utf_printStackTrace;
+
+extern utf *utf_Z;
+extern utf *utf_B;
+extern utf *utf_C;
+extern utf *utf_S;
+extern utf *utf_I;
+extern utf *utf_J;
+extern utf *utf_F;
+extern utf *utf_D;
 
 extern utf *utf_void__void;
 extern utf *utf_boolean__void;
@@ -112,18 +149,24 @@ extern utf *utf_int__void;
 extern utf *utf_long__void;
 extern utf *utf_float__void;
 extern utf *utf_double__void;
+
+extern utf *utf_void__java_lang_ClassLoader;
 extern utf *utf_void__java_lang_Object;
 extern utf *utf_void__java_lang_Throwable;
+extern utf *utf_java_lang_Object__java_lang_Object;
 extern utf *utf_java_lang_String__void;
 extern utf *utf_java_lang_String__java_lang_Class;
 extern utf *utf_java_lang_Throwable__void;
 
+extern utf *utf_not_named_yet;
+
 extern utf *array_packagename;
 
 
 /* function prototypes ********************************************************/
 
-void utf8_init(void);
+/* initialize the utf8 subsystem */
+bool utf8_init(void);
 
 u4 utf_hashkey(const char *text, u4 length);
 
@@ -133,9 +176,6 @@ u4 unicode_hashkey(u2 *text, u2 length);
 /* create new utf-symbol */
 utf *utf_new(const char *text, u2 length);
 
-/* without locking (caller already holding lock*/
-utf *utf_new_intern(const char *text, u2 length);
-
 /* make utf symbol from u2 array */
 utf *utf_new_u2(u2 *unicodedata, u4 unicodelength, bool isclassname);