* renamed CACAO_TYPECHECK to ENABLE_VERIFIER

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

diff --git a/src/vm/utf8.h b/src/vm/utf8.h
index 3c4e4950367d0ea149a49e9f37a18a6a1bb1b161..73d99b106aee51ee3522d301c582936e330d5b50 100644 (file)
--- a/src/vm/utf8.h
+++ b/src/vm/utf8.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: utf8.h 2427 2005-05-01 12:27:54Z jowenn $
+   $Id: utf8.h 3807 2005-11-26 21:51:11Z edwin $
 
 */
 
@@ -43,6 +43,8 @@
 
 typedef struct utf utf;
 
+#include "config.h"
+#include "vm/types.h"
 
 #include "vm/global.h"
 
@@ -51,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 **************/
 
@@ -72,10 +78,17 @@ extern utf *utf_java_io_Serializable;
 extern utf *utf_java_lang_Throwable;
 extern utf *utf_java_lang_VMThrowable;
 extern utf *utf_java_lang_Error;
-extern utf *utf_java_lang_Exception;
 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;
@@ -87,9 +100,11 @@ extern utf* utf_java_lang_Long;
 extern utf* utf_java_lang_Float;
 extern utf* utf_java_lang_Double;
 
-extern utf *utf_java_util_Vector;
+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;
@@ -101,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;
@@ -116,8 +149,11 @@ 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;
@@ -129,7 +165,8 @@ 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);
 
@@ -139,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);