* src/vm/jit/codegen-common.h (codegen_finish_native_call): Changes signature.

* src/vm/jit/codegen-common.c (codegen_finish_native_call): Takes the same
arguments as the enter pendant now.

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

* src/vm/jit/arm/codegen.c: Likewise.
* src/vm/jit/i386/codegen.c: Likewise.
* src/vm/jit/m68k/codegen.c: Likewise.
* src/vm/jit/mips/codegen.c: Likewise.
* src/vm/jit/powerpc/codegen.c: Likewise.
* src/vm/jit/powerpc64/codegen.c: Likewise.
* src/vm/jit/s390/codegen.c: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.

* src/vm/jit/codegen-common.c (codegen_start_native_call) [__POWERPC__]: Tracer
for native methods is called from here now.

* src/vm/jit/powerpc/codegen.c (codegen_emit_stub_native): Removed verbosecall
enter tracer.

* src/vm/jit/powerpc/emit.c (emit_verbosecall_enter, emit_verbosecall_exit):
Adapted to new tracer functions.

* src/vm/jit/trace.c (_array_load_param, _array_load_return_value): Optimized
passing of register arguments.

* changed src/native/vm/sun/jvm.c: Throw IllegalArgumentException in all
ConstantPool.get*At(int) methods as expected by OpenJDK.

* changed src/native/vm/gnu/sun_reflect_ConstantPool.c: Likewise.

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

* src/native/vm/java_lang_Class.c (isArray): Removed.
* src/native/vm/java_lang_Class.h: Likewise.
* src/native/vm/cldc1.1/java_lang_Class.c (isArray): New function.
* src/native/vm/gnu/java_lang_VMClass.c (isArray): Use class_is_array.

* src/vm/jit/mips/linux/md-os.c (mm/memory.h): Added.
(md_init): Use int instead of u1 for GCNEW.

* configure.ac (AC_CHECK_ENABLE_INTRP): Added.
(AC_CHECK_ENABLE_GC): Likewise.
(AC_CHECK_ENABLE_DEBUG): Likewise.
(AC_CHECK_ENABLE_DUMP): Likewise.

* m4/debug.m4: New file.
* m4/dump.m4: Likewise.
* m4/gc.m4: Likewise.
* m4/intrp.m4: Likewise.

* configure.ac (static-classpath): Removed.

* src/cacao/Makefile.am,
src/native/Makefile.am,
src/native/include/Makefile.am: Removed WITH_STATIC_CLASSPATH if's.

* src/native/native.c (native_findfunction): Removed.
* src/native/native.h (nativeref, nativecompref): Removed.
(native_findfunction): Removed.

* src/native/tools/Makefile.am: Removed.
* src/native/tools/gennativetable.c: Likewise.

* src/cacao/cacao.c,
src/vm/jit/alpha/codegen.c,
src/vm/jit/alpha/patcher.c,
src/vm/jit/arm/codegen.c,
src/vm/jit/arm/patcher.c,
src/vm/jit/i386/codegen.c,
src/vm/jit/i386/patcher.c,
src/vm/jit/intrp/java.vmg,
src/vm/jit/intrp/patcher.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/mips/patcher.c,
src/vm/jit/patcher-common.h,
src/vm/jit/patcher.h,
src/vm/jit/powerpc/codegen.c,
src/vm/jit/powerpc/patcher.c,
src/vm/jit/powerpc64/codegen.c,
src/vm/jit/powerpc64/patcher.c,
src/vm/jit/s390/codegen.c,
src/vm/jit/s390/patcher.c,
src/vm/jit/sparc64/codegen.c,
src/vm/jit/sparc64/patcher.c,
src/vm/jit/x86_64/codegen.c,
src/vm/jit/x86_64/patcher.c,
src/vm/properties.c: Removed WITH_STATIC_CLASSPATH #ifdef's.

* src/mm/cacao-gc/rootset.c (rootset_readout): Ignore threads in state new.

* src/mm/cacao-gc/heap.c (heap_alloc): Wrap reference befor returning.
(heap_alloc_intern): Respect stress-test option flag.

* src/mm/cacao-gc/gc.c (gc_collect): Respect debug rootset option flag.

* src/vmcore/options.h [ENABLE_GC_CACAO] (opt_GCDebugRootSet): Added.
[ENABLE_GC_CACAO] (opt_GCStress): Likewise.

* src/vmcore/options.c (options_xx) [ENABLE_GC_CACAO]: Parse above two options.

* Merged with 3aaaa9f60c5d.

* Merge with 405cda264bce.

* src/native/llni.h: Fixed a lot of compiler warnings.

* src/native/vm/reflect.c (reflect_field_new): Removed bogus cast.
(reflect_method_new): Likewise.

* src/vm/builtin.c (builtin_multianewarray): Fixed compiler warning.

* Not sure what this commit should do, let's see.

* src/vmcore/class.c (class_get_classloader): New function.
* src/vmcore/class.h: Likewise.
* src/native/vm/java_lang_Class.c
(_Jv_java_lang_Class_getClassLoader): Removed.
* src/native/vm/java_lang_Class.h: Likewise.
* src/native/vm/gnu/java_lang_VMClass.c (getClassLoader): Use
class_get_classloader.
* src/native/vm/sun/jvm.c (JVM_GetClassLoader): Likewise.

* src/vm/jit/codegen-common.c (codegen_start_native_call): Return class
argument for static native methods.

* src/vm/jit/codegen-common.h (codegen_start_native_call): Adapted signature.

* src/vm/jit/alpha/codegen.c (codegen_emit_stub_native): Class argument is no
longer placed onto the data segment.

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

* src/vm/exceptions.c (exceptions_handle_exception): Restructured to create sfi.

* src/mm/cacao-gc/heap.h (FOREACH_OBJECT_REF): Adapted to new classinfo->super.
* src/mm/cacao-gc/mark.c (mark_recursive): Likewise.

* src/native/localref.h (localref_fill): Added prototype.

* src/native/localref.c (localref_fill): Implemented.
(localref_frame_push): Fixed compiler warning.
(_array_store_param): Added temporarily.

* src/vm/jit/trace.c (_array_load_param): Made non-static.

* src/vm/jit/codegen-common.c (codegen_start_native_call): Call localref_fill.

* Merged with 291b838f1aed.

* tests/regression/jasmin/runtest: Make executable.
* tests/regression/jasmin/show: Likewise.

* src/vm/jit/codegen-common.c (codegen_generate_stub_builtin): Added workaround
for builtins returning booleans to indicate exceptions.

* src/vm/jit/powerpc/codegen.c (codegen_emit_stub_builtin): Workaround was
moved to codegen-common.c to keep codegens clean.

* src/native/vm/sun_misc_Unsafe.c
(Java_sun_misc_Unsafe_defineClass) [ENABLE_HANDLES]: Fixed array access.
(Java_sun_misc_Unsafe_allocateInstance): Fixed compiler warning.

* src/vmcore/class.c (classref_or_classinfo_println): Fixed infinite recursion.

* tests/regression/native/testarguments.c: Adapted testcase to support handles.

* src/vm/jit/codegen-common.h (codegen_start_native_call): Changed signature.

* src/vm/jit/codegen-common.c (codegen_start_native_call): Takes less arguments
now and computes values by itself. This makes the codegens simpler.

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

* src/vm/jit/arm/codegen.c: Likewise.
* src/vm/jit/i386/codegen.c: Likewise.
* src/vm/jit/m68k/codegen.c: Likewise.
* src/vm/jit/mips/codegen.c: Likewise.
* src/vm/jit/powerpc/codegen.c: Likewise.
* src/vm/jit/powerpc64/codegen.c: Likewise.
* src/vm/jit/s390/codegen.c: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.

* tests/gc/NativeGlobalRef.java: Improved testcase.
* tests/gc/native.c: Likewise.

* src/native/localref.c (localref_del): Go through all local frames.

src/vm/exceptions.c (exceptions_asm_new_abstractmethoderror): Unwrap exception.

* src/vm/jit/stacktrace.c (stacktrace_create): Enabled -XX:+DebugStackTrace.
* src/vmcore/options.c (options_XX): Added some descriptions.

* src/native/jni.c (_Jv_JNI_DetachCurrentThread): We need to pop all
frames before we can destroy the table.

* src/vm/jit/trace.c (native/jni.h): Added.

* src/vm/jit/codegen-common.c (codegen_generate_stub_builtin)
[__POWERPC__]: Define added.
* src/vm/jit/powerpc/codegen.c (codegen_emit): ICMD_BUILTIN: Use stub.
(codegen_emit_stub_builtin): New function.
(codegen_emit_stub_native): Fixed some offsets.
* src/vm/jit/powerpc/linux/md-os.c (md_signal_handler_sigusr1): New
function.

merge with branch e6c59621d39a

* src/native/vm/sun/jvm.c (JVM_FindClassFromClassLoader): Add CL to hashtable.
(JVM_DefineClassWithSource): Likewise.
(JVM_FindLoadedClass): Likewise.

* tests/regression/TestAnnotations.java: Removed umlauts.

* src/vm/builtin.c (methodindent, callcount): Removed static variables.
(builtin_throw_exception): Use trace_exception_builtin.
(builtin_verbosecall_enter): Use thread-specific variables.
(builtin_verbosecall_exit): Likewise.

* src/vm/exceptions.c (exceptions_handle_exception): Fixed methodindent for
java call traces.

* src/vm/jit/trace.c: Added comments and minor cleanups.
(trace_exception_builtin): Implemented (moved from builtin.c).

* src/vm/jit/trace.h (trace_exception_builtin): Added prototype.

* src/vm/jit/powerpc/emit.c (emit_verbosecall_exit) [__DARWIN__]: Fixed passing
of methodinfo argument.

* src/vm/builtin.c (builtin_canstore): Throw an ArrayStoreException.
(builtin_fast_canstore): Do not throw any exceptions.

* src/vm/builtin.h (BUILTIN_canstore): Removed.

* src/vm/builtintable.inc: Adapted entry for builtin_canstore.

* src/vm/exceptions.h (EXCEPTION_HARDWARE_ARRAYSTORE): Added.

* src/vm/signal.c (signal_handle): Added case for ArrayStoreException.

* src/vm/jit/emit-common.h (emit_arraystore_check): Added prototype.

* src/vm/jit/stack.c (stack_analyse): ICMD_AASTORE now uses fast canstore.

* src/vm/jit/alpha/codegen.c (codegen_emit): ICMD_AASTORE uses fast canstore.
* src/vm/jit/alpha/emit.c (emit_arraystore_check): Implemented.

* src/vm/jit/arm/codegen.c: Likewise.
* src/vm/jit/arm/emit.c: Likewise.
* src/vm/jit/i386/codegen.c: Likewise.
* src/vm/jit/i386/emit.c: Likewise.
* src/vm/jit/m68k/codegen.c: Likewise.
* src/vm/jit/m68k/emit.c: Likewise.
* src/vm/jit/mips/codegen.c: Likewise.
* src/vm/jit/mips/emit.c: Likewise.
* src/vm/jit/powerpc/codegen.c: Likewise.
* src/vm/jit/powerpc/emit.c: Likewise.
* src/vm/jit/powerpc64/codegen.c: Likewise.
* src/vm/jit/powerpc64/emit.c: Likewise.
* src/vm/jit/s390/codegen.c: Likewise.
* src/vm/jit/s390/emit.c: Likewise.
* src/vm/jit/sparc64/codegen.c: Likewise.
* src/vm/jit/sparc64/emit.c: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.
* src/vm/jit/x86_64/emit.c: Likewise.

* src/vm/array.c (array_length_get): Better use LLNI_class_get here.

* THIRDPARTY: Added copyright notice for newly imported files.

* src/lib/Makefile.am
(VM_JAVA_FILES) [ENABLE_ANNOTATIONS]: Added
$(top_srcdir)/src/lib/gnu/sun/reflect/annotation/ExceptionProxy.java and
$(top_srcdir)/src/lib/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java
(VM_CLASS_FILES) [ENABLE_ANNOTATIONS]: Added
classes/sun/reflect/annotation/ExceptionProxy.class and
classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.class

* src/lib/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java:
Imported from OpenJDK. This file was only an unimplemented stub in GNU Classpath.

* src/lib/gnu/sun/reflect/annotation/ExceptionProxy.java: Likewise.

* src/native/jni.c (_Jv_JNI_FindClass) [ENABLE_JAVAME_CLDC1_1]:
Implemented.

* src/vmcore/class.h (classinfo): Changed type of super and interfaces
to classinfo*.
* src/cacaoh/headers.c (printfields): Removed .cls for super class
and/or interfaces.
* src/vm/initialize.c (initialize_class_intern): Likewise.
* src/vm/jit/verify/typecheck-invoke.inc: Likewise.
* src/vm/jit/verify/typeinfo.c (interface_extends_interface):
Likewise.
(typeinfo_merge_nonarrays): Likewise.
* src/vm/resolve.c (resolve_method_invokespecial_lookup): Likwise.
* src/vmcore/class.c (class_free): Likewise.
(class_resolvemethod): Likewise.
(class_resolveinterface_intern): Likewise.
(class_resolveclassmethod): Likewise.
(class_findfield): Likewise.
(class_resolvefield_int): Likewise.
(class_get_interfaces): Likewise.
(class_issubclass): Likewise.
(class_get_superclass): Likewise.
(class_showmethods): Likewise.
(class_showmethods): Likewise.
(class_resolve_superclass): Removed.
* src/vmcore/linker.c (linker_init): Removed .cls for super class
and/or interfaces.
(linker_compute_subclasses): Likewise.
(linker_addinterface): Likewise.
(link_class_intern): Moved verifier checks into classfile parsing
stage.
* src/vmcore/loader.c (vm/resolve.h): Added.
(load_class_from_classbuffer_intern): Resolve super class and super
interfaces during loading. This is also done by the RI.
(load_newly_created_array): Removed .cls for super class and/or
interfaces.
* src/vmcore/primitivecore.c (primitive_init): Likewise.

* .hgignore: Ignore files in tests/.

* src/vm/jit/codegen-common.c (llni.h): Added.
(codegen_stub_builtin_exit): Use stacktrace function to remove stackframeinfo.
(codegen_finish_native_call): Likewise. Unwrap exception object before return.

* src/vm/jit/stacktrace.h (stacktracebuffer): Entries are stored inside stb now.
(stacktracecontainer): Removed data field.

* src/vm/jit/stacktrace.c (stacktrace_add_entry) Adapted to above changes.
(stacktrace_add_method): Likewise.
(stacktrace_create): Likewise.
(stacktrace_fillInStackTrace): Stacktracebuffer can be copied at once.

* tests/StackTraceBig.java: Added testcase for large stacktraces.

* src/vm/builtin.c (builtin_canstore): Fixed severe typo.

* src/vm/builtin.c: Use LLNI macros throughout the file.
(builtin_fast_canstore): Previously builtin_canstore.
(builtin_canstore): Implemented.
(builtin_trace_exception): Moved to trace.c.

* src/vm/builtin.h: Fixed prototypes.

* src/vm/exceptions.c (exceptions_handle_exception): Use trace_exception
instead of builtin.

* src/vm/jit/trace.c (trace_exception): Added (moved from builtin.c).

* src/vm/jit/trace.h (trace_exception): Added prototype.

* src/vm/jit/trace.c (trace_java_call_print_argument): Deals with java_object_t.

* src/vm/exceptions.h (exceptions_asm_new_abstractmethoderror): Fixed prototype.

* src/vm/exceptions.c: Use LLNI_class_get throughout file.
(exceptions_get_exception): Wrap exception object.
(exceptions_set_exception): Unwrap exception object.

* src/vm/vm.c: Use LLNI_class_get throughout file.

* src/cacaoh/dummy.c (array_objectarray_element_set): Fixed for handles.
(array_objectarray_element_get): Likewise.
(builtin_anewarray): Likewise.
(builtin_newarray_byte): Likewise.
(localref_add): Added.

* src/native/include/Makefile.am [ENABLE_ANNOTATIONS]: Create java_util_Map.h.

* src/native/vm/gnu/java_lang_reflect_Constructor.c: Use above header.
* src/native/vm/gnu/java_lang_reflect_Field.c: Likewise.
* src/native/vm/gnu/java_lang_reflect_Method.c: Likewise.

* src/native/vm/java_lang_ClassLoader.c (_Jv_java_lang_ClassLoader_defineClass):
Removed bugging assertion. It seems defineClass can take NULL as classloader.

* src/native/jni.c (_Jv_JNI_GetObjectField): Fixed implementation for handles.
(_Jv_JNI_SetObjectField): Likewise.

* tests/regression/native/checkjni.c: Added testcase for above change.
* tests/regression/native/checkjni.java: Likewise.
* tests/regression/native/checkjni.output: Adapted output to above changes.

* src/vm/jit/i386/codegen.c (codegen_emit_stub_builtin): Removed obsolete
assertion.

* src/vm/jit/m68k/codegen.c (codegen_emit_stub_builtin): Likewise.

* Merged with exact-gc branch at rev 2d4098fc2ea4.

* src/lib/Makefile.am: Fixed another merge problem.
* src/native/vm/Makefile.am: Removed resurrected files.
* src/native/vm/java_lang_String.c: Removed resurrected file.
* src/native/vm/java_lang_String.h: Likewise.

--HG--
branch : exact-gc

* src/vmcore/class.c (class_free): Fixed another merge problem (thx to panzi).

--HG--
branch : exact-gc

* src/native/vm/gnu/java_lang_VMClassLoader.c
(Java_java_lang_VMClassLoader_findLoadedClass): Add classloader to hashtable
instead of searching for it.

--HG--
branch : exact-gc

* src/threads/native/threads.c (threads_stopworld) [__DARWIN__]: Disabled.
(threads_startworld) [__DARWIN__]: Likewise.

* src/vm/jit/codegen-common.c (codegen_generate_stub_builtin): Disabled for
archs where codegen_emit_stub_builtin is not yet implemented.

--HG--
branch : exact-gc

* tests/gc/ClassUnload.java: Added testcase for class unloading.

--HG--
branch : exact-gc

* src/native/vm/gnu/java_lang_reflect_Method.c
(Java_java_lang_reflect_Method_invokeNative): Fixed LLNI macro usage.

* src/native/vm/java_lang_String.c (_Jv_java_lang_String_intern): Wrap interned
strings into a handle.

* src/vm/access.c (access_check_field): Use LLNI macro for array access.
(access_check_method): Likewise.

* src/vm/jit/stacktrace.c (stacktrace_getClassContext): Likewise.
(stacktrace_getStack): Likewise.

* src/vm/jit/stacktrace.h (md-abi.h): Added missing include.

--HG--
branch : exact-gc

* src/mm/cacao-gc/heap.c (heap_alloc_intern) [!NDEBUG]: Added sanity check.

* src/vm/jit/codegen-common.c
(codegen_stub_builtin_enter): Removed native-world flag manipulation.
(codegen_stub_builtin_exit): Likewise.
(codegen_start_native_call): Likewise.
(codegen_finish_native_call): Likewise.

--HG--
branch : exact-gc

* configure.ac: Added missing newline.
* src/native/jni.c: Fixed some merge problems
* src/native/vm/java_lang_ClassLoader.c: Likewise.
* src/native/vm/nativevm.c: Likewise.
* src/vmcore/loader.c: Likewise.

--HG--
branch : exact-gc

* tests/regression/native/checkjni.java: Added some new JNI testcases.
* tests/regression/native/checkjni.c: Likewise.
* tests/regression/native/checkjni.output: Adapted output to new testcases.

* Removed leftover Id tags.

--HG--
branch : exact-gc

* Merged with default branch at rev 16f3633aaa5a.

--HG--
branch : exact-gc

* Dummy commit to fix conversion problems with some files.

--HG--
branch : exact-gc

* src/native/jni.c (native/include/java_lang_Byte.h,
native/include/java_lang_Character.h,
native/include/java_lang_Short.h,
native/include/java_lang_Integer.h,
native/include/java_lang_Boolean.h,
native/include/java_lang_Long.h,
native/include/java_lang_Float.h,
native/include/java_lang_Double.h): Removed.
[WITH_CLASSPATH_SUN] (class_sun_nio_ch_DirectBuffer)
(class_java_nio_DirectByteBuffer, dbb_init): Added.
(jni_init) [WITH_CLASSPATH_SUN]: Added direct-buffer stuff.
(_Jv_JNI_ExceptionOccurred): Added TRACEJNICALLS.
(_Jv_JNI_ToReflectedMethod): Likewise.
(_Jv_JNI_GetStaticMethodID): Likewise.
(_Jv_JNI_DestroyJavaVM): Likewise.
(_Jv_JNI_ExceptionDescribe): Fixed bug.
(_Jv_JNI_NewDirectByteBuffer) [WITH_CLASSPATH_SUN]: Implemented.
(_Jv_JNI_GetDirectBufferAddress): Likewise.

* src/native/vm/sun_misc_Unsafe.c (getFloat): Implemented.
(getShort): Likewise.
(getFloat): Likewise.

* src/native/jni.c (_Jv_JNI_GetVersion): Return JNI_VERSION_1_6.
(GetObjectRefType): New function.
(_Jv_JNINativeInterface): Added jni_GetObjectRefType.
* src/native/vm/sun/jvm.c (JVM_IsSupportedJNIVersion): Added
JNI_VERSION_1_6.

* src/native/vm/sun_misc_Unsafe.c (getLong): Implemented.
(putByte): Likewise.
(putShort): Likewise.
(setMemory): Likewise.

* src/threads/native/threads.h: Added THREAD_NATIVEWORLD macros.
* src/threads/none/threads.h: Likewise.
* src/vm/jit/stacktrace.c (stacktrace_remove_stackframeinfo): Use above macros.
(stacktrace_create_extern_stackframe): Likewise.
(stacktrace_create_native_stackframe): Likewise.

--HG--
branch : exact-gc

merge with b3167e4ef780

merge branch

* src/native/vm/sun/jvm.c (JVM_NewArray): Added NPE check.
(JVM_NewMultiArray): Implemented, but needs review at a later point.

* src/vmcore/loader.c (load_class_from_classbuffer): Renamed to
load_class_from_classbuffer_intern.
(load_class_from_classbuffer): New function.

* src/vmcore/annotations.c (vmcore/loader.h): Added include.

* src/vmcore/loader.c (load_class_from_classloader)
[WITH_CLASSPATH_SUN]: Call loadClassInternal.
* src/vmcore/utf8.c (utf_loadClassInternal): Added.
(utf8_init): Initialize utf_loadClassInternal.
* src/vmcore/utf8.h (utf_loadClassInternal): Added.

* src/cacaoh/cacaoh.c (main): Added loader_preinit call.

* src/vm/primitive.h (primitive_init): Changed return type to void.
(primitive_postinit): New function.

* src/vm/vm.c (vm_create): Use new init functions.

* src/vmcore/linker.c (stdint.h): Added.
(linker_preinit): New function.
(linker_init): Moved basic stuff into linker_preinit, call vm_abort if
error occurred.

* src/vmcore/linker.h (linker_preinit): New function.
(linker_init): Changed return type to void.

* src/vmcore/loader.c (loader_preinit): New function.
(loader_init): Moved basic stuff into loader_preinit, call vm_abort if
error occurred.

* src/vmcore/loader.h (loader_preinit): New function.
(loader_init): Changed return type to void.

* src/vmcore/primitivecore.c (vm/vm.h): Added.
(primitive_init): Load and link primitive-type classes and array-class
ASAP, this is important for annotations.
(primitive_postinit): New function.

* src/native/vm/java_lang_Class.c (_Jv_java_lang_Class_getDeclaredAnnotations):
Removed unnecessary exceptions_get_exception() check.

* src/vmcore/annotation.c (annotation_bytearrays_resize): Fixed comment.

* src/vmcore/annotation.c (stdint.h): Added.

* src/vmcore/field.c
(vm/array.h): Added include.
(mm/memory.h): Removed doubled include.
(field_get_annotations): Added cast for array_length_get()s parameter.

* src/vmcore/method.c
(vm/array.h): Added include.
(method_get_annotations): Added cast for array_length_get()s parameter.
(method_get_parameterannotations): Added cast for array_length_get()s parameter.
(method_get_annotationdefault): Added cast for array_length_get()s parameter.

* src/vmcore/annotation.c
(annotation_bytearrays_resize): Removed unused variables.

* src/vmcore/annotation.h: Sorted includes.
(vmcore/utf8.h): Removed include.

* autogen.sh: Made executeable.

* src/cacaoh/dummy.c
(mm/memory.h): Added include.
(native/llni.h): Added include.
(array_objectarray_element_get): Added dummy implementation.
(array_objectarray_element_set): Added dummy implementation.
(array_length_get): Added dummy implementation.
(builtin_anewarray): Added dummy implementation using MNEW.
(builtin_newarray_byte): Added dummy implementation using MNEW.
(primitive_arrayclass_get_by_type): Added dummy implementation.

* src/mm/boehm-gc/autogen.sh: Made executeable.

* src/native/vm/gnu/java_lang_reflect_Constructor.c
(Java_java_lang_reflect_Constructor_declaredAnnotations):
Removed unused variable o.
(Java_java_lang_reflect_Constructor_getParameterAnnotations):
Removed unused variable o.

* src/native/vm/gnu/java_lang_reflect_Field.c
(Java_java_lang_reflect_Field_declaredAnnotations):
Removed unused variable o.

* src/native/vm/gnu/java_lang_reflect_Method.c
(Java_java_lang_reflect_Method_getDefaultValue):
Removed unused variable o.
(Java_java_lang_reflect_Method_declaredAnnotations):
Removed unused variable o.
(Java_java_lang_reflect_Method_getParameterAnnotations):
Removed unused variable o.

* src/native/vm/gnu/sun_reflect_ConstantPool.c
(_Jv_sun_reflect_ConstantPool_init): Removed usage of global string
utf_sun_reflect_ConstantPool.

* src/native/vm/java_lang_Class.c [WITH_CLASSPATH_GNU] [ENABLE_ANNOTATIONS]:
Sorted includes.
(_Jv_java_lang_Class_getDeclaredAnnotations): Fixed comment.

* src/vmcore/annotation.c
(native/llni.h): Added include.
(vm/array.h): Added include.
(vm/builtin.h): Added include.
(vm/primitive.h): Added include.
(annotation_bytearray_new): Removed.
(annotation_bytearray_free): Removed.
(annotation_bytearrays_new): Removed.
(annotation_bytearrays_free): Removed.
(annotation_bytearrays_resize): Made static and now java_handle_objectarray_t
is used instead of my own array type.
(annotation_bytearrays_insert): Made static and now java_handle_objectarray_t
is used instead of my own array type.
(annotation_load_attribute_body):
Using java_handle_bytearray_t instead of my own array type.
(annotation_load_method_attribute_annotationdefault):
Using java_handle_bytearray_t and java_handle_objectarray_t instead of my own
array types.
(annotation_load_method_attribute_runtimevisibleparameterannotations):
Using java_handle_bytearray_t and java_handle_objectarray_t instead of my own
array types.
(annotation_load_method_attribute_runtimevisibleannotations):
Using java_handle_bytearray_t and java_handle_objectarray_t instead of my own
array types.
(annotation_load_field_attribute_runtimevisibleannotations):
Using java_handle_bytearray_t and java_handle_objectarray_t instead of my own
array types.

* src/vmcore/annotation.h
(annotation_bytearray_t): Removed.
(annotation_bytearrays_t): Removed.
(annotation_bytearray_new): Removed.
(annotation_bytearray_free): Removed.
(annotation_bytearrays_new): Removed.
(annotation_bytearrays_resize): Removed.
(annotation_bytearrays_insert): Removed.
(annotation_bytearrays_free): Removed.

* src/vmcore/class.c
(class_sun_reflect_annotation_AnnotationParser): Is only declared when
WITH_CLASSPATH_GNU is defined.
(class_free) [ENABLE_ANNOTATIONS]: Removed usage of
annotation_bytearray*_free() functions.
(class_get_annotations): Don't have to copy anything now, just return the
java_handle_bytearray_t.

* src/vmcore/class.h
(classinfo): Fixed comments.
(classinfo) [ENABLE_ANNOTATIONS]: Now using java_handle_bytearray_t and
java_handle_objectarray_t instead of my own array types.

* src/vmcore/loader.c
(loader_init): Removed usage of global string utf_sun_reflect_ConstantPool
and utf_sun_reflect_annotation_AnnotationParser.

* src/vmcore/field.c
(vm/array.h): Added include.
(field_get_annotations): Don't have to copy anything now, just return the
java_handle_bytearray_t.

* src/vmcore/method.c
(vm/array.h): Added include.
(method_get_annotations): Don't have to copy anything now, just return the
java_handle_bytearray_t.
(method_get_parameterannotations): Don't have to copy anything now, just return
the java_handle_bytearray_t.
(method_get_annotationdefault): Don't have to copy anything now, just return
the java_handle_bytearray_t.

* src/vmcore/utf8.c
(utf_sun_reflect_ConstantPool): Removed.
(utf_sun_reflect_annotation_AnnotationParser): Removed.

* src/vmcore/utf8.h
(utf_sun_reflect_ConstantPool): Removed.
(utf_sun_reflect_annotation_AnnotationParser): Removed.

* src/vm/jit/show.c (show_icmd): ICMD_MULTIANEWARRAY: Print class
name.

* Removed all Id tags.

* src/vm/vm.c (vm_printconfig): Better and correct output.

* Added *~.

* .hgignore: New file.

* src/vm/vm.c (vm_create) [ENABLE_JAVASE]: Removed #ifdef for setting
sun.boot.class.path and java.boot.class.path.
* src/vmcore/suck.c (suck_add_from_property): Likewise.

* src/vm/vm.c (vm_create): Free properties after they have been
replaced.
* src/vmcore/suck.c (suck_add_from_property): Likewise.

* src/vm/properties.c (properties_set): Smaller changes.

* src/vm/properties.c (properties_set): Fixed build for CLDC-1.1,
removed getenv of JAVA_HOME.

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

* src/vm/vm.c [WITH_JRE_LAYOUT] (libgen.h, unistd.h): Removed.

* src/vm/properties.c (errno.h): Added.
[WITH_JRE_LAYOUT] (libgen.h): Likewise.
(properties_set) [WITH_CLASSPATH_SUN]: Set sun.boot.library.path
property.

* src/native/vm/nativevm.c (vm/properties.h): Added.
(nativevm_preinit) [WITH_CLASSPATH_SUN]: Use properties_get to get
sun.boot.library.path.

* src/vm/jit/s390/codegen.h: Cleanup.
* src/vm/jit/s390/codegen.c (codegen_emit): Tryed to improove ACONST.
* src/vm/jit/s390/emit.c (emit_copy): Use MVC (memcpy instruction) for memory to memory copy.

* src/vm/properties.c (list_properties_entry): Renamed to
list_properties_entry_t.
(properties_init): Only initialize the list.
(properties_set): New function to set default properties (don't use
JAVA_HOME to set java.home).

* src/vm/properties.h (vm/types.h): Removed.
(stdint.h): Added.
(properties_init): Changed signature.
(properties_set): New function.

* src/vm/vm.c (cacao_prefix): Removed.
(cacao_libjvm): Likewise.
(classpath_libdir): Likewise.
(_Jv_bootclasspath): Likewise.
(_Jv_classpath): Likewise.
(_Jv_java_library_path): Likewise.
(specificmethodname): Likewise.
(specificsignature): Likewise.
(startit): Likewise.
(vm_printconfig): Use properties_get to get properties.
(vm_create): Moved properties stuff into properties_set.

* src/vm/vm.h (cacao_prefix): Removed.
(cacao_libjvm): Likewise.
(classpath_libdir): Likewise.
(_Jv_bootclasspath): Likewise.
(_Jv_classpath): Likewise.
(_Jv_java_library_path): Likewise.

* src/vmcore/suck.c (suck_add_from_property): Use properties_get to
manipulate bootclasspath.

* m4/classpath.m4 (AC_CHECK_WITH_CLASSPATH_CLASSES): Fixed typo.

* src/vm/vm.c (native/include/java_lang_Byte.h,
native/include/java_lang_Character.h,
native/include/java_lang_Short.h,
native/include/java_lang_Integer.h,
native/include/java_lang_Boolean.h,
native/include/java_lang_Long.h,
native/include/java_lang_Float.h,
native/include/java_lang_Double.h): Removed.

* configure.ac (AC_CHECK_HEADERS): Added libgen.h.
(AC_CHECK_FUNCS): Added dirname, readlink.

* src/vmcore/class.h
(class_get_annotations): Added. This function encapsulates the access to the
annotations field of the classinfo struct. It is defined even if
ENABLE_ANNOTATIONS is not, but just returns NULL in that case.

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

* src/native/vm/java_lang_Class.c
(_Jv_java_lang_Class_getDeclaredAnnotations): Now uses class_get_annotations().

* src/native/vm/sun/jvm.c
(JVM_GetClassAnnotations): Now uses class_get_annotations().

* m4/annotations.m4: Fixed comment.

* src/lib/gnu/java/lang/reflect/Method.java
(declaredAnnotations): Added generic type parameters to Class.

* src/lib/gnu/java/lang/reflect/Field.java
(declaredAnnotations): Added generic type parameters to Class.

* src/lib/gnu/java/lang/reflect/Constructor.java
(declaredAnnotations): Added generic type parameters to Class.

* src/lib/gnu/sun/reflect/annotation/AnnotationParser.java: Fixed formatting.
* src/native/vm/gnu/sun_reflect_ConstantPool.c
(Java_sun_reflect_ConstantPool_getMemberRefInfoAt0):
Fixed formatting of log output.

* src/native/vm/gnu/java_lang_reflect_Method.c
(Java_java_lang_reflect_Method_getDefaultValue),
(Java_java_lang_reflect_Method_declaredAnnotations),
(Java_java_lang_reflect_Method_getParameterAnnotations):
Use LLNI_class_get macro.

* src/native/vm/gnu/java_lang_reflect_Field.c
(Java_java_lang_reflect_Method_declaredAnnotations):
Use LLNI_class_get macro.

* src/native/vm/gnu/java_lang_reflect_Constructor.c
(Java_java_lang_reflect_Method_declaredAnnotations),
(Java_java_lang_reflect_Method_getParameterAnnotations):
Use LLNI_class_get macro.

* src/native/vm/sun/jvm.c
(JVM_GetClassConstantPool): Fixed formatting of log output.

* src/native/vm/reflect.c
(reflect_get_declaredannotatios): Fixed comment.

* src/vmcore/class.h
(classinfo): Added comments for annottation fields.

* src/vmcore/annotation.h
(annotation_t), (element_value_t): Removed unused structs.

* src/mm/cacao-gc/gc.c (gc_init) [ENABLE_HANDLES]: Added offset check for
global reference entries.

--HG--
branch : exact-gc