X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvmcore%2Futf8.c;h=9cb1f1109dbb7d292c32b3f63efb6d1cdf7e2abd;hb=2c4a017a72eebd5da6d62be39e7ea0181db2a827;hp=2dccde9cd2d45e464611eb22d9ec37073ec73727;hpb=58bac0a56dab7d6983a3cfbee7a9b7ffec5a4284;p=cacao.git diff --git a/src/vmcore/utf8.c b/src/vmcore/utf8.c index 2dccde9cd..9cb1f1109 100644 --- 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. @@ -22,8 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - $Id: utf8.c 8249 2007-07-31 12:59:03Z panzi $ - */ @@ -69,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; @@ -96,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; @@ -115,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; @@ -139,6 +131,13 @@ utf *utf_java_lang_StackTraceElement; utf *utf_java_lang_reflect_Constructor; utf *utf_java_lang_reflect_Field; utf *utf_java_lang_reflect_Method; + +# if defined(WITH_CLASSPATH_GNU) +utf *utf_java_lang_reflect_VMConstructor; +utf *utf_java_lang_reflect_VMField; +utf *utf_java_lang_reflect_VMMethod; +# endif + utf *utf_java_util_Vector; #endif @@ -155,16 +154,11 @@ utf *utf_Signature; utf *utf_StackMapTable; #if defined(ENABLE_ANNOTATIONS) -utf *utf_sun_reflect_ConstantPool; -#if defined(WITH_CLASSPATH_GNU) -utf *utf_sun_reflect_annotation_AnnotationParser; -#endif - -utf *utf_RuntimeVisibleAnnotations; -utf *utf_RuntimeInvisibleAnnotations; -utf *utf_RuntimeVisibleParameterAnnotations; -utf *utf_RuntimeInvisibleParameterAnnotations; -utf *utf_AnnotationDefault; +utf *utf_RuntimeVisibleAnnotations; /* RuntimeVisibleAnnotations */ +utf *utf_RuntimeInvisibleAnnotations; /* RuntimeInvisibleAnnotations */ +utf *utf_RuntimeVisibleParameterAnnotations; /* RuntimeVisibleParameterAnnotations */ +utf *utf_RuntimeInvisibleParameterAnnotations; /* RuntimeInvisibleParameterAnnotations */ +utf *utf_AnnotationDefault; /* AnnotationDefault */ #endif #endif @@ -172,6 +166,8 @@ utf *utf_init; /* */ utf *utf_clinit; /* */ utf *utf_clone; /* clone */ utf *utf_finalize; /* finalize */ +utf *utf_invoke; +utf *utf_main; utf *utf_run; /* run */ utf *utf_add; @@ -180,6 +176,7 @@ utf *utf_addThread; utf *utf_removeThread; utf *utf_put; utf *utf_get; +utf *utf_uncaughtException; utf *utf_value; utf *utf_fillInStackTrace; @@ -187,6 +184,7 @@ utf *utf_findNative; utf *utf_getSystemClassLoader; utf *utf_initCause; utf *utf_loadClass; +utf *utf_loadClassInternal; utf *utf_printStackTrace; utf *utf_division_by_zero; @@ -219,6 +217,8 @@ utf *utf_java_lang_Object__java_lang_Object; 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; @@ -233,8 +233,10 @@ utf *array_packagename; *******************************************************************************/ -bool utf8_init(void) +void utf8_init(void) { + TRACESUBSYSTEMINITIALIZATION("utf8_init"); + /* create utf8 hashtable */ hashtable_utf = NEW(hashtable); @@ -255,7 +257,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 = @@ -316,10 +317,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 = @@ -361,6 +358,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"); @@ -392,6 +392,13 @@ bool utf8_init(void) utf_java_lang_reflect_Field = utf_new_char("java/lang/reflect/Field"); utf_java_lang_reflect_Method = utf_new_char("java/lang/reflect/Method"); + +# if defined(WITH_CLASSPATH_GNU) + utf_java_lang_reflect_VMConstructor = utf_new_char("java/lang/reflect/VMConstructor"); + utf_java_lang_reflect_VMField = utf_new_char("java/lang/reflect/VMField"); + utf_java_lang_reflect_VMMethod = utf_new_char("java/lang/reflect/VMMethod"); +# endif + utf_java_util_Vector = utf_new_char("java/util/Vector"); #endif @@ -407,24 +414,21 @@ bool utf8_init(void) utf_Signature = utf_new_char("Signature"); utf_StackMapTable = utf_new_char("StackMapTable"); -#if defined(ENABLE_ANNOTATIONS) - utf_sun_reflect_ConstantPool = utf_new_char("sun/reflect/ConstantPool"); -#if defined(WITH_CLASSPATH_GNU) - utf_sun_reflect_annotation_AnnotationParser = utf_new_char("sun/reflect/annotation/AnnotationParser"); -#endif - +# if defined(ENABLE_ANNOTATIONS) utf_RuntimeVisibleAnnotations = utf_new_char("RuntimeVisibleAnnotations"); utf_RuntimeInvisibleAnnotations = utf_new_char("RuntimeInvisibleAnnotations"); utf_RuntimeVisibleParameterAnnotations = utf_new_char("RuntimeVisibleParameterAnnotations"); utf_RuntimeInvisibleParameterAnnotations = utf_new_char("RuntimeInvisibleParameterAnnotations"); utf_AnnotationDefault = utf_new_char("AnnotationDefault"); -#endif +# endif #endif utf_init = utf_new_char(""); utf_clinit = utf_new_char(""); 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"); @@ -433,6 +437,7 @@ bool utf8_init(void) utf_removeThread = utf_new_char("removeThread"); utf_put = utf_new_char("put"); utf_get = utf_new_char("get"); + utf_uncaughtException = utf_new_char("uncaughtException"); utf_value = utf_new_char("value"); utf_fillInStackTrace = utf_new_char("fillInStackTrace"); @@ -440,6 +445,7 @@ bool utf8_init(void) utf_getSystemClassLoader = utf_new_char("getSystemClassLoader"); utf_initCause = utf_new_char("initCause"); utf_loadClass = utf_new_char("loadClass"); + utf_loadClassInternal = utf_new_char("loadClassInternal"); utf_printStackTrace = utf_new_char("printStackTrace"); utf_division_by_zero = utf_new_char("/ by zero"); @@ -482,6 +488,13 @@ bool utf8_init(void) utf_new_char("(Ljava/lang/String;)Ljava/lang/Class;"); utf_java_lang_Thread__V = utf_new_char("(Ljava/lang/Thread;)V"); + + 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 = @@ -490,10 +503,6 @@ bool utf8_init(void) utf_null = utf_new_char("null"); utf_not_named_yet = utf_new_char("\t"); array_packagename = utf_new_char("\t"); - - /* everything's ok */ - - return true; }