* src/vm/access.c [ENABLE_JAVASE] (access_check_field): Added #ifdef.
[ENABLE_JAVASE] (access_check_method): Likewise.
* src/vm/access.h: Likewise.

* src/native/vm/sun/hpi.c (hpi_initialize): Fixed compiler warning.
(hpi_initialize_socket_library): Likewise.

* src/vm/jit/stacktrace.c (stacktrace_print_entry): Print newline for
builtins.

* Commited with tip.

* src/threads/posix/thread-posix.c (threads_sleep): Removed
threads_check_if_interrupted_and_reset usage and use new functions.

* src/native/vm/gnu/java_lang_reflect_VMField.c
(native/include/java_lang_reflect_Field.h): Added include.

* src/threads/thread.h (thread_set_interrupted): New function.
* src/threads/posix/thread-posix.c
(threads_check_if_interrupted_and_reset): Removed.
* src/threads/posix/thread-posix.h: Likewise.
* src/native/vm/gnu/java_lang_VMThread.c (interrupted): Use new
function.

* src/threads/thread.h (thread_is_interrupted): New function.
* src/threads/posix/thread-posix.c
(threads_thread_has_been_interrupted): Removed.
* src/threads/posix/thread-posix.h: Likewise.
* src/native/vm/gnu/java_lang_VMThread.c (isInterrupted): Use new
function.
* src/native/vm/sun/jvm.c (JVM_IsInterrupted): Likewise.

* src/threads/none/thread-none.h: Fixed define name.
* src/threads/posix/thread-posix.h: Likewise.
* src/threads/thread.h: Likewise.

* src/vm/jit/arm/asmpart.S (asm_cacheflush) [__ARM_EABI__]: Use
syscall number 0.

 src/vm/jit/stacktrace.c (stacktrace_print_entry): New function.
(stacktrace_print_current): Likewise.
[ENABLE_THREADS] (stacktrace_print_of_thread): Likewise.
[!ENABLE_THREADS] (_no_threads_stackframeinfo): Removed.
* src/vm/jit/stacktrace.h: Likewise.

* src/Makefile.am [ENABLE_THREADS] (THREADS_DIR): Removed.
(SUBDIRS): Added threads.

* src/cacao/Makefile.am [ENABLE_THREADS] (THREAD_LIB): Removed.
(libjvm_la_LIBADD): Removed $(THREAD_LIB), added
$(top_builddir)/src/threads/libthreads.la.
* src/threads/Makefile.am [!ENABLE_THREADS]: Recurse into none/.
* src/threads/none/Makefile.am (EXTRA_DIST): Removed.
(AM_CPPFLAGS): Added.
(LIBS): Likewise.
(noinst_LTLIBRARIES): Likewise.
(libthreadsnone_la_SOURCES): Likewise.

* src/threads/none/thread-none.c: New file.
* src/threads/none/thread-none.h (_no_threads_stackframeinfo): Export.

* src/threads/posix/Makefile.am (noinst_LTLIBRARIES): Renamed library
from libposix to libthreadsposix.
(libposix_la_SOURCES): Renamed to libthreadsposix_la_SOURCES.

* src/threads/thread.c (threads_dump): Use stacktrace_print_of_thread.
(threads_thread_print_stacktrace): Removed.
(threads_print_stacktrace): Likewise.
* src/threads/thread.h (threads_thread_print_stacktrace): Likewise.
(threads_print_stacktrace): Likewise.

* src/vm/jit/methodtree.c (methodtree_find): Use
stacktrace_print_current.
* src/vm/jit/s390/md.c (md_dump_context): Likewise.

* src/vm/jit/arm/linux/md-os.c (md_signal_handler_sigill): Use
vm_abort instead of assert.

* src/vm/exceptions.c (exceptions_print_stacktrace) [!NDEBUG]:
#ifdef'ed class_print.

* src/threads/thread.h (thread_current_is_attached): Check if t is
NULL and return false in this case.

* src/classes/Makefile.am (VM_JAVA_FILES_GNU): Added new VM interface
files.
* src/native/include/Makefile.am (JAVASE_HEADER_FILES): Likewise.

* src/classes/gnu/gnu/java/lang/CPStringBuilder.java,
src/classes/gnu/gnu/java/lang/VMCPStringBuilder.java,
src/classes/gnu/java/lang/reflect/Modifier.java: New file.

* src/classes/gnu/java/lang/reflect/Constructor.java,
src/classes/gnu/java/lang/reflect/Field.java,
src/classes/gnu/java/lang/reflect/Method.java: Updated.

* src/classes/gnu/java/lang/reflect/VMConstructor.java,
src/classes/gnu/java/lang/reflect/VMField.java,
src/classes/gnu/java/lang/reflect/VMMethod.java: New file.

* src/native/jni.c (FromReflectedMethod): Adapted to new VM interface.
(FromReflectedField): Likewise.

* src/native/vm/gnu/Makefile.am (libnativevmcore_la_SOURCES): Removed
java_lang_reflect_Constructor.c, java_lang_reflect_Field.c,
java_lang_reflect_Method.c, added gnu_java_lang_VMCPStringBuilder.c,
java_lang_reflect_VMConstructor.c, java_lang_reflect_VMField.c,
java_lang_reflect_VMMethod.c.

* src/native/vm/gnu/java_lang_reflect_Constructor.c,
src/native/vm/gnu/java_lang_reflect_Field.c,
src/native/vm/gnu/java_lang_reflect_Method.c: Removed.

* src/native/vm/gnu/gnu_java_lang_VMCPStringBuilder.c,
src/native/vm/gnu/java_lang_reflect_VMConstructor.c,
src/native/vm/gnu/java_lang_reflect_VMField.c,
src/native/vm/gnu/java_lang_reflect_VMMethod.c: New file.

* src/native/vm/nativevm.c (nativevm_preinit): Added
_Jv_gnu_java_lang_VMCPStringBuilder_init.
* src/native/vm/nativevm.h: Likewise.

* src/native/vm/reflect.c (reflect_constructor_new): Adapted to new VM
interface.
(reflect_field_new): Likewise.
(reflect_method_new): Likewise.

* src/native/vm/sun_misc_Unsafe.c (objectFieldOffset): Likewise.
(staticFieldBase): Likewise.

* src/vmcore/class.c [WITH_CLASSPATH_GNU]
(class_java_lang_reflect_VMConstructor)
(class_java_lang_reflect_VMField, class_java_lang_reflect_VMMethod):
New global variable.
* src/vmcore/class.h: Likewise.
* src/vmcore/linker.c (linker_init): Added new classes.
* src/vmcore/loader.c (loader_init): Likewise.

* src/vmcore/utf8.c [WITH_CLASSPATH_GNU]
(utf_java_lang_reflect_VMConstructor, utf_java_lang_reflect_VMField)
(utf_java_lang_reflect_VMMethod): New global variable.
* src/vmcore/utf8.h: Likewise.

--HG--
rename : src/native/vm/gnu/java_lang_reflect_Constructor.c => src/native/vm/gnu/java_lang_reflect_VMConstructor.c
rename : src/native/vm/gnu/java_lang_reflect_Field.c => src/native/vm/gnu/java_lang_reflect_VMField.c
rename : src/native/vm/gnu/java_lang_reflect_Method.c => src/native/vm/gnu/java_lang_reflect_VMMethod.c

* src/native/vm/java_lang_reflect_Constructor.c: Removed.
* src/native/vm/java_lang_reflect_Constructor.h: Likewise.
* src/native/vm/java_lang_reflect_Method.c: Likewise.
* src/native/vm/java_lang_reflect_Method.h: Likewise.

* src/native/jni.c (_Jv_jni_invokeNative): Likewise.

* src/native/vm/Makefile.am (JAVA_LANG_REFLECT_CONSTRUCTOR_SOURCES):
Removed.
(JAVA_LANG_REFLECT_METHOD_SOURCES): Likewise.
(libnativevm_la_SOURCES): Removed
JAVA_LANG_REFLECT_CONSTRUCTOR_SOURCES and
JAVA_LANG_REFLECT_METHOD_SOURCES.

* src/native/vm/reflect.c (reflect_invoke): New function.
(reflect_constructor_newinstance): Likewise.
(reflect_method_invoke): Likewise.
* src/native/vm/reflect.h (reflect_constructor_newinstance): Export.
(reflect_method_invoke): Likewise.

* src/native/vm/gnu/java_lang_reflect_Constructor.c (constructNative):
Use reflect_constructor_newinstance.
* src/native/vm/gnu/java_lang_reflect_Method.c (invokeNative): Use
reflect_method_invoke.
* src/native/vm/sun/jvm.c (JVM_InvokeMethod): Use
reflect_method_invoke.
(JVM_NewInstanceFromConstructor): Use reflect_constructor_newinstance.

* src/native/vm/gnu/java_lang_reflect_Constructor.c (getSignature):
Implemented directly.
* src/native/vm/java_lang_reflect_Constructor.c (getSignature): Removed.
* src/native/vm/java_lang_reflect_Constructor.h: Likewise.

* src/native/vm/gnu/java_lang_reflect_Constructor.c
(getExceptionTypes): Implemented directly.
* src/native/vm/java_lang_reflect_Constructor.c (getExceptionTypes): Removed.
* src/native/vm/java_lang_reflect_Constructor.h: Likewise.

* src/native/vm/gnu/java_lang_reflect_Constructor.c
(getParameterTypes): Implemented directly.
* src/native/vm/java_lang_reflect_Constructor.c (getParameterTypes): Removed.
* src/native/vm/java_lang_reflect_Constructor.h: Likewise.

* src/native/vm/gnu/java_lang_reflect_Constructor.c
(getModifiersInternal): Implemented directly.
* src/native/vm/java_lang_reflect_Constructor.c (getModifiers): Removed.
* src/native/vm/java_lang_reflect_Constructor.h: Likewise.

* src/threads/posix/threadlist-posix.c: Removed.
* src/threads/posix/Makefile.am (libposix_la_SOURCES): Removed
threadlist-posix.c.
* src/threads/threadlist.c (threads/mutex.h): Added.
(threadlist_mutex): New global variable.
(threadlist_init): Initialize mutex.
(threadlist_lock, threadlist_unlock): New functions.

* src/vm/exceptions.c (exceptions_new_class_utf): Check for c == NULL
when VM is initializing.

* src/native/vm/sun/jvm.c (TRACEJVMCALLSENTER, TRACEJVMCALLSEXIT): New
macro.
(JVM_GetClassLoader): Trace return value.

* src/vm/jit/stacktrace.c (stacktrace_get): Correctly skip
Throwable.init() functions.
(stacktrace_stackframeinfo_fill): Changed debugging messge.

* src/threads/thread.c (threads_thread_print_info): Renamed to
thread_print_info, removed assert on THREAD_STATE_NEW but print as
much info as possible.
(threads_dump): Use new functio name.
* src/threads/thread.h: Likewise.

* Merged with tip.

* src/mm/Makefile.am: Changed copyright.

* src/vm/string.c (javastring_safe_new_from_utf8): Don't assert on
text is NULL, but return NULL.  Checked with jconsole.

* src/threads/Makefile.am: Added mutex.h.
* src/threads/posix/Makefile.am: Added mutex-posix.h.

* src/threads/mutex.h: Added new file.
* src/threads/posix/mutex-posix.h: Likewise.
(mutex_init): Implemented inline wrapper function.
(mutex_lock): Likewise.
(mutex_unlock): Likewise.
(mutex_destroy): Likewise.

* src/cacao/cacao.c,
src/native/jvmti/cacaodbg.c,
src/native/jvmti/cacaodbg.h,
src/native/jvmti/jvmti.c,
src/threads/posix/generic-primitives.h,
src/threads/posix/lock.c,
src/threads/posix/lock.h,
src/threads/posix/thread-posix.c,
src/threads/posix/thread-posix.h,
src/threads/posix/threadlist-posix.c,
src/vm/vm.c: Included mutex.h and used wrapper functions
throughout the whole file.

* src/threads/none/threads.h: Renamed from here...
* src/threads/none/thread-none.h: ...to here.
* src/threads/thread.h: Fixed include.

--HG--
rename : src/threads/none/threads.h => src/threads/none/thread-none.h

* src/native/jni.c (_Jv_JNI_FindClass): Renamed to jni_FindClass, call
resolve_handle_pending_exception in exception case.
(_Jv_JNI_ExceptionDescribe): Renamed to jni_ExceptionDescribe, use
exceptions_print_stacktrace.
(_Jv_JNI_ExceptionClear): Renamed to jni_ExceptionClear.

* src/threads/thread.h (threads_thread_get_object): Renamed to
thread_get_object.
(threads_thread_set_object): Renamed to thread_set_object.
(threads_get_current_object): Renamed to thread_get_current_object.
(thread_is_attached): Use new function names.
(thread_fprint_name): Export.

* src/threads/none/threads.h (threads_get_current_object): Renamed to
thread_get_current_object.

* src/native/vm/cldc1.1/java_lang_Thread.c (currentThread): Use new
function names.
* src/native/vm/gnu/java_lang_VMThread.c (currentThread): Likewise.
* src/native/vm/sun/jvm.c (JVM_CurrentThread): Likewise.
* src/threads/posix/thread-posix.c (threads_startup_thread): Likewise.
(threads_detach_thread): Likewise.
* src/threads/thread.c (thread_create_object): Likewise.
(thread_free): Likewise.
(threads_thread_start): Likewise.
(thread_fprint_name): New function.
(threads_thread_print_info): Use thread_fprint_name.

* src/vm/exceptions.c (exceptions_print_stacktrace): Implemented
(mostly) as in HotSpot.

* src/vm/string.c (javastring_print): Renamed to javastring_fprint and
added a stream argument.
* src/vm/stringlocal.h: Likewise.

* src/vm/vm.c (vm_run) [ENABLE_THREADS]: #ifdef'ed threading stuff.

* configure.ac (AC_CHECK_HEADERS): Added stdio.h.

* src/threads/thread.c (thread_create_object): New function.
(thread_method_init): Made static.
(threadgroup_system, threadgroup_main): Changed type to java_handle_t.
(thread_create_initial_threadgroup): Chnaged type of
threadgroup_system and threadgroup_main.
(thread_create_initial_thread): Use thread_create_object.
(threads_thread_start_internal): Likewise.
(threads_attach_current_thread): Likewise.
(threads_thread_print_info): Use thread_is_daemon.
* src/threads/thread.h (thread_method_init): Removed.
(thread_is_daemon): New function.
* src/threads/threadlist.c (threadlist_get_non_daemons): Use
thread_is_daemon.

* src/threads/thread.c (threads_thread_new): Renamed to thread_new and
made static.
(threads_thread_free): Renamed to thread_free.
(threads_thread_start_internal): Use new function names.
(threads_thread_start): Likewise.
(threads_attach_current_thread): Likewise.
* src/threads/thread.h (threads_thread_new): Removed.
(threads_thread_free): Renamed to thread_free.

* src/threads/posix/thread-posix.c (threads_detach_thread): Use new
function names.

* src/threads/posix/threads.c: Renamed from here...
* src/threads/posix/threads.h,
src/threads/threads-common.c,
src/threads/threads-common.h: Likewise.

* src/threads/posix/thread-posix.c: ...to here.
* src/threads/posix/thread-posix.h,
src/threads/thread.c,
src/threads/thread.h: Likewise.

* src/mm/cacao-gc/gc.c,
src/mm/cacao-gc/gc.h,
src/mm/cacao-gc/rootset.c,
src/mm/cacao-gc/rootset.h,
src/mm/codememory.c,
src/mm/dumpmemory.c,
src/mm/memory.c,
src/native/jni.c,
src/native/jvmti/cacaodbg.c,
src/native/jvmti/cacaodbg.h,
src/native/jvmti/jvmti.c,
src/native/llni.c,
src/native/llni.h,
src/native/localref.c,
src/native/vm/cldc1.1/java_lang_Thread.c,
src/native/vm/gnu/java_lang_VMThread.c,
src/native/vm/sun/jvm.c,
src/threads/Makefile.am,
src/threads/posix/lock.c,
src/threads/posix/Makefile.am,
src/threads/threadlist.c,
src/threads/threadlist.h,
src/toolbox/logging.c,
src/vm/builtin.c,
src/vm/exceptions.c,
src/vm/finalizer.c,
src/vm/jit/alpha/linux/md-os.c,
src/vm/jit/arm/linux/md-os.c,
src/vm/jit/codegen-common.c,
src/vm/jit/i386/darwin/md-os.c,
src/vm/jit/i386/linux/md-os.c,
src/vm/jit/inline/inline.c,
src/vm/jit/intrp/asmpart.c,
src/vm/jit/intrp/engine.c,
src/vm/jit/jit.c,
src/vm/jit/methodtree.c,
src/vm/jit/optimizing/profile.c,
src/vm/jit/optimizing/recompile.c,
src/vm/jit/powerpc/codegen.c,
src/vm/jit/powerpc/darwin/md-os.c,
src/vm/jit/powerpc/linux/md-os.c,
src/vm/jit/powerpc64/linux/md-os.c,
src/vm/jit/replace.c,
src/vm/jit/s390/md.c,
src/vm/jit/show.c,
src/vm/jit/stacktrace.c,
src/vm/jit/trace.c,
src/vm/jit/x86_64/freebsd/md-os.c,
src/vm/jit/x86_64/linux/md-os.c,
src/vm/signal.c,
src/vm/vm.c: Changed filename occurrences.

--HG--
rename : src/threads/posix/threads.c => src/threads/posix/thread-posix.c
rename : src/threads/posix/threads.h => src/threads/posix/thread-posix.h
rename : src/threads/threads-common.c => src/threads/thread.c
rename : src/threads/threads-common.h => src/threads/thread.h

Fixes PR59.
* src/native/jni.c (_Jv_JNI_Get##name##Field): Added TRACEJNICALLS.
(_Jv_JNI_Set##name##Field): Likewise.
(_Jv_JNI_CallStaticObjectMethod): Likewise.
(_Jv_JNI_CallStaticObjectMethodV): Likewise.
(_Jv_JNI_CallStaticObjectMethodA): Likewise.
(_Jv_JNI_CallStaticVoidMethod): Likewise.
(_Jv_JNI_CallStaticVoidMethodV): Likewise.
(_Jv_JNI_CallStaticVoidMethodA): Likewise.
(_Jv_JNI_GetArrayLength): Likewise.
(_Jv_JNI_Get##name##ArrayElements): Likewise.
(_Jv_JNI_Get##name##ArrayRegion): Likewise.
(jni_attach_current_thread): Check correctly if current thread is
already attached.
(_Jv_JNI_DetachCurrentThread): Check if current thread is already
detached.
* src/threads/posix/threads.c (threads_detach_thread): Likewise.

* src/threads/threads-common.c (threads_init) [WITH_CLASSPATH_SUN]:
Resolve correct thread init method.
(thread_create_object): New function, but not yet implemented.
(thread_create_initial_thread): Lot of changes.

* src/threads/threads-common.h (thread_is_attached): New function.
(thread_current_is_attached): Likewise.

* src/vm/global.h (STR): New macro, stolen from OpenJDK.

* src/vm/vm.c (vm_run): Detach the main thread before calling
vm_destroy.
(vm_destroy): Attach the main thread again as DestroyJavaVM thread.

* src/threads/posix/threads.c (threads_set_current_threadobject):
Moved from here...
(threads_get_current_threadobject): Likewise.
* src/threads/posix/threads.h (thread_get_current): ...to here.
(thread_set_current): Likewise.
* src/threads/threads-common.h (threads_set_current_threadobject):
Removed.

* src/native/jni.c (jni_attach_current_thread): Use new function name.
(_Jv_JNI_DetachCurrentThread): Likewise.
(_Jv_JNI_GetEnv): Likewise.
* src/native/jvmti/cacaodbg.c (jvmti_get_current_thread): Likewise.
* src/threads/threads-common.c (threads_preinit): Likewise.

* configure.ac (AC_CHECK_WITH_HPI_MD_H): Added.
(AC_CHECK_WITH_HPI_H): Likewise.
* m4/classpath.m4 (AC_CHECK_WITH_CLASSPATH_CLASSES): Changed default
for OpenJDK.
(AC_CHECK_WITH_CLASSPATH_LIBDIR): Likewise.
(AC_CHECK_WITH_JNI_MD_H): Likewise.
(AC_CHECK_WITH_JNI_H): Likewise.

* m4/hpi.m4: New file.
* src/native/vm/nativevm.c (nativevm_preinit): Call hpi_initialize.
* src/native/vm/sun/Makefile.am (libnativevmcore_la_SOURCES): Added
hpi.[ch].
* src/native/vm/sun/hpi.c: New file.
* src/native/vm/sun/hpi.h: Likewise.

* src/native/vm/sun/jvm.c (JVM_GetLastErrorString): Use HPI function.
(JVM_NativePath): Likewise.
(JVM_Open): Likewise.
(JVM_Close): Likewise.
(JVM_Read): Likewise.
(JVM_Write): Likewise.
(JVM_Available): Likewise.
(JVM_Lseek): Likewise.
(JVM_SetLength): Likewise.
(JVM_Sync): Likewise.
(JVM_InitializeSocketLibrary): Call hpi_initialize_socket_library.

* src/vmcore/options.c (opt_TraceHPI): Added global variable.
(options_xx): Handle new option.
* src/vmcore/options.h: Likewise.

* src/native/vm/nativevm.c (nativevm_preinit) [WITH_CLASSPATH_SUN]:
Check for native_library_open error.

* src/vm/jit/stack.c (stack_analyse): Clean up: removed an obsolete
assignment to copy->varkind. (It is set in SET_TEMPVAR anyway.)

* src/vm/jit/stack.c (stack_analyse): Use the javaindex instead of the
CACAO varindex for checking conflicts with local variables. While there
is no real conflict between CACAO variables of different types, the
register allocator makes the implicit assumption that variables
corresponding to the same javaindex may be coalesced. As long as this
assumption is made, we must consider variables with the same javaindex
as conflicting (and also check against that in the verifier).
This fixes [Bug 49] VerifyError with obfuscated classes.

* src/vm/jit/stack.c (stack_analyse): Clean up the ICMD_IINC case so
it uses the javaindex variable. (No functional change.)

* src/vm/jit/jit.h (jitdata): Added reverselocalmap.

* src/vm/jit/parse.c (parse): Fill the reverselocalmap.

* src/vm/jit/verify/typecheck-common.h (verifier_state): Removed the
reverselocalmap.

* src/vm/jit/verify/typecheck.c (typecheck_invalidate_locals): Use
jd->reverselocalmap.
(typecheck): Likewise.

* tests/regression/jasmin/test_load_store_conflict_different_types.j:
New test exposing the bug in conflict checking for local variables
([Bug 49] VerifyError with obfuscated classes).

* tests/regression/jasmin/Makefile.am: Added new test.

* contrib/vmlog/vmlog_cacao.h: Removed #include of a header that does
not exist anymore.

* src/threads/posix/threads.c (threads_attach_current_thread):
Removed.
* src/threads/posix/threads.h: Likewise.
* src/threads/threads-common.c (threads_attach_current_thread): Added.
* src/threads/threads-common.h: Likewise.

* src/native/vm/nativevm.c (nativevm_preinit): Changed signature, use
system_* functions.
(nativevm_init): Changed signature.
* src/native/vm/nativevm.h: Likewise.

* src/native/vm/sun/jvm.c (JVM_InitProperties): Added
sun.nio.MaxDirectMemorySize handling.

* src/vm/global.h (PRINTF_FORMAT_INT64_T): Added define for int64_t
formater.

* src/vm/initialize.c (initialize_init): New function.
* src/vm/initialize.h: Likewise.

* src/vm/vm.c (vm_create): Added initialize_init.

* src/vmcore/options.c (opt_MaxDirectMemorySize): New global variable.
(options_xx): Use system_* functions.
* src/vmcore/options.h: Likewise.

* configure.ac (AC_CHECK_FUNCS): Added strcat, strcpy.
* src/vmcore/system.h (system_atoi): New function.
(system_strcat): Likewise.
(system_strcpy): Likewise.

* src/vmcore/loader.c (load_class_from_classbuffer_intern): Also call
resolve_handle_pending_exception for super interfaces.
* tests/regression/bugzilla/PR58.java (test): Renamed to
testSuperClass.
(testSuperInterface): New method.

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

* src/native/vm/sun/jvm.c (JVM_FindClassFromClassLoader): Added assert
on throwError.
(JVM_DoPrivileged): Throw PrivilegedActionException only if the
exception is an instance of java.lang.Exception but not of
java.lang.RuntimeException.

* src/vm/exceptions.c (exceptions_new_class_utf): New function.
(exceptions_throw_class_utf): Likewise.
(exceptions_throw_classnotfoundexception): Use
exceptions_throw_class_utf.
(exceptions_classnotfoundexception_to_noclassdeffounderror): Removed.
* src/vm/exceptions.h: Likewise.

* src/vm/resolve.c (resolve_handle_pending_exception): New function.
(resolve_class_from_name): Don't convert exception.
* src/vm/resolve.h (resolve_handle_pending_exception): Added.

* src/vmcore/class.c (class_java_lang_Exception): New global variable.
(class_java_lang_ClassNotFoundException): Likewise.
(class_java_lang_RuntimeException): Likewise.
* src/vmcore/class.h: Likewise.

* src/vmcore/linker.c (linker_init): Link new global classes.
* src/vmcore/loader.c (loader_init): Load new global classes.

* src/vmcore/utf8.c (utf_java_lang_RuntimeException): New global
variable.
(utf8_init): Initialize new global variable.
* src/vmcore/utf8.h (utf_java_lang_RuntimeException): Export.

* tests/regression/bugzilla/All.java: Added PR58.
* tests/regression/bugzilla/PR58.java: New file.

* tests/Makefile.am: Cleanup, removed checkall, added build target.
* tests/A2.java: Removed.
* tests/AA.java,
tests/AA1.java,
tests/AA2.java,
tests/BB.java,
tests/C.java,
tests/C2.java,
tests/C3.java,
tests/CC.java,
tests/D.java,
tests/DD.java,
tests/EE.java,
tests/GG.java,
tests/HI2.java,
tests/II.java,
tests/IIAA.java,
tests/IIBB.java,
tests/IICC.java,
tests/IIexample.java,
tests/n.java,
tests/scribble.java: Likewise.

* tests/regression/bugzilla/All.java: Added PR57.
* tests/regression/bugzilla/PR57.java: New file.

* tests/regression/bugzilla/Makefile.am (JAVA): Added LD_LIBRARY_PATH
so we can really overrite JAVA.
(build): Added $(srcdir) to find .java files.
(check): Removed LD_LIBRARY_PATH.

* src/threads/native/Makefile.am: Removed.
* src/threads/native/generic-primitives.h,
src/threads/native/lock.c,
src/threads/native/lock.h,
src/threads/native/threadlist-posix.c,
src/threads/native/threads.c,
src/threads/native/threads.h: Likewise.

* configure.ac (AC_CONFIG_FILES): Moved src/threads/native/Makefile to
src/threads/posix/Makefile.

* src/threads/posix/Makefile.am,
src/threads/posix/generic-primitives.h,
src/threads/posix/lock.c,
src/threads/posix/lock.h,
src/threads/posix/threadlist-posix.c,
src/threads/posix/threads.c,
src/threads/posix/threads.h: Moved from src/threads/native/.

* src/mm/cacao-gc/gc.h,
src/mm/cacao-gc/rootset.h,
src/native/jvmti/cacaodbg.c,
src/native/jvmti/cacaodbg.h,
src/native/jvmti/jvmti.c,
src/native/llni.h,
src/threads/Makefile.am,
src/threads/lock-common.h,
src/threads/threads-common.c,
src/threads/threads-common.h,
src/vm/builtintable.inc,
src/vm/jit/alpha/linux/md-os.c,
src/vm/jit/arm/linux/md-os.c,
src/vm/jit/intrp/asmpart.c,
src/vm/jit/intrp/dynamic-super.c,
src/vm/jit/intrp/engine.c,
src/vm/jit/powerpc/darwin/md-os.c,
src/vm/jit/powerpc/linux/md-os.c,
src/vm/jit/powerpc64/linux/md-os.c,
src/vm/jit/s390/codegen.c,
src/vm/jit/s390/emit.c,
src/vm/jit/s390/md.c,
src/vm/jit/show.c,
src/vm/jit/stacktrace.c,
src/vm/jit/x86_64/freebsd/md-os.c,
src/vm/jit/x86_64/linux/md-os.c: Fixed header includes.

--HG--
rename : src/threads/native/Makefile.am => src/threads/posix/Makefile.am
rename : src/threads/native/generic-primitives.h => src/threads/posix/generic-primitives.h
rename : src/threads/native/lock.c => src/threads/posix/lock.c
rename : src/threads/native/lock.h => src/threads/posix/lock.h
rename : src/threads/native/threadlist-posix.c => src/threads/posix/threadlist-posix.c
rename : src/threads/native/threads.c => src/threads/posix/threads.c
rename : src/threads/native/threads.h => src/threads/posix/threads.h

* src/cacaoh/Makefile.am: Changed copyright.

Dummy push for testing.

Dummy push for testing.

Dummy push for testing.

Dummy push for testing.

* src/toolbox/list.c (list_add_first_unsynced): Removed.
(list_add_last_unsynced): Likewise.
(list_remove_unsynced): Likewise.
(list_first_unsynced): Likewise.
(list_last_unsynced): Likewise.
(list_next_unsynced): Likewise.
(list_prev_unsynced): Likewise.
* src/toolbox/list.h: Likewise.

* src/mm/cacao-gc/gc.c,
src/mm/cacao-gc/mark.c,
src/mm/cacao-gc/rootset.c,
src/threads/native/lock.c,
src/threads/threadlist.c,
src/vm/assertion.c,
src/vm/jit/codegen-common.c,
src/vm/jit/emit-common.c,
src/vm/jit/linenumbertable.c,
src/vm/jit/optimizing/recompile.c,
src/vm/jit/patcher-common.c,
src/vm/jit/s390/codegen.c,
src/vm/properties.c: Use normal list functions instead of the unsynced
ones.

* src/vm/jit/cfg.c (cfg_build): Fixed off by one in predecessorcount for exception handler blocks. See #53.

Fixes PR52.
* src/vm/array.c (array_objectarray_element_set): Use
builtin_canstore.

* .hgignore (tests/regression/assertion/*.class)
(tests/regression/assertion/packagetest/*.class)
(tests/regression/bugzilla/*.class): Added.
* configure.ac (AC_CONFIG_FILES): Added
tests/regression/bugzilla/Makefile.
* tests/regression/Makefile.am (SUBDIRS): Added bugzilla.
* tests/regression/bugzilla/All.java: New file.
* tests/regression/bugzilla/Makefile.am: Likewise.
* tests/regression/bugzilla/PR52.java: Likewise.

* src/vm/array.c (array_length_get): Removed IllegalArgumentException
check for size.
* src/native/vm/sun/jvm.c (JVM_NewMultiArray): Explicitely check for
exceptions.

* src/vm/access.c (access_check_field): Changed signature, use
stacktrace_get_caller_class.
(access_check_method): Likewise.
* src/vm/access.h: Likewise.
* src/native/vm/gnu/java_lang_reflect_Field.c (_field_access_check):
Adapted access_check_field call.
* src/native/vm/java_lang_reflect_Constructor.c (newInstance): Likewise.
* src/native/vm/java_lang_reflect_Method.c (invoke): Likewise.

* src/vm/array.c (array_element_get): Do a null-pointer check.
(array_element_primitive_get): Likewise.
(array_element_primitive_set): Likewise.
(array_objectarray_element_set): Check if the object can be stored in
the array.

* src/native/vm/sun/jvm.c (JVM_NewArray): Check for error on
primitive_arrayclass_get_by_name.
(JVM_NewMultiArray): Check for error on array_length_get.

* src/vm/array.c (array_##name##array_element_get): Fixed
ArrayIndexOutOfBoundsException check.
(array_objectarray_element_get): Likewise.
(array_##name##array_element_set): Likewise.
(array_objectarray_element_set): Likewise.

* src/vm/array.c (array_length_get): Check length and thrown an
exception in case.

* src/vm/primitive.c (primitive_unbox): Check for NULL values.

* src/vm/jit/stacktrace.c [ENABLE_JAVASE]
(stacktrace_get_caller_class): New function.
* src/vm/jit/stacktrace.h: Likewise.

* src/native/vm/gnu/gnu_classpath_VMStackWalker.c (getCallingClass):
Use stacktrace_get_caller_class.
(getCallingClassLoader): Likewise.
(firstNonNullClassLoader): Use stacktrace_first_nonnull_classloader.

* src/native/vm/sun/jvm.c (JVM_GetCallerClass): Use
stacktrace_get_caller_class.

* src/vm/vm.c (vm_create): Call method_init.

* src/vmcore/method.c (method_java_lang_reflect_Method_invoke): New
global variable.
(method_init): New function.
* src/vmcore/method.h: Likewise.

* src/vmcore/utf8.c (utf_invoke): New global variable.
* src/vmcore/utf8.h: Likewise.

* src/vm/jit/trace.c (trace_java_call_print_argument): Pass
methodinfo, added sun.misc.Unsafe check.
(trace_java_call_enter, trace_java_call_exit): Pass methodinfo to
trace_java_call_print_argument.

* src/native/vm/sun_misc_Unsafe.c (putIntVolatile): Implemented.
(putLongVolatile): Likewise.
(putOrderedObject): Likewise.
(putOrderedInt): Likewise.
(putOrderedLong): Likewise.
(UNSAFE_GET_VOLATILE): Added macro.
(UNSAFE_PUT_VOLATILE): Likewise.
(getIntVolatile): Use UNSAFE_GET_VOLATILE.
(getLongVolatile

* src/vm/jit/trace.c (trace_java_call_exit): Workaround for
sun.misc.Unsafe.staticFieldBase().

Merging 7971:887db7d64bc9 with 7970:21b063622472.

* src/vm/jit/cfg.c (cfg_build): Support for strange basicblocks, where an IF can be followed by a NOP and GOTO.
* src/vm/jit/jit.c (jit_compile_intern) [ENABLE_SSA]: Adapted for changes.
* src/vm/jit/optimizing/ssa3.c: Changed a lot.
* src/vm/jit/stack.c (stack_reach_next_block) [STACK_VERBOSE]: More verbosity to identify basicblocks where an IF can be followed by a GOTO.

* src/threads/native/generic-primitives.h
(MEMORY_BARRIER_BEFORE_ATOMIC): Removed.
* src/vm/jit/alpha/machine-instr.h,
src/vm/jit/arm/machine-instr.h,
src/vm/jit/i386/machine-instr.h,
src/vm/jit/m68k/machine-instr.h,
src/vm/jit/mips/machine-instr.h,
src/vm/jit/powerpc/machine-instr.h,
src/vm/jit/powerpc64/machine-instr.h,
src/vm/jit/s390/machine-instr.h,
src/vm/jit/sparc64/machine-instr.h,
src/vm/jit/x86_64/machine-instr.h: Likewise.

* src/native/vm/sun_misc_Unsafe.c (setMemory): Fixed compiler warning
on 32-bit architectures.
(copyMemory): Likewise.

* src/threads/native/generic-primitives.h (atomic_add): Removed.
* src/threads/native/threads.c [USE_FAKE_ATOMIC_INSTRUCTIONS]
(_atomic_add_lock): Removed.
* src/vm/jit/alpha/machine-instr.h (atomic_add): Removed.
* src/vm/jit/arm/machine-instr.h,
src/vm/jit/i386/machine-instr.h,
src/vm/jit/mips/machine-instr.h,
src/vm/jit/powerpc/machine-instr.h,
src/vm/jit/s390/machine-instr.h,
src/vm/jit/sparc64/machine-instr.h,
src/vm/jit/x86_64/machine-instr.h: Likewise.

* src/native/vm/gnu/java_lang_VMThread.c (interrupt): Use
thread_get_thread.
(isInterrupted): Likewise.
(nativeSetPriority): Likewise.
(getState): Likewise.
* src/native/vm/sun/jvm.c (threads/threadlist.h): Removed.
(JVM_IsThreadAlive): Use thread_get_thread.
(JVM_SetThreadPriority): Likewise.
(JVM_Interrupt): Implemented.
(JVM_IsInterrupted): Use thread_get_thread.

* src/threads/threads-common.c (thread_get_thread): New function.
* src/threads/threads-common.h: Likewise.

* src/classes/gnu/sun/misc/Unsafe.java: Imported the OpenJDK 6
version.
* src/native/vm/sun_misc_Unsafe.c (vmcore/system.h): Added.
(setMemory, copyMemory): Changed to be OpenJDK 6 compatible.

* contrib/setenvinstalled.in: Updated BOOTCLASSPATH.
* contrib/setenvsource.in: Likewise.

* .hgignore: Removed src/lib/classes/ and src/lib/vm.zip, added
src/classes/classes/ and src/classes/vm.zip.

* configure.ac (AC_CONFIG_FILES): Removed src/lib/Makefile, added
src/classes/Makefile.
* m4/classpath.m4 (AC_CHECK_WITH_CLASSPATH_CLASSES): Fixed
BOOTCLASSPATH.
* src/Makefile.am (DIST_SUBDIRS): Removed lib, added classes.
(SUBDIRS): Likewise.

* src/classes/Makefile.am,
src/classes/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java,
src/classes/gnu/gnu/classpath/VMStackWalker.java,
src/classes/gnu/gnu/classpath/VMSystemProperties.java,
src/classes/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java,
src/classes/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
src/classes/gnu/java/lang/VMClassLoader.java,
src/classes/gnu/java/lang/VMString.java,
src/classes/gnu/java/lang/VMThread.java,
src/classes/gnu/java/lang/reflect/Constructor.java,
src/classes/gnu/java/lang/reflect/Field.java,
src/classes/gnu/java/lang/reflect/Method.java,
src/classes/gnu/java/security/VMAccessController.java,
src/classes/gnu/sun/misc/Unsafe.java,
src/classes/gnu/sun/reflect/ConstantPool.java,
src/classes/gnu/sun/reflect/annotation/AnnotationParser.java,
src/classes/gnu/sun/reflect/annotation/AnnotationType.java,
src/classes/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java,
src/classes/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java,
src/classes/gnu/sun/reflect/annotation/ExceptionProxy.java,
src/classes/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java,
src/native/include/Makefile.am: Moved from lib.

* src/lib/Makefile.am,
src/lib/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java,
src/lib/gnu/gnu/classpath/VMStackWalker.java,
src/lib/gnu/gnu/classpath/VMSystemProperties.java,
src/lib/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java,
src/lib/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
src/lib/gnu/java/lang/VMClassLoader.java,
src/lib/gnu/java/lang/VMString.java,
src/lib/gnu/java/lang/VMThread.java,
src/lib/gnu/java/lang/reflect/Constructor.java,
src/lib/gnu/java/lang/reflect/Field.java,
src/lib/gnu/java/lang/reflect/Method.java,
src/lib/gnu/java/security/VMAccessController.java,
src/lib/gnu/sun/misc/Unsafe.java,
src/lib/gnu/sun/reflect/ConstantPool.java,
src/lib/gnu/sun/reflect/annotation/AnnotationParser.java,
src/lib/gnu/sun/reflect/annotation/AnnotationType.java,
src/lib/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java,
src/lib/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java,
src/lib/gnu/sun/reflect/annotation/ExceptionProxy.java,
src/lib/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java:
Moved to lib.

--HG--
rename : src/lib/Makefile.am => src/classes/Makefile.am
rename : src/lib/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java => src/classes/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java
rename : src/lib/gnu/gnu/classpath/VMStackWalker.java => src/classes/gnu/gnu/classpath/VMStackWalker.java
rename : src/lib/gnu/gnu/classpath/VMSystemProperties.java => src/classes/gnu/gnu/classpath/VMSystemProperties.java
rename : src/lib/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java => src/classes/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java
rename : src/lib/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java => src/classes/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java
rename : src/lib/gnu/java/lang/VMClassLoader.java => src/classes/gnu/java/lang/VMClassLoader.java
rename : src/lib/gnu/java/lang/VMString.java => src/classes/gnu/java/lang/VMString.java
rename : src/lib/gnu/java/lang/VMThread.java => src/classes/gnu/java/lang/VMThread.java
rename : src/lib/gnu/java/lang/reflect/Constructor.java => src/classes/gnu/java/lang/reflect/Constructor.java
rename : src/lib/gnu/java/lang/reflect/Field.java => src/classes/gnu/java/lang/reflect/Field.java
rename : src/lib/gnu/java/lang/reflect/Method.java => src/classes/gnu/java/lang/reflect/Method.java
rename : src/lib/gnu/java/security/VMAccessController.java => src/classes/gnu/java/security/VMAccessController.java
rename : src/lib/gnu/sun/misc/Unsafe.java => src/classes/gnu/sun/misc/Unsafe.java
rename : src/lib/gnu/sun/reflect/ConstantPool.java => src/classes/gnu/sun/reflect/ConstantPool.java
rename : src/lib/gnu/sun/reflect/annotation/AnnotationParser.java => src/classes/gnu/sun/reflect/annotation/AnnotationParser.java
rename : src/lib/gnu/sun/reflect/annotation/AnnotationType.java => src/classes/gnu/sun/reflect/annotation/AnnotationType.java
rename : src/lib/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java => src/classes/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java
rename : src/lib/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java => src/classes/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java
rename : src/lib/gnu/sun/reflect/annotation/ExceptionProxy.java => src/classes/gnu/sun/reflect/annotation/ExceptionProxy.java
rename : src/lib/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java => src/classes/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java

* m4/classpath.m4 (AC_CHECK_WITH_CLASSPATH_CLASSES): Set BOOTCLASSPATH
for Makefiles.
* tests/regression/Makefile.am,
tests/regression/assertion/Makefile.am,
tests/regression/codepatching/Makefile.am,
tests/regression/jasmin/Makefile.am,
tests/regression/native/Makefile.am,
tests/regression/resolving/Makefile.am (BOOTCLASSPATH): Removed.

* Merged with 60f051a3c5ae.

* Merged with b78ab2bd233a.

--HG--
branch : methodtree-branch

* src/vm/jit/intrp/asmpart.c: Replaced codegen_get_pv_from_pc with
methodtree_find.

--HG--
branch : methodtree-branch

* src/vm/jit/s390/md.c: Replaced codegen_get_pv_from_pc with
methodtree_find.
* src/vm/jit/s390/md.h: Likewise.

--HG--
branch : methodtree-branch

* src/vm/jit/methodtree.c (threads/threads-common.h): Added.
(methodtree_find): Removed unnecessary assert.

--HG--
branch : methodtree-branch

* src/vm/jit/m68k/md.h: Replaced codegen_get_pv_from_pc with
methodtree_find.

--HG--
branch : methodtree-branch

* src/vm/jit/i386/asmpart.S: Replaced codegen_get_pv_from_pc with
methodtree_find.
* src/vm/jit/i386/cygwin/md-asm.h
src/vm/jit/i386/darwin/md-asm.h,
src/vm/jit/i386/md.h: Likewise.

--HG--
branch : methodtree-branch

* src/vm/jit/methodtree.c: New file.
* src/vm/jit/methodtree.h: Likewise.
* src/vm/jit/Makefile.am (libjit_la_SOURCES): Added methodtree.[ch].

* src/vm/jit/codegen-common.c (methodtree): Removed.
(codegen_init): Removed methodtree stuff.
(methodtree_comparator): Removed.
(codegen_insertmethod): Likewise.
(codegen_get_pv_from_pc): Likewise.
(codegen_get_pv_from_pc_nocheck): Likewise.
(codegen_finish): Call methodtree_insert.
* src/vm/jit/codegen-common.h (methodtree_element): Removed.
(codegen_insertmethod): Likewise.
(codegen_get_pv_from_pc): Likewise.
(codegen_get_pv_from_pc_nocheck): Likewise.

* src/vm/vm.c (vm_create): Call methodtree_init.

* src/vm/jit/code.c,
src/vm/jit/optimizing/profile.c,
src/vm/jit/stacktrace.c,
src/vm/jit/x86_64/asmpart.S,
src/vm/jit/x86_64/md.h,
src/vm/signal.c: Replaced codegen_get_pv_from_pc* with
methodtree_find*.

--HG--
branch : methodtree-branch

* src/vm/jit/inline/inline.c (inline_add_blocknr_reference): Commented
as it's not used and produces a compiler warning.
* src/vm/jit/inline/inline_debug.inc (debug_dump_inline_context):
Likewise.

* src/lib/gnu/java/lang/VMThrowable.java: Removed, as the local
changes made years ago are not necessary.
* src/lib/Makefile.am (VM_JAVA_FILES_GNU): Removed
gnu/java/lang/VMThrowable.java.

* src/native/vm/gnu/java_lang_VMThrowable.c (fillInStackTrace): Use
vmdata instead of vmData.
(getStackTrace): Likewise.
* src/vm/jit/stacktrace.c (stacktrace_print_exception)
[WITH_CLASSPATH_GNU]: Likewise.

* src/threads/native/threads.c (threads_detach_thread): Fixed compiler
warning.

* src/vm/jit/alpha/linux/md-os.c (md_replace_executionstate_read):
Renamed to md_executionstate_read.
(md_replace_executionstate_write): Renamed to md_executionstate_write.

--HG--
branch : executionstate-branch