* src/vm/jit/s390/codegen.h (N_BRANCH_MIN, N_BRANCH_MAX): Fix (muliply by 2).

* src/vm/jit/argument.c (argument_vmarray_store_adr): Fixed for handles.
* src/vm/vm.c (vm_call_array): Likewise.

* src/vm/vm.c (vm_call_array): Made static, removed compiler call.
(vm_call_method_objectarray): Added.
(vm_call_method_valist): Added nativeworld macros, added compiler call.
(vm_call_method_jvalue): Likewise.

* src/vm/vm.h (vm_call_array): Removed prototypes.
(vm_call_method_objectarray): Added prototype.

* src/native/jni.c (_Jv_jni_invokeNative): Moved parts to vm.c for clearness.

* src/vm/jit/code.c (code_get_methodinfo_for_pv): Return NULL if code
is NULL (asm_vm_call_method).

* src/threads/threads-common.c (vmcore/options.h): Fixed include.

* src/mm/memory.c (memory_mprotect): Fixed signature, manpage is wrong
about the signature of mprotect.
* src/mm/memory.h: Likewise.

* src/vm/jit/argument.c (argument_vmarray_store_int),
(argument_vmarray_store_lng),
(argument_vmarray_store_flt),
(argument_vmarray_store_dbl),
(argument_vmarray_store_adr),
(argument_vmarray_from_valist),
(argument_vmarray_from_jvalue),
(argument_vmarray_from_objectarray): Moved from vm.c to this file.

* src/vm/jit/argument.h (argument_vmarray_from_valist): Added prototype.
(argument_vmarray_from_jvalue): Likewise.
(argument_vmarray_from_objectarray): Likewise.

* src/vm/vm.c: See above!

* src/vm/vm.h (vm_array_from_objectarray): Removed prototype.

* src/native/jni.c (_Jv_jni_invokeNative): Adapted to above changes.

* src/vmcore/class.c (class_is_primitive,
class_is_anonymousclass,
class_is_array,
class_is_interface,
class_is_localclass,
class_is_memberclass,
class_get_classloader,
class_get_superclass): Moved to class.h and made them static inline.
* src/vmcore/class.h: Likewise.

* src/threads/lock-common.h: Removed obsolete comment.
* src/toolbox/logging.c (threads/threads-common.h): Added include.

* src/mm/gc-common.h (heap_hashcode): Added inline function.

* src/native/jni.c: Use above function throughout file.
* src/native/vm/gnu/java_lang_VMSystem.c: Likewise.
* src/threads/native/lock.c: Likewise.
* src/vmcore/loader.c: Likewise.

* src/threads/native/lock.c: Renamed monitorPtr to lockword in the
whole file.
(stdint.h): Added.

* src/vm/global.h (stdint.h): Added.
(java_object_t): Renamed monitorPtr to lockword and changed the type
to uintptr_t.

* src/threads/native/threads.c (threads_init): Removed obsolete call to register
references with the GC.

* src/threads/threads-common.c (threads_thread_new): Also register reference
to exception object with the GC.

* src/threads/native/threads.c: Improved debug output.
* src/threads/threads-common.c: Likewise.

* src/threads/threads-common.h (DEBUGTHREADS): Added.

* src/vm/vm.c (vm_create): Removed -verbose:threads option.

* src/vmcore/options.c (opt_DebugThreads): Added -XX:+DebugThreads option.
* src/vmcore/options.h (opt_DebugThreads): Likewise.

* src/threads/native/threads.h (native/include/java_lang_Thread.h): Removed.
(threadobject): The object pointer is of type java_object_t now.

* src/threads/native/threads.c: Adapted to above changes and use LLNI macros.

* src/threads/threads-common.h (threads_thread_start): Changed signature to not
use java_lang_Thread anymore.

* src/threads/threads-common.c: Adapted to above changes and use LLNI macros.
(threads_preinit): Fixed corruption of mainthread->flags.

* src/vm/jit/alpha/md.c (md_patch_replacement_point): Removed debug code.
* src/vm/jit/i386/md.c: Likewise.
* src/vm/jit/mips/md.c: Likewise.
* src/vm/jit/powerpc/md.c: Likewise.
* src/vm/jit/powerpc64/md.c: Likewise.
* src/vm/jit/sparc64/md.c: Likewise.
* src/vm/jit/x86_64/md.c: Likewise.

* src/vm/jit/replace.c
(replace_activate_replacement_points) [ENABLE_DISASSEMBLER]: Improved debug.
(replace_deactivate_replacement_points) [ENABLE_DISASSEMBLER]: Likewise.

* src/native/localref.c [ENABLE_HANDLES] (localref_native_exit): Implemented.
(localref_native_enter): Renamed from localref_fill.

* src/native/localref.h (localref_native_exit): Added prototype.
(localref_native_enter): Renamed from localref_fill.

* src/vm/jit/argument.c (argument_jitreturn_store): Implemented.

* src/vm/jit/argument.h (argument_jitreturn_store): Added prototype.

* src/vm/jit/codegen-common.c (codegen_start_native_call): Improved comments
and adapted to above changes.
(codegen_finish_native_call): Likewise.

* src/cacaoh/dummy.c (llni_critical_start, llni_critical_end): Removed aborts.

* src/vm/signal.c (signal_handle): Wrap and unwrap references correctly.

* src/vm/jit/replace.c (replace_find_replacement_point_for_pc): Fixed assertion.
(replace_me_wrapper): Simplified search for replacement point.

* src/vm/jit/alpha/linux/md-os.c (md_replace_executionstate_write): Fixed
compiler warning.

* src/vm/jit/x86_64/linux/md-os.c (md_replace_executionstate_read): Implemented.
(md_replace_executionstate_write): Likewise.

* src/vm/jit/i386/arch.h (REPLACEMENT_PATCH_SIZE): Adapted to new trap mcode.
* src/vm/jit/x86_64/arch.h (REPLACEMENT_PATCH_SIZE): Likewise.

* src/vm/jit/codegen-common.c (codegen_set_replacement_point): Add NOPs if
replacement testing mode is enabled.

* src/vm/jit/replace.c (replace_me_wrapper): Finished implementation.
(replace_me): Major code cleanup. Removed safestack stuff.
(replace_build_execution_state): Likewise.
(replace_activate_replacement_points): Adapted changes from previous rev.
(replace_deactivate_replacement_points): Likewise.
(replace_alloc_safestack): Removed.
(replace_free_safestack): Removed.

* src/vm/jit/replace.h (replace_safestack_t): Removed.
(md_replace_executionstate_read): Added prototype.
(md_replace_executionstate_write): Likewise.

* src/vm/signal.c (signal_handle): Adapted to new replace_me_wrapper.

* src/vm/signallocal.h (signal_handle): Changed signature.

* src/vm/signal.c (signal_handles): Create stackframeinfo here.

* src/vm/jit/alpha/linux/md-os.c (md_signal_handler_sigsegv): Adapted to new
signature and removed stackframeinfo creation.

* src/vm/jit/arm/linux/md-os.c: Likewise.
* src/vm/jit/i386/darwin/md-os.c: Likewise.
* src/vm/jit/i386/linux/md-os.c: Likewise.
* src/vm/jit/m68k/linux/md-os.c: Likewise.
* src/vm/jit/mips/irix/md-os.c: Likewise.
* src/vm/jit/mips/linux/md-os.c: Likewise.
* src/vm/jit/powerpc/darwin/md-os.c: Likewise.
* src/vm/jit/powerpc/linux/md-os.c: Likewise.
* src/vm/jit/powerpc64/linux/md-os.c: Likewise.
* src/vm/jit/s390/md.c: Likewise.
* src/vm/jit/sparc64/linux/md-os.c: Likewise.
* src/vm/jit/sparc64/solaris/md-os.c: Likewise.
* src/vm/jit/x86_64/linux/md-os.c: Likewise.

* src/vm/jit/i386/asmpart.S (asm_replacement_in, asm_replacement_out): Removed
obsolete functions.

* src/vm/jit/i386/cygwin/md-asm.h: Likewise.
* src/vm/jit/i386/darwin/md-asm.h: Likewise.
* src/vm/jit/mips/asmpart.S: Likewise.
* src/vm/jit/powerpc/asmpart.S: Likewise.
* src/vm/jit/powerpc/darwin/md-asm.h: Likewise.
* src/vm/jit/powerpc64/asmpart.S: Likewise.
* src/vm/jit/s390/asmpart.S: Likewise.
* src/vm/jit/x86_64/asmpart.S: Likewise.

* src/vm/jit/m68k/emit.c (emit_replacement_stubs): Removed obsolete function.
* src/vm/jit/i386/linux/md-os.c: Reordered functions in file.

* src/vm/jit/alpha/md.c (md_patch_replacement_point): Changed signature.

* src/vm/jit/i386/md.c: Likewise.
* src/vm/jit/mips/md.c: Likewise.
* src/vm/jit/powerpc/md.c: Likewise.
* src/vm/jit/powerpc64/md.c: Likewise.
* src/vm/jit/s390/md.c: Likewise.
* src/vm/jit/sparc64/md.c: Likewise.
* src/vm/jit/x86_64/md.c: Likewise.

* src/vm/jit/jit.c (jit_compile_intern) [ENABLE_REPLACEMENT]: Activate
replacement points after code generation if testing option is given.

* src/vmcore/options.c [ENABLE_REPLACEMENT] (opt_TestReplacement): Added
replacement testing option.

* src/vmcore/options.h [ENABLE_REPLACEMENT] (opt_TestReplacement): Likewise.

* src/vmcore/statistics.c (size_stacksize): New variable.
(statistics_print_memory_usage): Print new variable.
* src/vmcore/statistics.h (size_stacksize): Added.

* src/mm/memory.c (memory_mprotect): New function.
* src/mm/memory.h: Likewise.

* src/vm/signal.c (signal_handle): Fixed debug output.

* src/threads/native/threads.c (threads_impl_thread_start): Print
error of return value (errno is not set by pthread functions).

* src/threads/threads-common.c (list_threads_free): Renamed to
list_free_thread_index.
(thread_index_t): New type.
(threads_preinit): Initialize list_free_thread_index.
(threads_thread_new): Use list_free_thread_index
(threads_thread_free): Likewise and free the threadobject.

* src/vmcore/statistics.c (stdint.h): Added.
(size_thread_index_t): Likewise.
(statistics_print_memory_usage): Print size_thread_index_t.
* src/vmcore/statistics.h (stdint.h): Added.
(size_thread_index_t): Likewise.

 * src/vm/jit/codegen-common.c (codegen_start_native_call, codegen_finish_native_call) [__S390__]: Adapted for s390.
 * src/vm/jit/s390/codegen.c (codegen_emit_stub_native): Adapted for builtin stubs.
 * src/vm/jit/s390/md-abi.c (md_param_alloc_native): On stack arguments are now already set off by the linkage area size.

 * src/vm/jit/s390/emit.c (emit_verbosecall_enter, emit_verbosecall_exit): Adapted to modified trace_java_call_enter and trace_jave_call_exit.

* configure.ac (AC_CHECK_FUNCS): Added getsockopt.

* src/native/vm/sun/jvm.c (stdint.h): Added.
(sys/types.h): Likewise.
(JVM_HoldsLock): Implemented.
(JVM_SocketAvailable): Likewise.
(JVM_GetSockOpt): Likewise.
(JVM_SetSockOpt) [HAVE_SETSOCKOPT]: Added #ifdef.

* src/vm/jit/alpha/codegen.c (codegen_emit_stub_native): Save and
restore floats as float so the trace functions can print them
correctly.

* src/vmcore/options.c (opt_DebugStackTrace): Changed type to int.
(options_xx): Forgot to handle opt_DebugStackTrace.
* src/vmcore/options.h (opt_DebugStackTrace): Changed type to int.

* src/vmcore/class.c [!NDEBUG] (class_classref_or_classinfo_println):
Added missing #ifdef.

* src/vmcore/loader.c (loader_init): Don't use utf_java_lang_System.

* src/vmcore/utf8.c (utf_java_lang_System): Removed.
(utf8_init): Likewise.
* src/vmcore/utf8.h: Likewise.

* src/vm/exceptions.c (exceptions_init): Changed return value to void,
removed class_java_lang_Throwable loading and linking.
(exceptions_throw_linkageerror): Removed unused variable o.

* src/vm/exceptions.h (exceptions_init): Changed return value to void.
(new_exception_utfmessage): Removed.

* src/vm/vm.c (vm_create): Don't check return value of
exceptions_init.

* src/cacaoh/dummy.c (vm_initializing): Added.

* src/vm/exceptions.c (exceptions_init): Removed all class loads and
links.
(exceptions_abort): New function.
(exceptions_new_class): Removed.
(exceptions_throw_class): Likewise.
(exceptions_new_class_utf): Likewise.
(exceptions_throw_class_utf): Likewise.
(exceptions_throw_classnotfoundexception): Use
exceptions_throw_utf_utf.
(exceptions_throw_noclassdeffounderror): Likewise.
(exceptions_throw_linkageerror): Likewise.
(exceptions_throw_nosuchmethoderror): Likewise.
(exceptions_throw_unsatisfiedlinkerror: Likewise.
(exceptions_new_classcastexception): Use exceptions_new_utf_utf.
(exceptions_throw_outofmemoryerror): Use exceptions_throw_utf.
(exceptions_throw_nullpointerexception): Likewise.
(exceptions_new_nullpointerexception): Use exceptions_new_utf.
(exceptions_classnotfoundexception_to_noclassdeffounderror): Load
java/lang/ClassNotFoundException explicitly.

* src/vm/initialize.c (initialize_class_intern): Load
java/lang/Exception explicitly.

* src/vmcore/class.c (class_java_lang_Error): Removed.
(class_java_lang_LinkageError): Likewise.
(class_java_lang_NoClassDefFoundError): Likewise.
(class_java_lang_OutOfMemoryError): Likewise.
(class_java_lang_VirtualMachineError): Likewise.
(class_java_lang_Exception): Likewise.
(class_java_lang_ClassCastException): Likewise.
(class_java_lang_ClassNotFoundException): Likewise.
* src/vmcore/class.h: Likewise.

* src/vmcore/linker.c (linker_init): Added class_java_lang_Throwable
and class_java_lang_VMThrowable.

* src/vmcore/loader.c (loader_preinit): Don't check for error on
load_class_bootstrap, this is now done in the exception functions.
(loader_init): Likewise.
(load_class_bootstrap): Removed utf_java_lang_Object check.

* src/vmcore/utf8.c (utf_java_lang_VMThrowable): Removed.
* src/vmcore/utf8.h: Likewise.

* src/vm/properties.c (properties_dump): New function.
* src/vm/properties.h: Likewise.

* doc/Makefile.am (dist_noinst_DATA): Added annotations.tex and jsr.bib
(annotations): New target which creates annotations.dvi
(clean): Clean the annotations.aux/.bbl/.dvi/... files.

* doc/annotations.tex: New file. This is the documentation of the annotations
support implementation.

* doc/jsr.bib: New file. Contains bibtex reference for JSR202.

* src/cacaoh/cacaoh.c (main): Removed linkverbose.

* src/vm/vm.c (vm_printconfig): Made static.
(vm_create): Call vm_printconfig after the VM is initialized.
* src/vm/vm.h (vm_printconfig): Removed.

* src/vmcore/linker.c (TRACELINKCLASS): New macro.
(link_class_intern): Use TRACELINKCLASS.

* src/vmcore/options.c (linkverbose): Removed.
(opt_TraceLinkClass): Added.
(options_xx): OPT_PrintConfig: Don't call vm_printconfig,
OPT_TraceLinkClass: Added.
* src/vmcore/options.h (linkverbose): Removed.
(opt_TraceLinkClass): Added.

* src/vm/jit/patcher-common.c (patcher_handler) [!NDEBUG]: #ifdef'ed
debug output.

* src/threads/native/lock.c (lock_record_notify): Ignore already
signaled threads.

* src/native/vm/sun/jvm.c (JVM_GetClassAccessFlags): Use
TRACEJVMCALLS.

* configure.ac (AC_CHECK_FUNCS): Added fsync.
* src/native/vm/sun/jvm.c (JVM_Sync): Implemented.

* src/native/vm/sun_misc_Unsafe.c (staticFieldOffset): Return 0.
(staticFieldBase): Return the pointer to value.

* src/native/vm/gnu/java_lang_VMClass.c (getModifiers): Use
class_get_modifiers.
* src/native/vm/sun/jvm.c (JVM_GetClassModifiers): Likewise.

* src/native/vm/java_lang_Class.c (class_get_modifiers): Removed.
* src/native/vm/java_lang_Class.h: Likewise.

* src/vmcore/class.c (class_get_modifiers): New function.
* src/vmcore/class.h: Likewise.

* src/native/vm/sun/jvm.c (JVM_GetStackAccessControlContext): Use
TRACEJVMCALLS.
(JVM_AssertionStatusDirectives): Likewise.

* src/native/vm/sun/jvm.c (JVM_IsThreadAlive): Use LLNI_equals.

* Merged with 5a268f292149.

* src/native/jni.c (_Jv_JNI_NewWeakGlobalRef): Use TRACEJNICALLS.
(_Jv_JNI_DeleteWeakGlobalRef): Likewise.

* src/native/llni.h (LLNI_equals): Added macro.

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

* src/native/vm/sun/jvm.c (vm/package.h): Added.
(JVM_GetSystemPackage): Implemented.

* src/vm/Makefile.am (libvm_la_SOURCES): Added package.[ch].

* src/vm/package.c: New file.
* src/vm/package.h: Likewise.

* src/vm/vm.c (vm/package.h): Added.
(vm_create): Call package_init.

* src/vmcore/loader.c (vm/package.h): Added.
(load_class_bootstrap): Call package_add.

* src/vmcore/options.c (opt_DebugPackage): Added.
(options_xx): Likewise.
* src/vmcore/options.h (opt_DebugPackage): Added.

* src/threads/native/threads.c (threads_detach_thread): Notify all
threads waiting on the Java thread-object.

* src/mm/nogc.c [HAVE_SYS_MMAN_H] (sys/mman.h): Added #ifdef.
(heap_alloc_uncollectable): Added additional parameter for heap_alloc.
(gc_init) [HAVE_MMAP]: Added #ifdef.

* src/vmcore/class.c (class_set_packagename): Added '/' to the
internal package name.

* src/native/vm/java_lang_Thread.c (isAlive): Removed.
* src/native/vm/java_lang_Thread.h: Likewise.

* src/native/vm/cldc1.1/java_lang_Thread.c (stdint.h): Added.
(isAlive): Use threads_thread_is_alive.

* src/native/vm/sun/jvm.c (JVM_IsThreadAlive): Likewise.

* src/vm/vm.c (vm_array_from_objectarray): TYPE_LNG: Added missing
primitive_type_get_by_wrapperclass to get type (fixes JBoss).

* src/vm/vm.c (vm_array_from_objectarray): Removed illegal_arg label
and throw exception directly.  This makes it easier for debugging and
newer compilers can optimize that.

* src/threads/threads-common.c (threads_thread_state_runnable): Don't
change the state if the current state is THREAD_STATE_TERMINATED.
(threads_thread_state_waiting): Likewise.
(threads_thread_state_timed_waiting): Likewise.
(threads_thread_is_alive): Smaller changes.
* src/threads/threads-common.h (threads_thread_is_alive): Likewise.

* src/threads/native/lock.c (LOCK_LOG): Removed.
(DEBUGLOCKS): New macro.
(lock_record_new): Added DEBUGLOCKS.
(lock_record_free): Likewise.
(lock_hashtable_grow): Likewise.
(lock_hashtable_get): Likewise.
(lock_inflate): Likewise.
(lock_monitor_enter): Likewise.
(lock_monitor_exit): Likewise.
(lock_record_wait): Likewise.
(lock_record_notify): Likewise.

* src/vmcore/options.c (opt_DebugLocks): Added.
(options_xx): Likewise.
* src/vmcore/options.h (opt_DebugLocks): Added.

* src/native/vm/sun_misc_Unsafe.c (getShort): New function.
(putLong): Likewise.
(getDouble): Likewise.
(putDouble): Likewise.

* src/threads/native/lock.c (toolbox/list.h): Added.
(lock_record_t): Create waiters list.
(lock_record_free): Free waiters list.
(lock_record_add_waiter): Use list.
(lock_record_remove_waiter): Likewise.
(lock_record_notify): Likewise.

* src/threads/native/lock.h (toolbox/list.h): Added.
(lock_waiter_t): Removed next, added linkage.
(lock_record_t): Changed waiters to a list_t.

* src/vm/jit/codegen-common.c [WITH_CLASSPATH_SUN]
(native/include/java_lang_Object.h, native/include/java_lang_String.h,
native/include/java_nio_ByteBuffer.h,
native/include/java_lang_ClassLoader.h): Added.

* src/vmcore/annotation.c: Fixed comment.

* src/threads/native/threads.c (threads_wait_with_timeout): Renamed
thread to t.

* src/toolbox/list.c (list_free): New function.
(list_lock): Likewise.
(list_unlock): Likewise.
* src/toolbox/list.h: Likewise.

* src/vm/exceptions.c (exceptions_get_exception): Simplyfied.
(exceptions_set_exception): Added debug output.
(exceptions_clear_exception): Use explicit implementation and added
debug output.
(exceptions_get_and_clear_exception): Only clear when an exception is
set.

* src/vmcore/options.c (opt_DebugExceptions): Added.
(options_xx): Likewise.
* src/vmcore/options.h: Likewise.

* src/threads/native/lock.c (lock_record_wait): No longer throws and exception
but returns a boolean value indicating the interruption.
(lock_monitor_enter): Ignore interruption of lock_record_wait.
(lock_monitor_wait): Throw an exception if interrupted.

* src/cacaoh/headers.h (_exceptionptr): Removed.

* src/threads/native/threads.h (exceptionptr): Removed.
* src/threads/none/threads.h: Likewise.

* src/vm/exceptions.c (exceptions_get_exception): Rewritten to use
threadobject directly.
(exceptions_set_exception): Likewise.

* src/vm/jit/inline/inline.c (inline_transform)
[INLINE_VERIFY_RESULT]: Use exceptions_clear_exception.

* src/vm/jit/arm/asmpart.S (asm_exceptionptr): Removed.

Removed misleading comment about copying stuff from linux kernel. This was true,
but the implementation has been removed and the ppc solution was adapted for pp64.

* src/vm/vm.c (vm_create): Removed obsolete -se option.
* src/vm/jit/show.c (show_method): No longer show exception stubs.
* src/vmcore/options.c (opt_showexceptionstubs): Removed.
* src/vmcore/options.h (opt_showexceptionstubs): Likewise.

* src/vm/jit/arm/codegen.h: Major code cleanup and support VFP instructions.
* src/vm/jit/arm/codegen.c: Adapted to above changes.

* Merged with michi branch at rev 21fd42e049a3.

* src/vm/builtintable.inc (builtintable_internal): Create builtin stubs for
LOCK_monitor_enter and LOCK_monitor_exit, because they throw exceptions.
This will slow down Cacao, we need the fast-path or inline those builtins!

--HG--
branch : michi

* src/vm/jit/arm/asmpart.S (asm_cacheflush): Code cleanup and support for EABI
syscall calling conventions.

--HG--
branch : michi

* src/vm/jit/s390/codegen.c (codegen_emit_stub_native): Replaced N_* code generation macros by alpha-like M_* ones.

* src/vmcore/annotation.c
(LLNI_objectarray_copy): Removed macro.
(annotation_bytearrays_resize): Use MCOPY instead of my own macro.

* src/vm/jit/s390/asmpart.S
src/vm/jit/s390/codegen.c,
src/vm/jit/s390/codegen.h,
src/vm/jit/s390/emit.c,
src/vm/jit/s390/emit.h,
src/vm/jit/s390/md-abi.c,
src/vm/jit/s390/md-abi.h,
src/vm/jit/s390/md-asm.h,
src/vm/jit/s390/md.c: Changed JIT ABI on s390: R0 is now REG_ITMP3, R12 is a saved register, REG_ITMPs are reordered, REG_ITMP1_XPTR is now REG_ITMP3_XPTR, REG_ITMP2_XPC is now REG_ITMP1_XPC.

* src/native/llni.h
(LLNI_classinfo_field_get): New macro.
(LLNI_classinfo_field_set): Likewise.

* src/vmcore/annotation.c
(LLNI_objectarray_copy): New macro. This macro will be replaced by a
appropriate array_* function once such a function exists.
(annotation_bytearrays_resize): Use above macro and improved variable naming.
(annotation_bytearrays_insert): Changed type of parameter 1 and return type and
improved variable naming.
(annotation_load_attribute_body): Use LLNI_CRITICAL_START and LLNI_CRITICAL_END.
(annotation_load_method_attribute_annotationdefault): Use
LLNI_classinfo_field_get and LLNI_classinfo_field_set macros.
(annotation_load_method_attribute_runtimevisibleparameterannotations): Likewise.
(annotation_load_method_attribute_runtimevisibleannotations): Likewise.
(annotation_load_field_attribute_runtimevisibleannotations): Likewise.
(annotation_load_class_attribute_runtimevisibleannotations): Use
LLNI_classinfo_field_set macro.

* src/vmcore/class.c
(class_get_annotations): Use LLNI_classinfo_field_get macro.

* src/vmcore/class.h
(classinfo.annotations),
(classinfo.method_annotations),
(classinfo.method_parameterannotations),
(classinfo.method_annotationdefaults),
(classinfo.field_annotations): Changed type to java_object_t*.

* src/vmcore/field.c
(native/llni.h): Added include.
(field_get_annotations): Use LLNI_classinfo_field_get macro.

* src/vmcore/method.c
(method_get_annotations): Use LLNI_classinfo_field_get macro.
(method_get_parameterannotations): Likewise.
(method_get_annotationdefault): Likewise.

* src/native/jni.c (jni_version_check): New function.
* src/native/jni.h: Likewise.

* src/native/vm/sun/jvm.c (JVM_IsSupportedJNIVersion): Use
jni_version_check.
* src/vm/vm.c (vm_create): Likewise.

* src/vm/vm.c (vm_create): Initialize properties list before handling
-XX options handling.

* src/vm/properties.c (properties_add) [!NDEBUG]: Added debug output.

* src/vm/vm.c (opts): Removed XX.
(vm_create): Call options_xx almost as first function, so we can
enable debugging from all stuff.

* src/vmcore/options.c (opt_DebugProperties): New option.
(options_xx): Changed signature and parse all options in the array.
* src/vmcore/options.h (opt_DebugProperties): Added.
(options_xx): Changed signature.

* src/threads/native/threads.c: Renamed bogus __MIPS__ ifdefs to __IRIX__.

* src/vm/jit/mips/codegen.c (codegen_emit): Fixed ICMD_BUILTIN stub calling.
(codegen_emit_stub_native): Adapted to new signature and builtin stubs.

--HG--
branch : michi

Merged 7484:52fc709fd248.

* src/vm/jit/s390/codegen.c (codegen_emit_stub_native): Changed some N_MOV to M_MOV.
* src/vm/jit/s390/asmpart.S, src/vm/jit/s390/md-asm.h, src/vm/jit/s390/md-abi.h, src/vm/jit/s390/md-abi.c: Reverted [7237:9a2ce00b716e] where f4 and f6 were made callee saved.

* src/vm/jit/patcher-common.c: Improved comments.
(patcher_handler): Enabled use of -XX:+DebugPatcher.

* src/vmcore/options.c (opt_DebugPatcher): Added and set by above debug flag.
* src/vmcore/options.h (opt_DebugPatcher): Added.

* src/vm/jit/alpha/codegen.c (codegen_emit_stub_builtin): Removed.
(codegen_emit_stub_native): Adapted to new signature and builtins.

* src/vm/jit/arm/codegen.c (codegen_emit_stub_native): Adapted to new signature.

* src/vm/jit/alpha/codegen.c (codegen_start_native_call) [__ALPHA__]: Call
tracing is done from here now.
(codegen_finish_native_call) [__ALPHA__]: Likewise.

--HG--
branch : michi

* src/native/vm/Makefile.am
(JAVA_UTIL_CONCURRENT_ATOMIC_ATOMICLONG_SOURCES): Removed.
(libnativevm_la_SOURCES): Removed
JAVA_UTIL_CONCURRENT_ATOMIC_ATOMICLONG_SOURCES.

* src/native/vm/gnu/java_util_concurrent_atomic_AtomicLong.c
(native/vm/java_util_concurrent_atomic_AtomicLong.h): Removed.
(native/include/java_util_concurrent_atomic_AtomicLong.h): Added.
(methods): VMSupportsCS8: Use
Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8.
(Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8): New
function.

* src/native/vm/sun/jvm.c
(native/vm/java_util_concurrent_atomic_AtomicLong.h): Removed.
(JVM_SupportsCX8): Just return 0 for now.

* src/native/vm/java_util_concurrent_atomic_AtomicLong.c: Removed.
* src/native/vm/java_util_concurrent_atomic_AtomicLong.h: Likewise.

* src/native/vm/cldc1.1/java_lang_Class.c (methods): isInterface: Use
Java_java_lang_Class_isInterface.
(isInterface): New function.

* src/native/vm/gnu/java_lang_VMClass.c (vm/exceptions.h): Added.
(vm/stringlocal.h): Likewise.
(isInterface): Use class_is_interface.
(getInterfaces): Use class_get_interfaces.
(getDeclaredClasses): Use class_get_declaredclasses.
(throwException): Use exceptions_set_exception.
(getClassSignature): Implemented directly.

* src/native/vm/java_lang_Class.c (isInterface): Removed.
(getInterfaces): Likewise.
(getDeclaredClasses): Likewise.
(throwException): Likewise.
(getClassSignature): Likewise.
* src/native/vm/java_lang_Class.h: Likewise.

* src/native/vm/sun/jvm.c (JVM_GetClassSignature): Use
LLNI_classinfo_unwrap and java_handle_t.

 * Merged with default branch at rev 8806c9bebf3e.

* src/vmcore/annotation.c: Improved comments.
(annotation_bytearrays_resize),
(annotation_bytearrays_insert),
(annotation_load_method_attribute_annotationdefault),
(annotation_load_method_attribute_runtimevisibleparameterannotations),
(annotation_load_class_attribute_runtimevisibleannotations),
(annotation_load_method_attribute_runtimevisibleannotations),
(annotation_load_field_attribute_runtimevisibleannotations):
Restructured so that when it comes to the point when I have to use LLNI macros
for accessing the java objects I store in classinfo I will have not much to do.

* src/lib/gnu/java/lang/reflect/Constructor.java: Improved comments.
* src/lib/gnu/java/lang/reflect/Field.java: Likewise.
* src/lib/gnu/java/lang/reflect/Method.java: Likewise.
* src/lib/gnu/sun/reflect/annotation/AnnotationParser.java: Likewise.
* src/lib/gnu/sun/reflect/annotation/AnnotationType.java: Likewise.
* src/native/vm/gnu/java_lang_reflect_Constructor.c: Likewise.
* src/native/vm/gnu/java_lang_reflect_Field.c: Likewise.
* src/native/vm/gnu/java_lang_reflect_Method.c: Likewise.
* src/native/vm/gnu/sun_reflect_ConstantPool.c: Likewise.
* src/native/vm/java_lang_Class.c: Likewise.
* src/native/vm/reflect.c: Likewise.
* src/native/vm/sun/jvm.c: Likewise.
* src/vmcore/class.c: Likewise.
* src/vmcore/field.c: Likewise.
* src/vmcore/method.c: Likewise.
* src/vmcore/utf8.c: Likewise.
* tests/regression/MinimalClassReflection.java: Likewise.

* src/native/vm/gnu/java_lang_VMClass.c (getSuperclass): Use
class_get_superclass.
* src/native/vm/java_lang_Class.c (getSuperclass): Removed.
* src/native/vm/java_lang_Class.h: Likewise.

* src/native/vm/gnu/java_lang_VMClass.c (isPrimitive): Use
class_is_primitive.
* src/native/vm/java_lang_Class.c (isPrimitive): Removed.
* src/native/vm/java_lang_Class.h: Likewise.

* src/vm/properties.c (properties_set) [WITH_JRE_LAYOUT]: Fixed old variable.
* src/native/vm/gnu/gnu_classpath_VMSystemProperties.c
(Java_gnu_classpath_VMSystemProperties_postInit) [WITH_JRE_LAYOUT]: Likewise.