Merged revisions 8299-8320 via svnmerge from
authormichi <none@none>
Thu, 16 Aug 2007 11:37:25 +0000 (11:37 +0000)
committermichi <none@none>
Thu, 16 Aug 2007 11:37:25 +0000 (11:37 +0000)
commit674380e1553dbbd46bdd2da199666df0091e5dce
tree100ac58182114f037e6ce17899d7399e560800aa
parenta0bec602d588ed586a1709d3fed038fa19a90a6b
Merged revisions 8299-8320 via svnmerge from
svn+ssh://michi@c1.complang.tuwien.ac.at/ahome/cacao/svn/cacao/trunk

........
  r8300 | michi | 2007-08-13 12:23:20 +0200 (Mon, 13 Aug 2007) | 2 lines

  * src/native/localref.c (localref_table_remove): Fixed assertion.
........
  r8301 | twisti | 2007-08-13 15:34:12 +0200 (Mon, 13 Aug 2007) | 5 lines

  * configure.ac (dl): Check for dl before all other stuff.
  (AC_CHECK_ENABLE_LIBJVM): Added.

  * m4/libjvm.m4: New file.
........
  r8303 | twisti | 2007-08-13 21:01:52 +0200 (Mon, 13 Aug 2007) | 2 lines

  * src/vm/exceptions.c (exceptions_print_exception): Fixed typo.
........
  r8304 | pm | 2007-08-14 21:57:20 +0200 (Tue, 14 Aug 2007) | 9 lines

  * src/threads/none/threads.h [!defined(NDEBUG)] (_no_threads_tracejavacallindent, _no_threads_tracejavacallcount, TRACEJAVACALLINDENT, TRACEJAVACALLCOUNT): added.
  * src/threads/native/threads.h [!defined(NDEBUG)] (threadinfo): Added tracejavacallindent, tracejavacallcount members. (TRACEJAVACALLINDENT, TRACEJAVACALLCOUNT): added.
  * src/threads/native/threads.c: Likewise.
  * src/vm/jit/trace.h New file.
  * src/vm/jit/trace.c: Likewise.
  * src/vm/jit/Makefile.am (libjit_la_SOURCES): added trace.h and trace.c.
  * src/vm/jit/s390/emit.c (emit_verbosecall_enter): adpated to use trace_java_call_enter, (emit_verbosecall_exit): adapted to use trace_java_call_exit.
........
  r8305 | panzi | 2007-08-15 15:49:26 +0200 (Wed, 15 Aug 2007) | 34 lines

  * src/native/vm/java_lang_Class.c
  (_Jv_java_lang_Class_getDeclaredAnnotations): Use LLNI_* macro.

  * src/native/vm/gnu/java_lang_reflect_Method.c
  (Java_java_lang_reflect_Method_getDefaultValue): Use LLNI_* macros.
  (Java_java_lang_reflect_Method_declaredAnnotations): Use LLNI_* macros.
  (Java_java_lang_reflect_Method_getParameterAnnotations): Use LLNI_* macros.

  * src/native/vm/gnu/java_lang_reflect_Field.c
  (Java_java_lang_reflect_Field_declaredAnnotations): Use LLNI_* macros.

  * src/native/vm/gnu/java_lang_reflect_Constructor.c
  (Java_java_lang_reflect_Constructor_declaredAnnotations): Use LLNI_* macros.
  (Java_java_lang_reflect_Constructor_getParameterAnnotations): Use LLNI_* macros.

  * src/native/vm/sun/jvm.c
  (native/llni.h): Added include.
  (JVM_GetFieldAnnotations): Use LLNI_* macros.
  (JVM_GetMethodAnnotations): Use LLNI_* macros.
  (JVM_GetMethodDefaultAnnotationValue): Use LLNI_* macros.
  (JVM_GetMethodParameterAnnotations): Use LLNI_* macros.
  (JVM_GetClassConstantPool): Use LLNI_* macros.

  * src/native/vm/reflect.c
  (reflect_constructor_new): Forgot to set annotations and parameterAnnotations
  attributes for GNU Classpath.
  (reflect_get_declaredannotatios): Use LLNI_* macros.
  (reflect_get_parameterannotations): Use LLNI_* macros.

  * src/native/vm/reflect.h
  (reflect_get_declaredannotatios): Now the caller has to set the
  declaredAnnotations attribute of the according object itself, because the
  LLNI_* macros can't get the address of an field.
........
  r8306 | twisti | 2007-08-15 16:47:11 +0200 (Wed, 15 Aug 2007) | 5 lines

  * src/vm/signal.c (signal_init): Cast to functionptr to fix warnings.
  (signal_register_signal): Changed signature.

  * src/vm/signallocal.h (signal_register_signal): Likewise.
........
  r8307 | twisti | 2007-08-15 17:20:47 +0200 (Wed, 15 Aug 2007) | 7 lines

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

  * src/native/vm/java_lang_Class.c (getSuperclass): Cast return value.
  (getInterfaces): Use class_get_interfaces.
  * src/native/vm/sun/jvm.c (JVM_GetClassInterfaces): Likewise.
........
  r8308 | pm | 2007-08-15 18:03:28 +0200 (Wed, 15 Aug 2007) | 2 lines

  * src/native/vm/sun/jvm.c (JVM_Available) [FIONREAD]: Argument to ioctl is int *.
........
  r8309 | twisti | 2007-08-15 18:42:52 +0200 (Wed, 15 Aug 2007) | 10 lines

  * src/vmcore/class.c (vm/builtin.h): Added.
  (class_get_declaredclasses): New function.

  * src/vmcore/class.h (class_get_declaredclasses): Likewise.

  * src/native/vm/java_lang_Class.c (getDeclaredClasses): Use
  class_get_declaredclasses.

  * src/native/vm/sun/jvm.c (JVM_GetDeclaredClasses): Likewise.
........
  r8310 | twisti | 2007-08-15 18:49:03 +0200 (Wed, 15 Aug 2007) | 3 lines

  * src/native/vm/sun/jvm.c (JVM_GetClassInterfaces): Bugfix, forgot to
  set c.
........
  r8311 | panzi | 2007-08-15 19:03:40 +0200 (Wed, 15 Aug 2007) | 20 lines

  * src/native/vm/java_lang_Class.c
  [WITH_CLASSPATH_GNU] [ENABLE_ANNOTATIONS] (vm/vm.h): Added include.

  * src/native/vm/gnu/sun_reflect_ConstantPool.c
  (vm/stringlocal.h): Added include.
  (Java_sun_reflect_ConstantPool_getClassAtIfLoaded0): Removed wrong call of
  the macro TRACEJVMCALLS.

  * src/native/vm/gnu/java_lang_reflect_Method.c
  (Java_java_lang_reflect_Method_getDefaultValue): Added proper casts so
  gcc don't give me warnings.

  * src/native/vm/gnu/java_lang_reflect_Constructor.c
  [ENABLE_ANNOTATIONS] (vm/exceptions.h): Added include.

  * src/native/vm/sun/jvm.c
  (JVM_ConstantPoolGetStringAt): Corrected cast.
  (JVM_ConstantPoolGetUTF8At): Corrected cast.
  (JVM_GetArrayElement): Using primitive_box_* functions.
........
  r8312 | twisti | 2007-08-16 00:10:22 +0200 (Thu, 16 Aug 2007) | 2 lines

  * src/native/jni.c (native/localref.h): Added.
........
  r8313 | twisti | 2007-08-16 00:11:35 +0200 (Thu, 16 Aug 2007) | 4 lines

  * src/native/localref.c: Added Id keyword.
  * src/native/localref.h: Likewise.
  * src/native/llni.h: Likewise.
........
  r8314 | twisti | 2007-08-16 00:18:44 +0200 (Thu, 16 Aug 2007) | 2 lines

  * src/vm/jit/codegen-common.c (native/localref.h): Added.
........
  r8315 | panzi | 2007-08-16 00:49:20 +0200 (Thu, 16 Aug 2007) | 28 lines

  * src/native/vm/reflect.c
  (reflect_constructor_new): Allocation of the java_bytearray is now done in the
  method_get_* functions.
  (reflect_field_new): Allocation of the java_bytearray is now done in the
  field_get_* functions.
  (reflect_method_new): Allocation of the java_bytearray is now done in the
  method_get_* functions. Added use of LLNI_field_* macros.

  * src/vmcore/method.c
  (method_get_annotations): Do allocation of the java_bytearray here.
  (method_get_parameterannotations): Do allocation of the java_bytearray here.
  (method_get_annotationdefault): Do allocation of the java_bytearray here.

  * src/vmcore/method.h
  (method_get_annotations): This function now returns java_bytearray*.
  (method_get_parameterannotations): This function now returns java_bytearray*.
  (method_get_annotationdefault): This function now returns java_bytearray*.

  * src/vmcore/field.c
  (vm/builtin.h): Added include.
  (field_get_annotations): Do allocation of the java_bytearray here.

  * src/vmcore/field.h
  (field_get_annotations): This function now returns java_bytearray*.

  * src/cacaoh/dummy.c
  (builtin_newarray_byte): Added.
........
  r8316 | ajordan | 2007-08-16 01:32:57 +0200 (Thu, 16 Aug 2007) | 6 lines

  * src/vm/jit/sparc64/codegen.h: Added M_SAVE_REG and 13-bit overflow checking.

  * src/vm/jit/sparc64/codegen.c (codegen_emit): Fixed stack increasing for
  large stackframe sizes.
  (check_13bit_imm): Added for overflow checking.
........
  r8317 | pm | 2007-08-16 08:53:26 +0200 (Thu, 16 Aug 2007) | 2 lines

   * src/vm/jit/trace (_array_load_param) [SIZEOF_VOID_P == 8]: Bugfix, forgotten obsolete stack_offset.
........
  r8318 | michi | 2007-08-16 12:05:34 +0200 (Thu, 16 Aug 2007) | 70 lines

  * src/native/llni.h: Added macros for array handling.

  * src/vm/global.h: Added typedefs for array handles. Renamed array types.

  Use LLNI macros for array access and adapted to above changes:
  * src/vm/access.c
  * src/vm/jit/arm/emit.c
  * src/vm/jit/arm/codegen.c
  * src/vm/jit/powerpc/emit.c
  * src/vm/jit/powerpc/codegen.c
  * src/vm/jit/sparc64/emit.c
  * src/vm/jit/sparc64/codegen.c
  * src/vm/jit/alpha/emit.c
  * src/vm/jit/alpha/codegen.c
  * src/vm/jit/s390/emit.c
  * src/vm/jit/s390/codegen.c
  * src/vm/jit/mips/emit.c
  * src/vm/jit/mips/codegen.c
  * src/vm/jit/m68k/emit.c
  * src/vm/jit/m68k/codegen.c
  * src/vm/jit/powerpc64/emit.c
  * src/vm/jit/powerpc64/codegen.c
  * src/vm/jit/i386/emit.c
  * src/vm/jit/i386/codegen.c
  * src/vm/jit/x86_64/emit.c
  * src/vm/jit/x86_64/codegen.c
  * src/vm/jit/stacktrace.c
  * src/vm/jit/stacktrace.h
  * src/vm/builtin.c
  * src/vm/string.c
  * src/vm/builtin.h
  * src/vm/exceptions.c
  * src/vm/vm.c
  * src/vm/stringlocal.h
  * src/vm/vm.h
  * src/native/jni.c
  * src/native/vm/java_lang_ClassLoader.c
  * src/native/vm/java_lang_reflect_Constructor.h
  * src/native/vm/java_lang_ClassLoader.h
  * src/native/vm/java_lang_Class.c
  * src/native/vm/gnu/gnu_java_lang_management_VMThreadMXBeanImpl.c
  * src/native/vm/gnu/java_security_VMAccessController.c
  * src/native/vm/gnu/java_lang_VMClassLoader.c
  * src/native/vm/gnu/java_lang_management_VMManagementFactory.c
  * src/native/vm/gnu/java_lang_VMClass.c
  * src/native/vm/gnu/gnu_java_lang_management_VMRuntimeMXBeanImpl.c
  * src/native/vm/gnu/sun_reflect_ConstantPool.c
  * src/native/vm/gnu/java_lang_reflect_Method.c
  * src/native/vm/gnu/gnu_classpath_VMStackWalker.c
  * src/native/vm/gnu/java_lang_VMSystem.c
  * src/native/vm/gnu/java_lang_reflect_Constructor.c
  * src/native/vm/gnu/java_lang_VMThrowable.c
  * src/native/vm/java_lang_Class.h
  * src/native/vm/sun_misc_Unsafe.c
  * src/native/vm/sun/jvm.c
  * src/native/vm/reflect.c
  * src/native/vm/java_lang_reflect_Method.c
  * src/native/vm/reflect.h
  * src/native/vm/java_lang_reflect_Constructor.c
  * src/native/vm/java_lang_reflect_Method.h
  * src/native/jni.h
  * src/vmcore/class.c
  * src/vmcore/class.h
  * src/vmcore/method.c
  * src/vmcore/method.h
  * src/vmcore/linker.c
  * src/cacaoh/headers.h
  * src/cacaoh/dummy.c
  * src/cacaoh/headers.c
........
  r8319 | michi | 2007-08-16 12:43:43 +0200 (Thu, 16 Aug 2007) | 5 lines

  * src/native/vm/java_lang_Class.c
  (_Jv_java_lang_Class_getDeclaredFields): Fixed postincrement of array index.
  (_Jv_java_lang_Class_getDeclaredMethods): Likewise.
  (_Jv_java_lang_Class_getDeclaredConstructors): Likewise.
........
  r8320 | michi | 2007-08-16 13:35:14 +0200 (Thu, 16 Aug 2007) | 4 lines

  * src/vm/jit/allocator/simplereg.c (simplereg_free): Index into memcopycount
  is divided by SIZE_OF_STACKSLOT now.
  (simplereg_allocate_temporaries): Likewise.
........

--HG--
branch : exact-gc
73 files changed:
configure.ac
src/cacaoh/dummy.c
src/cacaoh/headers.c
src/cacaoh/headers.h
src/native/jni.c
src/native/jni.h
src/native/localref.c
src/native/vm/gnu/gnu_classpath_VMStackWalker.c
src/native/vm/gnu/gnu_java_lang_management_VMRuntimeMXBeanImpl.c
src/native/vm/gnu/gnu_java_lang_management_VMThreadMXBeanImpl.c
src/native/vm/gnu/java_lang_VMClass.c
src/native/vm/gnu/java_lang_VMClassLoader.c
src/native/vm/gnu/java_lang_VMSystem.c
src/native/vm/gnu/java_lang_VMThrowable.c
src/native/vm/gnu/java_lang_management_VMManagementFactory.c
src/native/vm/gnu/java_lang_reflect_Constructor.c
src/native/vm/gnu/java_lang_reflect_Field.c
src/native/vm/gnu/java_lang_reflect_Method.c
src/native/vm/gnu/java_security_VMAccessController.c
src/native/vm/java_lang_Class.c
src/native/vm/java_lang_Class.h
src/native/vm/java_lang_ClassLoader.c
src/native/vm/java_lang_ClassLoader.h
src/native/vm/java_lang_reflect_Method.c
src/native/vm/java_lang_reflect_Method.h
src/native/vm/sun_misc_Unsafe.c
src/threads/native/threads.c
src/threads/native/threads.h
src/threads/none/threads.h
src/vm/access.c
src/vm/builtin.c
src/vm/builtin.h
src/vm/exceptions.c
src/vm/global.h
src/vm/jit/Makefile.am
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/emit.c
src/vm/jit/codegen-common.c
src/vm/jit/i386/codegen.c
src/vm/jit/i386/emit.c
src/vm/jit/m68k/codegen.c
src/vm/jit/m68k/emit.c
src/vm/jit/mips/codegen.c
src/vm/jit/mips/emit.c
src/vm/jit/powerpc/codegen.c
src/vm/jit/powerpc/emit.c
src/vm/jit/powerpc64/codegen.c
src/vm/jit/powerpc64/emit.c
src/vm/jit/s390/codegen.c
src/vm/jit/s390/emit.c
src/vm/jit/sparc64/codegen.c
src/vm/jit/sparc64/codegen.h
src/vm/jit/sparc64/emit.c
src/vm/jit/stacktrace.c
src/vm/jit/stacktrace.h
src/vm/jit/x86_64/codegen.c
src/vm/jit/x86_64/emit.c
src/vm/signal.c
src/vm/signallocal.h
src/vm/string.c
src/vm/stringlocal.h
src/vm/vm.c
src/vm/vm.h
src/vmcore/class.c
src/vmcore/class.h
src/vmcore/field.c
src/vmcore/field.h
src/vmcore/linker.c
src/vmcore/method.c
src/vmcore/method.h