/* src/vm/utf8.c - utf8 string functions
- 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
+ Copyright (C) 1996-2005, 2006, 2007, 2008
+ CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Contact: cacao@cacaojvm.org
-
- Authors: Reinhard Grafl
- Mark Probst
- Andreas Krall
- Christian Thalinger
- Edwin Steiner
-
- $Id: utf8.c 6216 2006-12-18 18:21:37Z twisti $
-
*/
#include "vm/types.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#else
-# include "threads/none/lock.h"
-#endif
+#include "threads/mutex.hpp"
+
+#include "toolbox/hashtable.h"
-#include "vm/builtin.h"
-#include "vm/exceptions.h"
-#include "vm/hashtable.h"
+#include "vm/exceptions.hpp"
#include "vm/options.h"
-#include "vm/statistics.h"
-#include "vm/stringlocal.h"
+
+#if defined(ENABLE_STATISTICS)
+# include "vm/statistics.h"
+#endif
+
#include "vm/utf8.h"
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;
+utf *utf_java_lang_ref_PhantomReference;
utf *utf_java_io_Serializable;
utf *utf_java_lang_Throwable;
-utf *utf_java_lang_VMThrowable;
utf *utf_java_lang_Error;
+
utf *utf_java_lang_AbstractMethodError;
+utf *utf_java_lang_ClassCircularityError;
+utf *utf_java_lang_ClassFormatError;
+utf *utf_java_lang_ExceptionInInitializerError;
+utf *utf_java_lang_IncompatibleClassChangeError;
+utf *utf_java_lang_InstantiationError;
+utf *utf_java_lang_InternalError;
utf *utf_java_lang_LinkageError;
utf *utf_java_lang_NoClassDefFoundError;
+utf *utf_java_lang_NoSuchFieldError;
utf *utf_java_lang_NoSuchMethodError;
utf *utf_java_lang_OutOfMemoryError;
+utf *utf_java_lang_UnsatisfiedLinkError;
+utf *utf_java_lang_UnsupportedClassVersionError;
+utf *utf_java_lang_VerifyError;
+utf *utf_java_lang_VirtualMachineError;
utf *utf_java_lang_Exception;
+
+utf *utf_java_lang_ArithmeticException;
+utf *utf_java_lang_ArrayIndexOutOfBoundsException;
+utf *utf_java_lang_ArrayStoreException;
utf *utf_java_lang_ClassCastException;
utf *utf_java_lang_ClassNotFoundException;
+utf *utf_java_lang_CloneNotSupportedException;
+utf *utf_java_lang_IllegalAccessException;
utf *utf_java_lang_IllegalArgumentException;
utf *utf_java_lang_IllegalMonitorStateException;
-
+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;
+
+utf *utf_java_security_PrivilegedActionException;
+
+#if defined(ENABLE_JAVASE)
utf* utf_java_lang_Void;
+#endif
+
utf* utf_java_lang_Boolean;
utf* utf_java_lang_Byte;
utf* utf_java_lang_Character;
utf* utf_java_lang_Float;
utf* utf_java_lang_Double;
+#if defined(ENABLE_JAVASE)
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_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
+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
utf *utf_InnerClasses; /* InnerClasses */
utf *utf_ConstantValue; /* ConstantValue */
#if defined(ENABLE_JAVASE)
utf *utf_EnclosingMethod;
utf *utf_Signature;
-utf *utf_RuntimeVisibleAnnotations;
utf *utf_StackMapTable;
+
+# if defined(ENABLE_JVMTI)
+utf *utf_LocalVariableTable;
+# endif
+
+# if defined(ENABLE_ANNOTATIONS)
+utf *utf_RuntimeVisibleAnnotations; /* RuntimeVisibleAnnotations */
+utf *utf_RuntimeInvisibleAnnotations; /* RuntimeInvisibleAnnotations */
+utf *utf_RuntimeVisibleParameterAnnotations; /* RuntimeVisibleParameterAnnotations */
+utf *utf_RuntimeInvisibleParameterAnnotations; /* RuntimeInvisibleParameterAnnotations */
+utf *utf_AnnotationDefault; /* AnnotationDefault */
+# endif
#endif
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;
+utf *utf_dispatch;
utf *utf_remove;
+utf *utf_addThread;
utf *utf_removeThread;
utf *utf_put;
utf *utf_get;
+utf *utf_uncaughtException;
utf *utf_value;
utf *utf_fillInStackTrace;
+utf *utf_findNative;
utf *utf_getSystemClassLoader;
+utf *utf_initCause;
utf *utf_loadClass;
+utf *utf_loadClassInternal;
utf *utf_printStackTrace;
+utf *utf_division_by_zero;
+
utf *utf_Z; /* Z */
utf *utf_B; /* B */
utf *utf_C; /* C */
utf *utf_void__java_lang_ClassLoader; /* ()Ljava/lang/ClassLoader; */
utf *utf_void__java_lang_Object; /* ()Ljava/lang/Object; */
utf *utf_void__java_lang_Throwable; /* ()Ljava/lang/Throwable; */
+utf *utf_java_lang_ClassLoader_java_lang_String__J;
+utf *utf_java_lang_Exception__V; /* (Ljava/lang/Exception;)V */
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;
utf *utf_not_named_yet; /* special name for unnamed classes */
utf *utf_null;
*******************************************************************************/
-bool utf8_init(void)
+void utf8_init(void)
{
+ TRACESUBSYSTEMINITIALIZATION("utf8_init");
+
/* create utf8 hashtable */
hashtable_utf = NEW(hashtable);
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 =
+ utf_new_char("java/lang/ref/SoftReference");
+
+ utf_java_lang_ref_WeakReference =
+ utf_new_char("java/lang/ref/WeakReference");
+
+ utf_java_lang_ref_PhantomReference =
+ utf_new_char("java/lang/ref/PhantomReference");
+
utf_java_io_Serializable = utf_new_char("java/io/Serializable");
- utf_java_lang_Throwable = utf_new_char(string_java_lang_Throwable);
- utf_java_lang_VMThrowable = utf_new_char(string_java_lang_VMThrowable);
- utf_java_lang_Error = utf_new_char(string_java_lang_Error);
+ utf_java_lang_Throwable = utf_new_char("java/lang/Throwable");
+ utf_java_lang_Error = utf_new_char("java/lang/Error");
- utf_java_lang_AbstractMethodError =
- utf_new_char(string_java_lang_AbstractMethodError);
+ utf_java_lang_ClassCircularityError =
+ utf_new_char("java/lang/ClassCircularityError");
+
+ utf_java_lang_ClassFormatError = utf_new_char("java/lang/ClassFormatError");
- utf_java_lang_LinkageError =
- utf_new_char(string_java_lang_LinkageError);
+ utf_java_lang_ExceptionInInitializerError =
+ utf_new_char("java/lang/ExceptionInInitializerError");
+
+ utf_java_lang_IncompatibleClassChangeError =
+ utf_new_char("java/lang/IncompatibleClassChangeError");
+
+ utf_java_lang_InstantiationError =
+ utf_new_char("java/lang/InstantiationError");
+
+ utf_java_lang_InternalError = utf_new_char("java/lang/InternalError");
+ utf_java_lang_LinkageError = utf_new_char("java/lang/LinkageError");
utf_java_lang_NoClassDefFoundError =
- utf_new_char(string_java_lang_NoClassDefFoundError);
+ utf_new_char("java/lang/NoClassDefFoundError");
+
+ utf_java_lang_OutOfMemoryError = utf_new_char("java/lang/OutOfMemoryError");
+
+ utf_java_lang_UnsatisfiedLinkError =
+ utf_new_char("java/lang/UnsatisfiedLinkError");
+
+ utf_java_lang_UnsupportedClassVersionError =
+ utf_new_char("java/lang/UnsupportedClassVersionError");
+
+ utf_java_lang_VerifyError = utf_new_char("java/lang/VerifyError");
+
+ utf_java_lang_VirtualMachineError =
+ utf_new_char("java/lang/VirtualMachineError");
+
+#if defined(ENABLE_JAVASE)
+ utf_java_lang_AbstractMethodError =
+ utf_new_char("java/lang/AbstractMethodError");
+
+ utf_java_lang_NoSuchFieldError =
+ utf_new_char("java/lang/NoSuchFieldError");
utf_java_lang_NoSuchMethodError =
- utf_new_char(string_java_lang_NoSuchMethodError);
+ utf_new_char("java/lang/NoSuchMethodError");
+#endif
+
+ utf_java_lang_Exception = utf_new_char("java/lang/Exception");
+
+ utf_java_lang_ArithmeticException =
+ utf_new_char("java/lang/ArithmeticException");
- utf_java_lang_OutOfMemoryError =
- utf_new_char(string_java_lang_OutOfMemoryError);
+ utf_java_lang_ArrayIndexOutOfBoundsException =
+ utf_new_char("java/lang/ArrayIndexOutOfBoundsException");
- utf_java_lang_Exception = utf_new_char(string_java_lang_Exception);
+ utf_java_lang_ArrayStoreException =
+ utf_new_char("java/lang/ArrayStoreException");
utf_java_lang_ClassCastException =
- utf_new_char(string_java_lang_ClassCastException);
+ utf_new_char("java/lang/ClassCastException");
utf_java_lang_ClassNotFoundException =
- utf_new_char(string_java_lang_ClassNotFoundException);
+ utf_new_char("java/lang/ClassNotFoundException");
+
+ utf_java_lang_CloneNotSupportedException =
+ utf_new_char("java/lang/CloneNotSupportedException");
+
+ utf_java_lang_IllegalAccessException =
+ utf_new_char("java/lang/IllegalAccessException");
utf_java_lang_IllegalArgumentException =
- utf_new_char(string_java_lang_IllegalArgumentException);
+ utf_new_char("java/lang/IllegalArgumentException");
utf_java_lang_IllegalMonitorStateException =
- utf_new_char(string_java_lang_IllegalMonitorStateException);
+ utf_new_char("java/lang/IllegalMonitorStateException");
+
+ utf_java_lang_InstantiationException =
+ utf_new_char("java/lang/InstantiationException");
+
+ utf_java_lang_InterruptedException =
+ utf_new_char("java/lang/InterruptedException");
+
+ utf_java_lang_NegativeArraySizeException =
+ utf_new_char("java/lang/NegativeArraySizeException");
utf_java_lang_NullPointerException =
- utf_new_char(string_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");
+
+ utf_java_lang_reflect_InvocationTargetException =
+ utf_new_char("java/lang/reflect/InvocationTargetException");
+ utf_java_security_PrivilegedActionException =
+ utf_new_char("java/security/PrivilegedActionException");
+
+#if defined(ENABLE_JAVASE)
utf_java_lang_Void = utf_new_char("java/lang/Void");
+#endif
+
utf_java_lang_Boolean = utf_new_char("java/lang/Boolean");
utf_java_lang_Byte = utf_new_char("java/lang/Byte");
utf_java_lang_Character = utf_new_char("java/lang/Character");
utf_java_lang_Float = utf_new_char("java/lang/Float");
utf_java_lang_Double = utf_new_char("java/lang/Double");
+#if defined(ENABLE_JAVASE)
utf_java_lang_StackTraceElement =
utf_new_char("java/lang/StackTraceElement");
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_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
+ 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
utf_InnerClasses = utf_new_char("InnerClasses");
utf_ConstantValue = utf_new_char("ConstantValue");
#if defined(ENABLE_JAVASE)
utf_EnclosingMethod = utf_new_char("EnclosingMethod");
utf_Signature = utf_new_char("Signature");
- utf_RuntimeVisibleAnnotations = utf_new_char("RuntimeVisibleAnnotations");
utf_StackMapTable = utf_new_char("StackMapTable");
+
+# if defined(ENABLE_JVMTI)
+ utf_LocalVariableTable = utf_new_char("LocalVariableTable");
+# 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
utf_init = utf_new_char("<init>");
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");
+ utf_dispatch = utf_new_char("dispatch");
utf_remove = utf_new_char("remove");
+ utf_addThread = utf_new_char("addThread");
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_printStackTrace = utf_new_char("printStackTrace");
utf_fillInStackTrace = utf_new_char("fillInStackTrace");
- utf_loadClass = utf_new_char("loadClass");
+ utf_findNative = utf_new_char("findNative");
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");
utf_Z = utf_new_char("Z");
utf_B = utf_new_char("B");
utf_void__java_lang_ClassLoader =
utf_new_char("()Ljava/lang/ClassLoader;");
+ utf_java_lang_ClassLoader_java_lang_String__J =
+ utf_new_char("(Ljava/lang/ClassLoader;Ljava/lang/String;)J");
+
+ utf_java_lang_Exception__V = utf_new_char("(Ljava/lang/Exception;)V");
+
utf_java_lang_Object__java_lang_Object =
utf_new_char("(Ljava/lang/Object;)Ljava/lang/Object;");
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 =
+ utf_new_char("(Ljava/lang/Throwable;)Ljava/lang/Throwable;");
+
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;
}
utf *u; /* hashtable element */
u2 i;
- LOCK_MONITOR_ENTER(hashtable_utf->header);
+ Mutex_lock(hashtable_utf->mutex);
#if defined(ENABLE_STATISTICS)
if (opt_stat)
/* symbol found in hashtable */
- LOCK_MONITOR_EXIT(hashtable_utf->header);
+ Mutex_unlock(hashtable_utf->mutex);
return u;
}
u = u->hashlink; /* next element in external chain */
}
-#if defined(ENABLE_STATISTICS)
- if (opt_stat)
- count_utf_len += sizeof(utf) + length + 1;
-#endif
-
/* location in hashtable found, create new utf element */
+
u = NEW(utf);
+
u->blength = length; /* length in bytes of utfstring */
u->hashlink = hashtable_utf->ptr[slot]; /* link in external hashchain */
u->text = mem_alloc(length + 1);/* allocate memory for utf-text */
memcpy(u->text, text, length); /* copy utf-text */
u->text[length] = '\0';
+#if defined(ENABLE_STATISTICS)
+ if (opt_stat)
+ count_utf_len += sizeof(utf) + length + 1;
+#endif
+
hashtable_utf->ptr[slot] = u; /* insert symbol into table */
hashtable_utf->entries++; /* update number of entries */
hashtable_utf = newhash;
}
- LOCK_MONITOR_EXIT(hashtable_utf->header);
+ Mutex_unlock(hashtable_utf->mutex);
return u;
}
u4 left; /* unicode characters left */
u4 buflength; /* utf length in bytes of the u2 array */
utf *result; /* resulting utf-string */
- int i;
+ int i;
/* determine utf length in bytes and allocate memory */
return u->blength;
}
+
/* utf_get_number_of_u2s_for_buffer ********************************************
Determine number of UTF-16 u2s in the given UTF-8 buffer
/* XXX this is probably not checked by most callers! Review this after */
/* the invalid uses of this function have been eliminated */
- if (!u) {
+ if (u == NULL) {
exceptions_throw_nullpointerexception();
return 0;
}
utf_nextu2(&utf_ptr);
}
- if (utf_ptr != endpos)
+ if (utf_ptr != endpos) {
/* string ended abruptly */
- throw_cacao_exception_exit(string_java_lang_InternalError,
- "Illegal utf8 string");
+ exceptions_throw_internalerror("Illegal utf8 string");
+ return 0;
+ }
return len;
}
projects / cacao.git / blobdiff