* configure.ac (AC_CHECK_ENABLE_ASSERTION): Added

* src/lib/gnu/java/lang/VMClassLoader.java
(packageAssertionStatus0): New function
(classAssertionStatus0): Likewise
(defaultUserAssertionStatus): Likewise
(defaultAssertionStatus): Implemented
(packageAssertionStatus): Likewise
(classAssertionStatus): Likewise

* src/native/include/Makefile.am (COMMON_HEADER_FILES):
Added java_util_HashMap.h, java_util_Map.h

* /src/native/jni.h
(_Jv_JavaVM->Java_java_lang_VMClassLoader_defaultAssertionStatus): Removed

* src/native/vm/gnu/java_lang_VMClassLoader.c
(native/include/java_util_HashMap.h): Added
(native/include/java_util_Map.h): Likewise
(native/include/java_lang_Boolean.h): Likewise
(toolbox/list.h): Likewise
(vm/assertion.h): Likewise
(methods): Added information for defaultUserAssertionStatus,
packageAssertionStatus0, classAssertionStatus0
(Java_java_lang_VMClassLoader_defaultAssertionStatus): Implemented
(Java_java_lang_VMClassLoader_defaultUserAssertionStatus): New function
(Java_java_lang_VMClassLoader_packageAssertionStatus0): Likewise
(Java_java_lang_VMClassLoader_classAssertionStatus0): Likewise

* src/native/vm/sun/jvm.c (toolbox/list.h): Added
(vm/assertion.h): Likewise
(JVM_DesiredAssertionStatus): Implemented
(JVM_AssertionStatusDirectives): Now returns a usable
java.lang.AssertionStatusDirectives object

* src/vm/Makefile.am (libvm_la_SOURCES): Added assertion.c, assertion.h

* src/vm/vm.c (vm/assertion.h): Added
(OPT_EA, OPT_DA, OPT_ESA, OPT_DSA): Now handled by assertion module

* src/vmcore/class.c (class_java_util_HashMap): Added

* src/vmcore/class.h (class_java_util_HashMap): Added

* src/vmcore/linker.c (linker_init): Added linking of class_java_util_HashMap

* src/vmcore/loader.c (loader_init): Added loading of class_java_util_HashMap

* m4/assertion.m4: New file

* src/vm/assertion.c: New file

* src/vm/assertion.h: New file

* src/vm/exceptions.c (unistd.h): Removed.

* src/vm/exceptions.c (vmcore/system.h): Added.
(exceptions_init): Use system_getpagesize and system_mmap_anonymous.

* src/vm/exceptions.c (exceptions_handle_exception): Changed signature
to use void*.

* src/vm/jit/show.c (stdint.h): Added.
(SHOW_INT_CONST): Fixed compiler warnings.

* src/vm/jit/show.c (show_basicblock): Pass correct arguments to
linenumbertable_linenumber_for_pc.

* changed src/vm/jit/m68k/emit.c (builtin_verbosecall_exit): Use
trace_java_call_exit.

* changed src/vm/jit/m68k/linux/md-os.c (emit_trap): Fixed a bug.

* changed src/vm/jit/m68k/patcher.c (md_signal_handler_sigill): Bug.
(PATCH_BACK_ORIGINAL_MCODE): Bug.

* changed src/vm/jit/m68k/asmpart.S: Removed unused method
header entries.

* changed src/vm/jit/m68k/codegen.c (codegen_emit): New
linenumbertables code.

* changed src/vm/jit/m68k/arch.h (JIT_COMPILER_VIA_SIGNAL): Added.

* changed src/vm/jit/m68k/asmpart.S (asm_call_jit_compiler): Removed.

* changed src/vm/jit/m68k/codegen.c (codegen_emit): All
codegen_addpatchref replaced by patcher_add_patch_ref.

(codegen_emit_stub_native): Use 8 byte stack slots.

* changed src/vm/jit/m68k/emit.c (emit_verbosecall_enter): New tracer.
(emit_trap_compiler): Added.
(emit_trap): Likewise.

* changed src/vm/jit/m68k/linux/md-abi.c (md_param_alloc): Use 8 byte
stackslots.

* changed src/vm/jit/m68k/linux/md-os.c (md_init_linux): Removed.
(md_signal_handler_sigsegv): Support for patchers and compiler
via signal added.

* changed src/vm/jit/m68k/linux/md-os.h (md_init_linux): Removed.

* changed src/vm/jit/m68k/md.c (md_init): Call to md_init_linux
removed.

* changed src/vm/signal.c (signal_init): Register sigill for M68K.

* changed src/vm/signallocal.h (md_signal_handler_sigill): Enabled
for M68K.

* changed src/vmcore/linker.c (link_class_intern): Enable long 4
byte alignment.

* src/threads/none/threads.h (stackframeinfo): Removed.
(_no_threads_stackframeinfo): Likewise.

* src/vm/jit/show.c (show_basicblock): Forgot to use
linenumbertable_linenumber_for_pc.

* src/vm/jit/jit.c (jit_jitdata_new) [!ENABLE_THREADS]: Fixed
compilation.

* src/vm/jit/trace.c (trace_java_call_enter): Removed unused variable.

* src/vmcore/statistics.c (count_linenumbertable): New variable.
(size_linenumbertable): Likewise.
(statistics_print_memory_usage): Adapted.
* src/vmcore/statistics.h: Likewise.

* src/vm/jit/linenumbertable.c [ENABLE_STATISTICS] (vmcore/options.h):
Added
[ENABLE_STATISTICS] (vmcore/statistics.h): Likewise.
(linenumbertable_create) [ENABLE_STATISTICS]: Added statistics
calculation.

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

* src/vm/jit/code.h (vm/jit/linenumbertable.h): Added.
(codeinfo): Added linenumbertable.

* src/vm/jit/codegen-common.c (vm/jit/linenumbertable.h): Added.
(codegen_setup): Create linenumbers list.
(codegen_reset): Likewise.
(codegen_finish): Removed old linenumber-resolving code and call
linenumbertable_create instead.

* src/vm/jit/codegen-common.h (codegendata): Removed
linenumberreferences, linenumbertablesizepos, linenumbertablestartpos,
linenumbertab, added linenumbers.

* src/vm/jit/dseg.c (dseg_addlinenumbertablesize): Removed.
(dseg_addlinenumber): Likewise.
(dseg_addlinenumber_inline_start): Likewise.
(dseg_addlinenumber_inline_end): Likewise.
(dseg_createlinenumbertable): Likewise.
(dseg_get_linenumber_from_pc_intern): Likewise.
(dseg_get_linenumber_from_pc): Likewise.

* src/vm/jit/dseg.h: Likewise
(linenumbertable_entry): Removed.

* src/vm/jit/methodheader.h (LineNumberTableSize)
(LineNumberTableStart): Removed.

* src/vm/jit/stacktrace.c (vm/jit/linenumbertable.h): Added.
(stacktrace_method_add): Renamed dseg_get_linenumber_from_pc to
linenumbertable_linenumber_for_pc.

* src/vm/jit/alpha/asmpart.S,
src/vm/jit/arm/asmpart.S,
src/vm/jit/i386/asmpart.S,
src/vm/jit/m68k/asmpart.S,
src/vm/jit/mips/asmpart.S,
src/vm/jit/powerpc/asmpart.S,
src/vm/jit/powerpc64/asmpart.S,
src/vm/jit/s390/asmpart.S,
src/vm/jit/sparc64/asmpart.S,
src/vm/jit/x86_64/asmpart.S (asm_vm_call_method): Removed obsolete
method-header entries.

* src/vm/jit/alpha/codegen.c,
src/vm/jit/arm/codegen.c,
src/vm/jit/i386/codegen.c,
src/vm/jit/m68k/codegen.c,
src/vm/jit/mips/codegen.c,
src/vm/jit/powerpc/codegen.c,
src/vm/jit/powerpc64/codegen.c,
src/vm/jit/s390/codegen.c,
src/vm/jit/sparc64/codegen.c,
src/vm/jit/x86_64/codegen.c (vm/jit/linenumbertable.h): Added.
(codegen_emit): Removed dseg_addlinenumbertablesize call, use new
linenumbertable functions, removed dseg_createlinenumbertable.
(codegen_emit_stub_native): Removed obsolete method-header entries.

* src/vm/jit/arm/codegen.c (codegen_emit): Moved ICMD_POP and
ICMD_POP2 to ICMD_NOP case.

* src/vm/array.c: Changed copyright.
* src/vm/array.h: Likewise.

* src/vm/jit/s390/codegen.c,
src/vm/jit/s390/disass.c,
src/vm/jit/s390/md.c: Fixed compile warnings.

* src/vm/jit/x86_64/md-abi.c (abi_registers_integer_saved): Fixed severe typo.

* src/vm/properties.c (properties_set)
[ENABLE_JAVASE && WITH_CLASSPATH_GNU]: Fixed endorseddirs length.

* configure.ac (AC_CHECK_HEADERS): Added assert.h, errno.h.
(AC_CHECK_FUNCS): Added memcpy, memset, realloc.

* src/vmcore/system.c (errno.h): Added.
(stdint.h): Likewise.
(string.h): Likewise.
(unistd.h): Likewise.
(sys/mman.h): Likewise.
(system_mmap_anonymous): New function.

* src/vmcore/system.h (stdint.h): Added.
(stdlib.h): Likewise.
(string.h): Likewise.
(unistd.h): Likewise.
(system_calloc): New function.
(system_free): Likewise.
(system_getpagesize): Likewise.
(system_malloc): Likewise.
(system_memcpy): Likewise.
(system_memset): Likewise.
(system_realloc): Likewise.
(system_mmap_anonymous): Likewise.

* src/threads/threads-common.c (threads_dump): Ignore NEW threads while dumping.

* src/vm/system.c: Removed.
* src/vm/system.h: Likewise.
* src/vm/Makefile.am (libvm_la_SOURCES): Removed system.[ch].

* src/vmcore/system.c: Added.
* src/vmcore/system.h: Likewise.
* src/vmcore/Makefile.am (libvmcore_la_SOURCES): Added system.[ch].

* src/native/vm/gnu/java_lang_VMRuntime.c (vm/system.h): Renamed to
vmcore/system.h.
* src/native/vm/sun/jvm.c: Likewise.

--HG--
rename : src/vm/system.c => src/vmcore/system.c
rename : src/vm/system.h => src/vmcore/system.h

* src/vm/exceptions.c (exceptions_handle_exception): Use LLNI macro for
unlocking synchronized methods during stack unwinding.

* src/vm/builtin.h (builtin_retrieve_exception): Added prototype.
* src/vm/builtin.c (builtin_retrieve_exception): Implemented.

* src/vm/jit/alpha/linux/md-os.c (md_signal_handler_sigsegv): Use above builtin.
* src/vm/jit/i386/linux/md-os.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/x86_64/linux/md-os.c: Likewise.

* Merged with 5c4efabb7787.

* src/vm/jit/replace.c (replace_create_replacement_points): Removed bogus flag
tampering of codeinfo.

* changed src/vm/jit/m68k/asmpart.S (asm_patcher_wrapper): Removed.
* changed src/vm/jit/m68k/codegen.c (patcher.h): Include removed.
(emit_codegen): Replaced emit_patcher_stubs by emit_patcher_trap.
(codegen_emit_stub_native): Likewise.

* changed src/vm/jit/m68k/emit.c (emit_patcher_stubs): Removed.

* changed src/vm/jit/m68k/patcher.c
(patcher_resolve_classref_to_classinfo): Ported to new patcher signature.

* changed src/vm/jit/patcher-common.h: Enabled new patchers for __M68K__.

* changed src/vmcore/linker.c (linker_preinit): __M68K__ has 4 byte
long alignment.

* src/vm/properties.c (properties_set)
[ENABLE_JAVASE && WITH_CLASSPATH_SUN]: Set java.ext.dirs and
java.ext.endorsed properly.

* src/vm/jit/dseg.h (dseg_exception_entry): Removed.

* src/vm/jit/intrp/codegen.c (intrp_codegen): Ported methodheader
changes (IsSync, exception table).

* src/vm/jit/stacktrace.c (stacktrace_stack_walk): Changed return type
to bool, fill the temporary stackframe info with the values from the
stackframe info chain, if available.
(stacktrace_create): Don't include fillInStackTrace and init methods
in the trace (as HotSpot does).

* src/native/vm/gnu/java_lang_VMThrowable.c (getStackTrace): Removed
fillInStackTrace and init checks.

* src/native/vm/sun/jvm.c (JVM_GetStackTraceDepth): Use TRACEJVMCALLS,
check for NPE, check if backtrace is NULL.

* src/vm/system.c: Changed copyright to CACAOVM.
* src/vm/system.h: Likewise.

* src/vm/jit/powerpc/codegen.c (codegen_emit): Removed unused variable
ex.

* src/vm/jit/exceptiontable.c: New file.
* src/vm/jit/exceptiontable.h: Likewise.

* src/vm/jit/Makefile.am (libjit_la_SOURCES): Added
exceptiontable.[ch].

* src/vm/exceptions.c (exceptions_handle_exception): Use new exception
table.

* src/vm/jit/code.h (vm/jit/exceptiontable.h): Added.
(codeinfo): Added exceptiontable.

* src/vm/jit/codegen-common.c (codegen_finish): Call
exceptiontable_create.

* src/vm/jit/dseg.c (dseg_addlinenumbertablesize): Removed padding.

* src/vm/jit/methodheader.h (ExTableSize, ExTableStart): Removed.

* src/vm/jit/alpha/asmpart.S,
src/vm/jit/arm/asmpart.S,
src/vm/jit/i386/asmpart.S,
src/vm/jit/m68k/asmpart.S,
src/vm/jit/mips/asmpart.S,
src/vm/jit/powerpc/asmpart.S,
src/vm/jit/powerpc64/asmpart.S,
src/vm/jit/s390/asmpart.S,
src/vm/jit/sparc64/asmpart.S,
src/vm/jit/x86_64/asmpart.S (asm_vm_call_method): Removed exception
table stuff.

* src/vm/jit/alpha/codegen.c,
src/vm/jit/arm/codegen.c,
src/vm/jit/i386/codegen.c,
src/vm/jit/m68k/codegen.c,
src/vm/jit/mips/codegen.c,
src/vm/jit/powerpc/codegen.c,
src/vm/jit/powerpc64/codegen.c,
src/vm/jit/s390/codegen.c,
src/vm/jit/sparc64/codegen.c,
src/vm/jit/x86_64/codegen.c (codegen_emit): Likewise.

* src/vm/jit/codegen-common.c (codegen_generate_stub_builtin): Use
jit_jitdata_new, this is more safe.
(codegen_generate_stub_native): Likewise.

* src/vm/exceptions.c (exceptions_handle_exception): Handle the
asm_vm_call_method special case outside the loop checking for
code == NULL.

* src/vm/exceptions.c (exceptions_handle_exception): Use
code->synchronizedoffset directly for all architectures.

* src/vm/jit/alpha/codegen.c,
src/vm/jit/arm/codegen.c,
src/vm/jit/i386/codegen.c,
src/vm/jit/m68k/codegen.c,
src/vm/jit/mips/codegen.c,
src/vm/jit/powerpc/codegen.c,
src/vm/jit/powerpc64/codegen.c,
src/vm/jit/s390/codegen.c,
src/vm/jit/sparc64/codegen.c,
src/vm/jit/x86_64/codegen.c (codegen_emit): Set
code->synchronizedoffset to rd->memuse * 8.

* src/vm/exceptions.c (exceptions_handle_exception) [__ARM__]: Added
#ifdef to the -8 path.

* src/vm/jit/arm/codegen.c (codegen_emit): Added +1 to rd->memuse for
synchronizedoffset.

* src/vm/jit/methodheader.h (IsSync): Removed.

* src/vm/jit/dseg.c (dseg_addlinenumbertablesize): Removed one of the
paddings.

* src/vm/jit/arm/md.c (md_codegen_get_pv_from_pc): Commented the
IsLeaf-check (this should be removed).

* src/vm/jit/alpha/asmpart.S,
src/vm/jit/arm/asmpart.S,
src/vm/jit/i386/asmpart.S,
src/vm/jit/m68k/asmpart.S,
src/vm/jit/mips/asmpart.S,
src/vm/jit/powerpc/asmpart.S,
src/vm/jit/powerpc64/asmpart.S,
src/vm/jit/s390/asmpart.S,
src/vm/jit/sparc64/asmpart.S,
src/vm/jit/x86_64/asmpart.S (asm_vm_call_method): Removed IsSync from
method-header.

* src/vm/jit/alpha/codegen.c,
src/vm/jit/arm/codegen.c,
src/vm/jit/i386/codegen.c,
src/vm/jit/m68k/codegen.c,
src/vm/jit/mips/codegen.c,
src/vm/jit/powerpc/codegen.c,
src/vm/jit/powerpc64/codegen.c,
src/vm/jit/s390/codegen.c,
src/vm/jit/sparc64/codegen.c,
src/vm/jit/x86_64/codegen.c (codegen_emit): Removed IsSync-dummy
entry.

* src/vm/jit/code.h (codeinfo): Added synchronizedoffset
(temporarily).

* src/vm/exceptions.c (exceptions_handle_exception): Don't use IsSync
but code->synchronizedoffset.

* src/vm/jit/allocator/lsra.c,
src/vm/jit/allocator/simplereg.c,
src/vm/jit/code.c: Use code_is_synchronized.

* src/vm/jit/alpha/codegen.c,
src/vm/jit/arm/codegen.c,
src/vm/jit/i386/codegen.c,
src/vm/jit/m68k/codegen.c,
src/vm/jit/mips/codegen.c,
src/vm/jit/powerpc/codegen.c,
src/vm/jit/powerpc64/codegen.c,
src/vm/jit/s390/codegen.c,
src/vm/jit/sparc64/codegen.c,
src/vm/jit/x86_64/codegen.c: Use code_is_synchronized and set
code->synchronizedoffset.

* src/vm/jit/Makefile.am (noinst_HEADERS): Removed patcher.h

* src/threads/lock-common.h (lock_get_initial_lock_word): Removed prototype.
* src/threads/native/lock.c (lock_get_initial_lock_word): Removed.

* src/vm/jit/codegen-common.c (codegen_add_patch_ref): Removed.
* src/vm/jit/codegen-common.h (patchref) Removed structure.
(codegendata): Removed patchrefs.
(codegen_add_patch_ref): Removed prototype.

* src/vm/jit/emit-common.h (emit_patcher_stubs): Removed prototype.

* src/vm/jit/patcher-common.h: Removed ifdefs around patcher function macros.

* src/vm/jit/patcher.h: Removed file.

* src/vm/jit/arm/codegen.c (codegen_emit_stub_native): Removed patcher
stub.

* src/vm/jit/mips/codegen.c (codegen_emit_stub_native): Removed
patcher stuff.

* src/vm/vm.c (vm_call_method_objectarray): Moved primitive_box into the native
world.

* src/vm/jit/stacktrace.c (stacktrace_stack_walk): Use the flags in
codeinfo to check for leaf-methods.<

* src/vm/jit/stacktrace.h (stackframeinfo_t): Removed method, added
code.

* src/native/jvmti/jvmti.c,
src/vm/jit/replace.c,
src/vm/jit/stacktrace.c: Likewise.

* src/vm/jit/stacktrace.h (stackframeinfo): Renamed to
stackframeinfo_t.

* src/mm/cacao-gc/gc.c,
src/native/jvmti/jvmti.c,
src/threads/native/threads.h,
src/threads/threads-common.c,
src/vm/exceptions.c,
src/vm/jit/alpha/codegen.c,
src/vm/jit/arm/codegen.c,
src/vm/jit/codegen-common.c,
src/vm/jit/i386/codegen.c,
src/vm/jit/jit.c,
src/vm/jit/m68k/codegen.c,
src/vm/jit/m68k/patcher.c,
src/vm/jit/mips/codegen.c,
src/vm/jit/powerpc/codegen.c,
src/vm/jit/powerpc64/codegen.c,
src/vm/jit/replace.c,
src/vm/jit/replace.h,
src/vm/jit/s390/codegen.c,
src/vm/jit/sparc64/codegen.c,
src/vm/jit/sparc64/patcher.c,
src/vm/jit/stacktrace.c,
src/vm/jit/x86_64/codegen.c,
src/vm/signal.c: Likewise.

* src/threads/native/threads.c: Fixed some compiler warnings.
* src/threads/threads-common.c: Likewise.

* tests/gc/LockRecords.java: Added additional cleanup pass after waiting.
* tests/gc/Makefile: Added NativeWeakRef testcase.
* tests/gc/NativeWeakRef.java: Added new testcase.
* tests/gc/native.c: Added native methods for NativeWeakRef testcase.

* src/mm/cacao-gc/gc.c (gc_global_lock): Removed obsolete global lock.
(gc_collect): Use GC mutex as global gc lock.
(gc_reference_register_intern, gc_reference_unregister_intern): Use GC mutex to
lock the reference lists.

* src/mm/cacao-gc/gc.h (GC_MUTEX_LOCK, GC_MUTEX_UNLOCK): Added macros.

* src/threads/native/threads.c [ENABLE_GC_CACAO] (mutex_gc): Added GC mutex.
[ENABLE_GC_CACAO] (threads_mutex_gc_lock, threads_mutex_gc_unlock): Implemented.

* src/threads/threads-common.h [ENABLE_GC_CACAO]
(threads_mutex_gc_lock, threads_mutex_gc_unlock): Added prototypes.

* src/vm/string.c (javastring_toutf): Added check for empty strings.

* src/vm/jit/jit.h (jitdata): Removed isleafmethod.

* src/vm/jit/allocator/lsra.c,
src/vm/jit/allocator/simplereg.c,
src/vm/jit/alpha/codegen.c,
src/vm/jit/alpha/emit.c,
src/vm/jit/arm/codegen.c,
src/vm/jit/arm/md-abi.c,
src/vm/jit/i386/codegen.c,
src/vm/jit/i386/emit.c,
src/vm/jit/inline/inline.c,
src/vm/jit/jit.c,
src/vm/jit/m68k/codegen.c,
src/vm/jit/mips/codegen.c,
src/vm/jit/mips/emit.c,
src/vm/jit/optimizing/lsra.c,
src/vm/jit/optimizing/ssa.c,
src/vm/jit/parse.c,
src/vm/jit/parse.h,
src/vm/jit/powerpc/codegen.c,
src/vm/jit/powerpc/darwin/md-abi.c,
src/vm/jit/powerpc/linux/md-abi.c,
src/vm/jit/powerpc64/codegen.c,
src/vm/jit/powerpc64/linux/md-abi.c,
src/vm/jit/replace.c,
src/vm/jit/s390/codegen.c,
src/vm/jit/s390/emit.c,
src/vm/jit/s390/md-abi.c,
src/vm/jit/show.c,
src/vm/jit/sparc64/codegen.c,
src/vm/jit/sparc64/emit.c,
src/vm/jit/stack.c,
src/vm/jit/x86_64/codegen.c,
src/vm/jit/x86_64/emit.c,
src/vm/jit/x86_64/md-abi.c: Replaced jd->isleafmethod with
code_is_leafmethod.

* src/mm/cacao-gc/gc.c (gc_reflist_weak): Added list for weak references.
(gc_weakreference_register, gc_weakreference_unregister): Implemented.
(gc_collect): Added preliminary call to lock_hashtable_cleanup.

* src/mm/cacao-gc/gc.h (gc_reflist_weak): Added.

* src/mm/cacao-gc/mark.c (mark_post): Added postprocessing function.

* src/mm/cacao-gc/rootset.c (rootset_from_globals): Add weak references.
(reftype_names): Adapted to new enumeration.

* src/mm/gc-common.h: Reference types are now enumerated.
(gc_weakreference_register, gc_weakreference_unregister): Added prototypes.

* src/threads/native/lock.c [ENABLE_GC_CACAO] (lock_hashtable_cleanup): Added.
(lock_record_new, lock_record_free) [ENABLE_GC_CACAO]: Register and unregister
references to lock object with the GC (as weak references).

* src/vm/jit/code.c (code_get_codeinfo_for_pv): Added new function.
(code_find_codeinfo_for_pc): Use above function.
(code_get_methodinfo_for_pv): Likewise.

* src/vm/jit/code.h (code_get_codeinfo_for_pv): Added prototype.

* src/vm/jit/replace.c (replace_pop_activation_record): Use above function.
(replace_patch_method_pointer): Likewise.
(replace_pop_native_frame): Skip native stubs with new sfi correctly.
(replace_push_native_frame): Likewise.

* Merged with rev 974c36a815eb.

* src/cacaoh/headers.h (literalstring_free): Removed obsolete prototype.

* src/vm/stringlocal.h (literalstring_u2, literalstring_free): Likewise.

* src/vm/string.c (heapstring_t): Added typedef.
(stringtable_update): Adapted for handles.
(javastring_tochar): Code cleanup.
(javastring_toutf): Code cleanup.
(literalstring_u2): Made static and adapted for handles.
(literalstring_free): Likewise.
(javastring_intern): Code cleanup and added comments.

* configure.ac (AC_CHECK_FUNCS): Added ftruncate.

* src/native/vm/sun/jvm.c (JVM_DefineClassWithSource): Handle when
name is NULL properly.
(JVM_Lseek): Use TRACEJVMCALLS.
(JVM_SetLength): Implemented.

* src/threads/native/threads.c (threads_detach_thread): Fixed CLDC
build.

* src/vm/jit/powerpc64/codegen.c (codegen_emit_stub_native): Removed
patcher stuff.

* Merged with b23caa4282a5.

* Merged with 3b6c3b177749.

Merged?

(codegen_emit_stub_builtin): Removed.
(codegen_emit_stub_native): Ported to new interface.

Ported to new interface, removed warnings.
(md_signal_handler_sigill): Likewise.

(offset.h): Removed.

(PATCH_BACK_ORIGINAL_MCODE): Added.
(patcher_patch_back): Removed.
(patcher_patch_code): Added.
(patcher_*): Use patchref_t instead of void *sp everywhere.

* tests/regression/Makefile.am (SOURCE_FILES): Removed
extest_clinit.java.

* Merged with 59ff46a9e236.

* src/vm/jit/code.h (stdint.h): Added.
(CODE_FLAG_SYNCHRONIZED): New flag.
(code_is_synchronized): New function.
(code_flag_synchronized): Likewise.
(code_unflag_synchronized): Likewise.

* src/vm/system.c [__DARWIN__]: Fixed includes.

* src/vm/finalizer.c (finalizer_run): Fixed for handles and added boehm-hack.
(finalizer_thread, finalizer_notify): Added debug output.

* src/vmcore/options.c (opt_DebugFinalizer): Added debug switch.
* src/vmcore/options.h (opt_DebugFinalizer): Likewise.

* src/threads/native/lock.c (lock_hashtable_remove): Also frees the lock record.
(lock_record_finalizer): Same as for finalizer_run above.
(lock_hashtable_get) [ENABLE_GC_BOEHM]: Fixed registration of finalizer.

* tests/gc/LockRecords.java: Added new testcase for lock records cleanup.

* src/native/vm/gnu/java_lang_reflect_Field.c (cacao_get_field_address) Removed.
(_field_access_check, _field_get_type, _field_set_type): Added new functions.
(Java_java_lang_reflect_Field_XXX): Adapted to above changes and thereby
fixing it for handles.

* src/native/vm/gnu/java_lang_reflect_Method.c: Just removed bogus casting.

* src/native/jni.c (_Jv_JNI_DeleteLocalRef): Fixed compiler warning.
(_Jv_JNI_GetXXXField, _Jv_JNI_SetXXXField): Fixed for handles.
(_Jv_JNI_GetStaticObjectField, _Jv_JNI_SetStaticObjectField): Likewise.
(_Jv_JNI_SetObjectArrayElement): Adapted to new builtin_canstore.
(_Jv_JNI_NewGlobalRef): Made LLNI critical sections smaller to avoid deadlock.

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

* src/vm/jit/powerpc/arch.h (JIT_COMPILER_VIA_SIGNAL): Temporarily
added.

* src/vm/jit/powerpc/asmpart.S (asm_call_jit_compiler): Removed.
(L_jit_asm_compile$stub): Likewise.
(L_exceptions_get_and_clear_exception$stub): Likewise.

* src/vm/jit/powerpc/codegen.c (codegen_emit_stub_compiler): Removed.

* src/vm/jit/powerpc/codegen.h (COMPILERSTUB_CODESIZE): Adapted size.

* src/vm/jit/powerpc/darwin/md-asm.h (asm_call_jit_compiler): Removed.
(exceptions_get_and_clear_exception): Likewise.
(jit_asm_compile): Likewise.

* src/vm/jit/powerpc/emit.c (emit_trap_compiler): New function.

* src/vm/jit/powerpc/darwin/md-os.c (md_signal_handler_sigsegv): Added
compiler-by-signals code.
* src/vm/jit/powerpc/linux/md-os.c: Likewise.

* src/vm/jit/powerpc/codegen.c (codegen_emit_stub_native): Removed
patcher stuff.

* tests/regression/extest.java: Updated a bit and added another
testcase.
* tests/regression/extest.2output: Updated.
* tests/regression/extest_clinit.java: Removed.

* src/vm/jit/stacktrace.c (stacktrace_stackframeinfo_add) [!NDEBUG]:
Added DebugStackFrameInfo output.
(stacktrace_stackframeinfo_remove): Likewise.
(stacktrace_stack_walk): Bugfix when a patcher in a leaf-method causes
an exception.

* src/vm/builtin.c: Major cleanup of code and commentes, to much to list here,
please accept my apologies for this short commit message. Everything is
Handles-ready now.

* src/vm/builtin.h: Adapted signatures of builtins and added vim boilerplate.

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

* src/threads/native/lock.h: Use above macro for internal locking.
(LOCK_WAIT_FOREVER, LOCK_NOTIFY): Added new macros.

* src/vm/finalizer.c: Use internal locking macros throughout the code.
* src/vm/jit/optimizing/recompile.c: Likewise.

* src/vm/jit/replace.c (replace_create_replacement_points): Use new
code inline functions.
(replace_pop_activation_record): Likewise.
(replace_push_activation_record): Likewise.

* src/vm/jit/arm/emit.c (emit_verbosecall_exit): Fixed comments.

* src/vm/vm.c (vm_create): Moved localref_table_init from vm_createjvm.

* src/native/vm/cldc1.1/java_lang_Object.c
(Java_java_lang_Object_notify): Adapted to new locking function signatures.
(Java_java_lang_Object_notifyAll): Likewise.
(Java_java_lang_Object_wait): Likewise.

* src/native/vm/gnu/java_lang_VMObject.c
(Java_java_lang_VMObject_notify): Adapted to new locking function signatures.
(Java_java_lang_VMObject_notifyAll): Likewise.
(Java_java_lang_VMObject_wait): Likewise.

* src/native/vm/sun/jvm.c
(JVM_MonitorWait): Adapted to new locking function signatures.
(JVM_MonitorNotify): Likewise.
(JVM_MonitorNotifyAll): Likewise.

* Merged with ad640e81c710.

* src/vm/jit/code.h (codeinfo): Renamed codeflags to flags.
(CODE_IS_VALID, CODE_IS_INVALID, CODE_IS_LEAFMETHOD)
(CODE_SETFLAG_INVALID, CODE_SETFLAG_LEAFMETHOD): Removed.
(code_is_invalid, code_flag_invalid, code_unflag_invalid): New inline
function.
(code_is_leafmethod, code_flag_leafmethod, code_unflag_leafmethod):
Likewise.

* src/vm/jit/jit.c (jit_invalidate_code): Use new inline functions.
(jit_get_current_code): Likewise.

* src/threads/lock-common.h: Changed signature of most locking functions to
take handles as arguments.

* src/cacaoh/dummy.c: Adapted to new signatures.

* src/threads/native/lock.c: Adapted to new signatures and added LLNI critical
sections. Will slow down locking for [ENABLE_HANDLES && ENABLE_GC_CACAO].
(lock_lockword_get). Implemented.
(lock_lockword_set): Implemented.

* src/vm/jit/alpha/emit.c (emit_verbosecall_enter): Adapted to use new tracer.
(emit_verbosecall_exit): Likewise.

* src/vm/jit/alpha/md-abi.h (TRACE_ARGS_NUM): Removed.

* src/native/llni.h (LLNI_CRITICAL_START_THREAD): Added faster macro.
(LLNI_CRITICAL_END_THREAD): Likewise.

* src/native/llni.c (llni_critical_start_thread): Implemented faster function.
(llni_critical_end_thread): Likewise.

* src/native/llni.h (LLNI_field_set_ref): Fixed problem with NULL references.

* src/vm/builtin.c (builtin_print_argument): Removed obsolete function.
(builtin_verbosecall_enter): Made a dummy function, use new tracer.
(builtin_verbosecall_exit): Likewise.

* src/vm/jit/powerpc64/emit.c (emit_verbosecall_enter): Adapted to use new tracer.
(emit_verbosecall_exit): Likewise.

* src/vm/jit/powerpc64/linux/md-abi.h (TRACE_ARGS_NUM): Removed.

* src/vm/jit/arm/emit.c (emit_verbosecall_enter): Adapted to use new tracer.
(emit_verbosecall_exit): Likewise.

* src/vm/jit/arm/md-abi.h (TRACE_ARGS_NUM): Removed.

* src/vm/jit/i386/emit.c (emit_verbosecall_enter): Adapted to use new tracer.
(emit_verbosecall_exit): Likewise.

* src/vm/jit/i386/md-abi.h (TRACE_ARGS_NUM): Removed.

* src/vm/jit/x86_64/emit.c (emit_verbosecall_enter): Adapted to use new tracer.
(emit_verbosecall_exit): Likewise.

* src/vm/jit/x86_64/md-abi.h (TRACE_ARGS_NUM): Removed.

* src/vm/jit/s390/md-abi.h (TRACE_ARGS_NUM): Removed, already uses new tracer.

* src/vm/jit/powerpc/darwin/md-abi.h (TRACE_ARGS_NUM): Likewise.
* src/vm/jit/powerpc/linux/md-abi.h (TRACE_ARGS_NUM): Likewise.
* src/vm/jit/powerpc/netbsd/md-abi.h (TRACE_ARGS_NUM): Likewise.

* src/vm/jit/powerpc/emit.c (vm/builtin.h): Removed obsolete include.

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

* src/threads/threads-common.c: Use above functions throughout the code.

* src/threads/native/threads.c: Likewise.

* src/native/vm/java_lang_Thread.c: Likewise.
(_Jv_java_lang_Thread_start): Fixed compiler warning.
(_Jv_java_lang_Thread_currentThread) [ENABLE_JAVASE]: Fixed for handles.

* src/native/llni.h (LLNI_objectarray_element_set) Removed.
(LLNI_objectarray_element_get) Removed.

* src/native/jni.c: Use array_objectarray functions throughout the code.
* src/vm/builtin.c: Likewise.

* src/native/jni.c (_Jv_JNI_DeleteLocalRef): Handle NULL references correctly.
* src/native/localref.c (localref_add, localref_del): Added assertion.

* src/vm/jit/jit.c (jit_compile_intern): Use native_method_resolve and
check for exception.

* src/vm/jit/x86_64/codegen.c (codegen_emit_stub_native): Removed
patcher stuff.

* src/native/native.c (native_resolve_function): Renamed to
native_method_resolve.
* src/native/native.h: Likewise.

* src/vm/jit/patcher-common.c (patcher_resolve_native_function):
Likewise.

* src/vm/jit/allocator/simplereg.c (ICMD_IF_FCMPxx, ICMD_IF_FCMPL_xx):
Removed.
* src/vm/jit/jit.h: Likewise.
* src/vm/jit/powerpc/codegen.c: Likewise.
* src/vm/jit/powerpc64/codegen.c: Likewise.
* src/vm/jit/show.c: Likewise.
* src/vm/jit/stack.c: Likewise.
* src/vm/jit/verify/icmds.c: Likewise.