* src/cacaoh/dummy.c (resolve_handle_pending_exception): New function.

[cacao.git] / src / vmcore / utf8.c

diff --git a/src/vmcore/utf8.c b/src/vmcore/utf8.c
index 09d691aed748ce3456591cae66015eee3ec9cb90..fe2da62dbe3817e667f0a7315044cb56fe8c8345 100644 (file)
--- a/src/vmcore/utf8.c
+++ b/src/vmcore/utf8.c
@@ -1,9 +1,7 @@
 /* src/vmcore/utf8.c - utf8 string functions
 
-   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
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -67,7 +65,6 @@ utf *utf_java_lang_ClassLoader;
 utf *utf_java_lang_Cloneable;
 utf *utf_java_lang_SecurityManager;
 utf *utf_java_lang_String;
-utf *utf_java_lang_System;
 utf *utf_java_lang_ThreadGroup;
 utf *utf_java_lang_ref_SoftReference;
 utf *utf_java_lang_ref_WeakReference;
@@ -94,10 +91,6 @@ utf *utf_java_lang_UnsupportedClassVersionError;
 utf *utf_java_lang_VerifyError;
 utf *utf_java_lang_VirtualMachineError;
 
-#if defined(WITH_CLASSPATH_GNU)
-utf *utf_java_lang_VMThrowable;
-#endif
-
 utf *utf_java_lang_Exception;
 
 utf *utf_java_lang_ArithmeticException;
@@ -113,6 +106,7 @@ utf *utf_java_lang_InstantiationException;
 utf *utf_java_lang_InterruptedException;
 utf *utf_java_lang_NegativeArraySizeException;
 utf *utf_java_lang_NullPointerException;
+utf *utf_java_lang_RuntimeException;
 utf *utf_java_lang_StringIndexOutOfBoundsException;
 
 utf *utf_java_lang_reflect_InvocationTargetException;
@@ -165,6 +159,8 @@ utf *utf_init;                          /* <init>                             */
 utf *utf_clinit;                        /* <clinit>                           */
 utf *utf_clone;                         /* clone                              */
 utf *utf_finalize;                      /* finalize                           */
+utf *utf_invoke;
+utf *utf_main;
 utf *utf_run;                           /* run                                */
 
 utf *utf_add;
@@ -215,6 +211,7 @@ utf *utf_java_lang_String__void;        /* (Ljava/lang/String;)V              */
 utf *utf_java_lang_String__java_lang_Class;
 utf *utf_java_lang_Thread__V;           /* (Ljava/lang/Thread;)V              */
 utf *utf_java_lang_Thread_java_lang_Throwable__V;
+utf *utf_Ljava_lang_ThreadGroup_Ljava_lang_String__V;
 utf *utf_java_lang_Throwable__void;     /* (Ljava/lang/Throwable;)V           */
 utf *utf_java_lang_Throwable__java_lang_Throwable;
 
@@ -229,8 +226,10 @@ utf *array_packagename;
 
 *******************************************************************************/
 
-bool utf8_init(void)
+void utf8_init(void)
 {
+       TRACESUBSYSTEMINITIALIZATION("utf8_init");
+
        /* create utf8 hashtable */
 
        hashtable_utf = NEW(hashtable);
@@ -251,7 +250,6 @@ bool utf8_init(void)
        utf_java_lang_Cloneable        = utf_new_char("java/lang/Cloneable");
        utf_java_lang_SecurityManager  = utf_new_char("java/lang/SecurityManager");
        utf_java_lang_String           = utf_new_char("java/lang/String");
-       utf_java_lang_System           = utf_new_char("java/lang/System");
        utf_java_lang_ThreadGroup      = utf_new_char("java/lang/ThreadGroup");
 
        utf_java_lang_ref_SoftReference =
@@ -312,10 +310,6 @@ bool utf8_init(void)
                utf_new_char("java/lang/NoSuchMethodError");
 #endif
 
-#if defined(WITH_CLASSPATH_GNU)
-       utf_java_lang_VMThrowable      = utf_new_char("java/lang/VMThrowable");
-#endif
-
        utf_java_lang_Exception        = utf_new_char("java/lang/Exception");
 
        utf_java_lang_ArithmeticException =
@@ -357,6 +351,9 @@ bool utf8_init(void)
        utf_java_lang_NullPointerException =
                utf_new_char("java/lang/NullPointerException");
 
+       utf_java_lang_RuntimeException =
+               utf_new_char("java/lang/RuntimeException");
+
        utf_java_lang_StringIndexOutOfBoundsException =
                utf_new_char("java/lang/StringIndexOutOfBoundsException");
 
@@ -416,6 +413,8 @@ bool utf8_init(void)
        utf_clinit                         = utf_new_char("<clinit>");
        utf_clone                      = utf_new_char("clone");
        utf_finalize                   = utf_new_char("finalize");
+       utf_invoke                     = utf_new_char("invoke");
+       utf_main                       = utf_new_char("main");
        utf_run                        = utf_new_char("run");
 
        utf_add                        = utf_new_char("add");
@@ -479,6 +478,9 @@ bool utf8_init(void)
        utf_java_lang_Thread_java_lang_Throwable__V =
                utf_new_char("(Ljava/lang/Thread;Ljava/lang/Throwable;)V");
 
+       utf_Ljava_lang_ThreadGroup_Ljava_lang_String__V =
+               utf_new_char("(Ljava/lang/ThreadGroup;Ljava/lang/String;)V");
+
        utf_java_lang_Throwable__void  = utf_new_char("(Ljava/lang/Throwable;)V");
 
        utf_java_lang_Throwable__java_lang_Throwable =
@@ -487,10 +489,6 @@ bool utf8_init(void)
        utf_null                       = utf_new_char("null");
        utf_not_named_yet              = utf_new_char("\t<not_named_yet>");
        array_packagename              = utf_new_char("\t<the array package>");
-
-       /* everything's ok */
-
-       return true;
 }