* 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.

* Merged with default branch at rev bac772081960.

--HG--
branch : michi

* src/vm/jit/disass.h (global.h): Added.

* src/vm/jit/arm/disass.c (disass_pseudo_instr): Implemented.
(disassinstr): Call above function.

* src/vm/jit/arm/linux/md-os.c (md_signal_handler_sigill): Better debug output.

--HG--
branch : michi

* src/vm/jit/codegen-common.c (codegen_generate_stub_compiler): Stubs are
generated for all archs now.
[__POWERPC64__]: Enabled tracing of native and builtin stubs.

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

* src/vm/jit/powerpc64/codegen.c (codegen_emit_stub_native): Likewise.
Removed tracing code. Rewrote argument register saving and restoring code.

--HG--
branch : michi

* src/vm/jit/mips/codegen.c (codegen_emit_stub_native): Fixed offset
of result saving and restoring (hint: MIPS32 has a PA).

* src/vm/jit/alpha/codegen.c (codegen_emit): ICMD_BUILTIN no longer checks for
exceptions, this is done by the stub itself. Stubs are called now.

* src/vm/jit/m68k/codegen.c: Likewise.
* src/vm/jit/mips/codegen.c: Likewise.
* src/vm/jit/powerpc64/codegen.c: Likewise.
* src/vm/jit/s390/codegen.c: Likewise.
* src/vm/jit/sparc64/codegen.c: Likewise.

--HG--
branch : michi

* src/vm/jit/codegen-common.c (codegen_generate_stub_builtin): Set
skipparams and pass it to codegen_emit_stub_native.
(codegen_generate_stub_native): Likewise.
* src/vm/jit/codegen-common.h (codegen_emit_stub_native): Changed
signature.

* src/vm/jit/i386/codegen.c (codegen_emit): ICMD_BUILTIN: Removed
emit_exception_check.
(codegen_emit_stub_builtin): Removed.
(codegen_emit_stub_native): Changed signature.
* src/vm/jit/x86_64/codegen.c: Likewise.

--HG--
branch : michi

* src/vm/jit/x86_64/patcher.c (patcher_resolve_native_function):
Removed.

* src/vm/jit/x86_64/patcher.c (patcher_resolve_native_function):
Removed.

--HG--
branch : michi
extra : transplant_source : %BB%EE%0A%3C%3F4%0C%9A5%852R%04%DEz%21%1B%FF%D2%D1

* src/vm/jit/patcher-common.h: Added __X86_64__ ifdef.
* src/vm/signal.c (signal_init): Likewise.
* src/vm/signallocal.h: Likewise.

* src/vm/jit/x86_64/asmpart.S (asm_patcher_wrapper): Removed.

* src/vm/jit/x86_64/codegen.c (vm/jit/patcher.h): Removed.
(vm/jit/patcher-common.h): Added.
(codegen_emit): Implemented patchers-by-signal and load data from data
segment instead of moving inline.
(codegen_emit_stub_native): Likewise.
(codegen_emit_stub_compiler): Quick hack for ALD.

* src/vm/jit/x86_64/codegen.h (PATCHER_CALL_SIZE): Changed to 2.
(PATCHER_NOPS): Likewise.
(M_ALD): Handle RIP properly.

* src/vm/jit/x86_64/emit.c (vm/jit/patcher-common.h): Added.
(emit_patcher_stubs): Removed.
(emit_trap): Emit UD2.

* src/vm/jit/x86_64/linux/md-os.c (md_signal_handler_sigill): New
function.

* src/vm/jit/x86_64/patcher.c (vm/jit/patcher.h): Removed.
(vm/jit/patcher-common.h): Added.
(patcher_wrapper): Removed.
(PATCH_BACK_ORIGINAL_MCODE): New macro.
(patcher_patch_code): New function.
(patcher_resolve_classref_to_classinfo): Likewise.
(patcher_resolve_classref_to_vftbl): Likewise.
(patcher_resolve_classref_to_flags): Likewise.
(patcher_resolve_native_function): Likewise.
(patcher_aconst): Removed.
(patcher_builtin_multianewarray): Likewise.
(patcher_builtin_arraycheckcast): Likewise.
(patcher_checkcast_instanceof_flags): Likewise.
(patcher_checkcast_class): Likewise.
(patcher_instanceof_class): Likewise.
(patcher_clinit): Likewise.
(patcher_athrow_areturn): Likewise.
(patcher_resolve_native): Likewise.

* src/vm/jit/patcher-common.h: Added __X86_64__ ifdef.
* src/vm/signal.c (signal_init): Likewise.
* src/vm/signallocal.h: Likewise.

* src/vm/jit/x86_64/asmpart.S (asm_patcher_wrapper): Removed.

* src/vm/jit/x86_64/codegen.c (vm/jit/patcher.h): Removed.
(vm/jit/patcher-common.h): Added.
(codegen_emit): Implemented patchers-by-signal and load data from data
segment instead of moving inline.
(codegen_emit_stub_native): Likewise.
(codegen_emit_stub_compiler): Quick hack for ALD.

* src/vm/jit/x86_64/codegen.h (PATCHER_CALL_SIZE): Changed to 2.
(PATCHER_NOPS): Likewise.
(M_ALD): Handle RIP properly.

* src/vm/jit/x86_64/emit.c (vm/jit/patcher-common.h): Added.
(emit_patcher_stubs): Removed.
(emit_trap): Emit UD2.

* src/vm/jit/x86_64/linux/md-os.c (md_signal_handler_sigill): New
function.

* src/vm/jit/x86_64/patcher.c (vm/jit/patcher.h): Removed.
(vm/jit/patcher-common.h): Added.
(patcher_wrapper): Removed.
(PATCH_BACK_ORIGINAL_MCODE): New macro.
(patcher_patch_code): New function.
(patcher_resolve_classref_to_classinfo): Likewise.
(patcher_resolve_classref_to_vftbl): Likewise.
(patcher_resolve_classref_to_flags): Likewise.
(patcher_resolve_native_function): Likewise.
(patcher_aconst): Removed.
(patcher_builtin_multianewarray): Likewise.
(patcher_builtin_arraycheckcast): Likewise.
(patcher_checkcast_instanceof_flags): Likewise.
(patcher_checkcast_class): Likewise.
(patcher_instanceof_class): Likewise.
(patcher_clinit): Likewise.
(patcher_athrow_areturn): Likewise.
(patcher_resolve_native): Likewise.

--HG--
branch : michi
extra : transplant_source : %0D%8A%CD%DB3%D23d%B5%3AV%10%E4%87%E5d%C4%D94b

* src/vm/jit/patcher-common.c (patcher_add_patch_ref): Added
lastmcodeptr code. This can be removed when we don't use UD2 on i386
and x86_64 anymore.

* src/vm/jit/patcher-common.c (patcher_add_patch_ref): Added
lastmcodeptr code. This can be removed when we don't use UD2 on i386
and x86_64 anymore.

--HG--
branch : michi
extra : transplant_source : _9%DE%DF%7Bhj%83%EB%9B%BE%D4%B3%26%C5%ED%96in%04

* src/vm/jit/i386/codegen.c (codegen_emit_stub_native): Loads function pointer
from data segment now.

* src/vm/jit/patcher-common.c (patcher_resolve_native_function): Implemented
generalized version.

* src/vm/jit/alpha/patcher.c (patcher_resolve_native_function): Removed
obsolete function.

* src/vm/jit/arm/patcher.c: Likewise.
* src/vm/jit/i386/patcher.c: Likewise.
* src/vm/jit/mips/patcher.c: Likewise.
* src/vm/jit/powerpc/patcher.c: Likewise.
* src/vm/jit/powerpc64/patcher.c: Likewise.
* src/vm/jit/s390/patcher.c: Likewise.

* src/vm/jit/i386/codegen.c (codegen_emit_stub_native): Loads function pointer
from data segment now.

* src/vm/jit/patcher-common.c (patcher_resolve_native_function): Implemented
generalized version.

* src/vm/jit/alpha/patcher.c (patcher_resolve_native_function): Removed
obsolete function.

* src/vm/jit/arm/patcher.c: Likewise.
* src/vm/jit/i386/patcher.c: Likewise.
* src/vm/jit/mips/patcher.c: Likewise.
* src/vm/jit/powerpc/patcher.c: Likewise.
* src/vm/jit/powerpc64/patcher.c: Likewise.
* src/vm/jit/s390/patcher.c: Likewise.

--HG--
branch : michi
extra : transplant_source : %85%86%D2%A0w%EF%E3%9C%C3%DA7%DC%8C%05iDo%93o%1A

* src/vm/jit/alpha/md.c (md_dcacheflush): Added dummy function.
* src/vm/jit/arm/md.c (md_dcacheflush): Does nothing now.

* src/vm/jit/alpha/md.c (md_dcacheflush): Added dummy function.
* src/vm/jit/arm/md.c (md_dcacheflush): Does nothing now.

--HG--
branch : michi
extra : transplant_source : %8B%25%E9X%176%1D%82%1A%881J%D2%E0%C2%40w%F3%15%EC

* src/vm/jit/patcher-common.h (patcher_patch_code): Added prototype.

* src/vm/jit/patcher-common.c (patcher_handle) [TRACE_PATCHER]: Improved debug.
(patcher_initialize_class): Implemented generalized version.
(patcher_resolve_class): Likewise.

* src/vm/jit/alpha/patcher.c (patcher_patch_code): Implemented.
(patcher_initialize_class): Removed obsolete patcher function.
(patcher_resolve_class): Likewise.

* src/vm/jit/arm/patcher.c: Likewise.
* src/vm/jit/i386/patcher.c: Likewise.
* src/vm/jit/mips/patcher.c: Likewise.
* src/vm/jit/powerpc/patcher.c: Likewise.
* src/vm/jit/powerpc64/patcher.c: Likewise.
* src/vm/jit/s390/patcher.c: Likewise.

* src/vm/jit/patcher-common.h (patcher_patch_code): Added prototype.

* src/vm/jit/patcher-common.c (patcher_handle) [TRACE_PATCHER]: Improved debug.
(patcher_initialize_class): Implemented generalized version.
(patcher_resolve_class): Likewise.

* src/vm/jit/alpha/patcher.c (patcher_patch_code): Implemented.
(patcher_initialize_class): Removed obsolete patcher function.
(patcher_resolve_class): Likewise.

* src/vm/jit/arm/patcher.c: Likewise.
* src/vm/jit/i386/patcher.c: Likewise.
* src/vm/jit/mips/patcher.c: Likewise.
* src/vm/jit/powerpc/patcher.c: Likewise.
* src/vm/jit/powerpc64/patcher.c: Likewise.
* src/vm/jit/s390/patcher.c: Likewise.

--HG--
branch : michi
extra : transplant_source : Y%12%FD%260S%8F%B3%94G%CE%89%C4S%21e%C2%D0%B2%F1

* src/vm/jit/arm/codegen.c: Removed patcher NOPs creation, this is done by the
patcher_add_patch_ref function itself.

* src/vm/jit/arm/patcher.c: Patcher NOPs are triggered by the opt_shownops flag.

--HG--
branch : michi

* src/vm/jit/arm/codegen.c (codegen_emit_stub_builtin): Removed.
(codegen_emit_stub_native): Deals with builtin stubs as well now.

--HG--
branch : michi

* src/vm/jit/codegen-common.c (codegen_disassemble_stub): Renamed and works with
builtin stubs as well.
(codegen_generate_stub_builtin) [ENABLE_DISASSEMBLER]: Stub gets disassembled.
(codegen_generate_stub_native) [ENABLE_DISASSEMBLER]: Likewise.

* src/vm/jit/codegen-common.h (codegen_disassemble_stub): Renamed.

* src/vm/vm.c: Removed old option flag opt_shownativestub.

* src/vmcore/options.h [ENABLE_DISASSEMBLER] (opt_DisassembleStubs): Added.

* src/vmcore/options.c [ENABLE_DISASSEMBLER] (opt_DisassembleStubs): Added and
included into options list.

--HG--
branch : michi

* Merged with default branch at rev ce451bbfaf18.

--HG--
branch : michi

* src/vm/jit/i386/emit.c (emit_patcher_stubs): Removed, this is obsolete.
(emit_trap): Fixed trap instruction.

* src/vm/jit/i386/asmpart.S (asm_patcher_wrapper): Removed, this is obsolete.

* src/vm/jit/i386/patcher.c: Adapted patchers to new signature for traps.
(patcher_wrapper): Removed, this is obsolete.

* src/vm/jit/i386/codegen.h (PATCHER_CALL_SIZE, PATCHER_NOPS): Adapted to new
trap instruction.

* src/vm/jit/i386/codegen.c (codegen_emit, codegen_emit_stub_native): Call
the new patcher functions via traps and adapted to above change.

* src/vm/jit/i386/linux/md-os.c (md_signal_handler_sigill): Implemented.

* src/vm/jit/patcher-common.h [__I386__]: Enabled new patcher stuff.

* src/vm/jit/patcher.h [__I386__]: Defined away old patcher stuff.

* src/vm/signal.c (signal_init) [__I386__]: Install SIGILL handler now.

* src/vm/signallocal.h [__I386__] (md_signal_handler_sigill): Enabled prototype.

* Merged with 79e3a1932e59.

* src/vmcore/loader.c (load_class_from_classloader): Fixed classloader issues.

* src/vm/jit/x86_64/codegen.h (M_BYTE1, M_BYTE2): New macros.
(M_UD2): Added.
(M_RET, M_NOP): Use M_BYTE1.

* src/vm/jit/x86_64/emit.c (emit_ret): Removed.
(emit_nop): Likewise.
* src/vm/jit/x86_64/emit.h: Likewise.

* src/vm/builtin.c (builtin_arraycopy): Returns void instead of bool now.
* src/vm/builtin.h (builtin_arraycopy): Adapted signature.
* src/native/vm/cldc1.1/java_lang_System.c: Removed obsolete void case.
* src/native/vm/gnu/java_lang_VMSystem.c: Likewise.
* src/native/vm/sun/jvm.c: Likewise.

--HG--
branch : michi

* src/vm/jit/powerpc/codegen.c (codegen_emit): Removed exception check for
ICMD_BUILTIN because of the new stubs.
(codegen_emit_stub_builtin): Removed obsolete function.
(codegen_emit_stub_native): Checks for m->flags instead of nmd being NULL.

--HG--
branch : michi

* src/vm/jit/codegen-common.c (codegen_generate_stub_compiler): Pass bte->md to
native stub emmiter.
(codegen_stub_builtin_enter): Removed.
(codegen_stub_builtin_exit): Likewise.

* src/vm/jit/codegen-common.h: Removed obsolete prototypes.

--HG--
branch : michi

* src/vm/jit/powerpc/codegen.c (codegen_emit_stub_native): Ported for builtins.

--HG--
branch : michi

* src/vm/jit/trace.c (trace_java_call_enter): Can handle m->class == NULL now
and prints flag for builtin method stubs.
(trace_java_call_exit): Likewise.

--HG--
branch : michi

* src/vm/jit/codegen-common.c (codegen_generate_stub_builtin): Calls same
emmiter function as for native methods now.
(codegen_stub_builtin_enter): Disabled.
(codegen_stub_builtin_exit): Disabled.

--HG--
branch : michi

* src/vmcore/method.h (method_new_builtin): Fixed typo in function prototype.

* src/vm/jit/stacktrace.c (stacktrace_create): Skip entries for builtin stubs.

* src/vm/builtin.c (builtintable_init): Create methodinfos for builtins.
* src/vm/builtin.h (builtintable_entry): Added forward typedef.
* src/vmcore/method.h (method_new_builtin): Added prototype.
* src/vmcore/method.c (method_new_builtin): Implemented.
* src/vm/jit/codegen-common.h (codegen_generate_stub_builtin): Changed sig.
* src/vm/jit/codegen-common.c (codegen_generate_stub_builtin): Pass methodinfo.

* src/vm/jit/argument.c: Added file for argument array handling.
* src/vm/jit/argument.h: Likewise.

* src/vm/jit/Makefile.am (libjit_la_SOURCES): Added above two files.

* src/vm/jit/trace.c: Moved array handling functions to argument.c and adapted
to new name and signature.

* src/native/localref.c (localref_fill): Likewise.

* src/vm/jit/powerpc64/patcher.c: Removed obsolete patcher functions.

* src/vmcore/loader.h (classloader) [!ENABLE_HANDLES]: Classloader is a object.

* src/vmcore/loader.c (loader_hashtable_classloader_add) [!ENABLE_HANDLES]:
Return classloader object instead of entry. Added some debug output.
(loader_hashtable_classloader_find): Likewise.

* src/vmcore/class.c (class_get_classloader): No need to differentiate between
handles or not-handles.

* src/native/vm/gnu/gnu_classpath_VMStackWalker.c: Fixed bogus classloader
usages.

* src/native/native.c (native_resolve_function): Use
class_get_classloader.

* src/vm/jit/patcher-common.h: Removed obsolete patcher function defines.

* src/vm/jit/powerpc64/codegen.c: Used newer patcher function names.
* src/vm/jit/powerpc64/patcher.c: Likewise.
* src/vm/jit/s390/codegen.c: Likewise.
* src/vm/jit/s390/patcher.c: Likewise.

* src/vm/jit/powerpc64/emit.c (emit_patcher_stubs): Removed, this is obsolete.
(emit_trap): Fixed trap instruction:

* src/vm/jit/powerpc64/codegen.c (codegen_emit, codegen_emit_stub_native): Call
the new patcher functions and adapted to above change.

* src/vm/jit/powerpc64/patcher.c: Adapted patchers to new signature for traps.
(patcher_wrapper): Removed, this is obsolete.

* src/vm/jit/powerpc64/asmpart.S (asm_patcher_wrapper): Removed, this is
obsolete.

* src/vm/jit/powerpc64/linux/md-os.c (md_signal_handler_sigsegv): Only calls the
exception handling if exception object present.

* src/vm/jit/patcher-common.h [__POWERPC64__]: Enabled new patcher stuff.

* src/vm/jit/patcher.h [__POWERPC64__]: Defined away old patcher stuff.

* Merged with 269162803388.

* src/native/vm/Makefile.am (libnativevm_la_SOURCES): Removed
java_lang_Object.[ch].

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

* src/native/vm/cldc1.1/java_lang_Object.c
(native/vm/java_lang_Object.h): Removed.
(threads/lock-common.h): Added.
(vm/exceptions.h): Likewise.
(getClass): Use LLNI_class_get.
(notify): Use lock_notify_object.
(notifyAll): Use lock_notify_all_object.
(wait): Use lock_wait_for_object.

* src/native/vm/gnu/java_lang_VMObject.c (native/llni.h): Added.
(native/vm/java_lang_Object.h): Removed.
(threads/lock-common.h): Added.
(vm/builtin.h): Likewise.
(vm/exceptions.h): Likewise.
(getClass): Use LLNI_class_get.
(clone): Use builtin_clone.
(notify): Use lock_notify_object.
(notifyAll): Use lock_notify_all_object.
(wait): Use lock_wait_for_object.

* src/native/vm/sun/jvm.c (native/vm/java_lang_Object.h): Removed.
(JVM_MonitorWait): Use lock_wait_for_object.
(JVM_MonitorNotify): Use lock_notify_object.
(JVM_MonitorNotifyAll): Use lock_notify_all_object.