Merged revisions 7441-7480 via svnmerge from
authormichi <none@none>
Thu, 8 Mar 2007 13:17:40 +0000 (13:17 +0000)
committermichi <none@none>
Thu, 8 Mar 2007 13:17:40 +0000 (13:17 +0000)
commitde93f9d16a5f057981019744d93dbdb1ce71aa81
treec549600a57b51bc1b85618c49b45e2010d90ee9b
parent6c145a7523605d227727a3aec68c22e50234947c
Merged revisions 7441-7480 via svnmerge from
svn+ssh://michi@c1.complang.tuwien.ac.at/ahome/cacao/svn/cacao/trunk

........
  r7442 | pm | 2007-03-03 00:28:37 +0100 (Sat, 03 Mar 2007) | 8 lines

  * src/vm/jit/s390/emit.c,
  src/vm/jit/s390/codegen.c,
  src/vm/jit/s390/codegen.h,
  src/vm/jit/s390/md-asm.h,
  src/vm/jit/s390/patcher.c,
  src/vm/jit/s390/asmpart.S: Changed a lot in S390 codegen.
........
  r7444 | edwin | 2007-03-04 13:28:37 +0100 (Sun, 04 Mar 2007) | 5 lines

  * tests/regression/resolving/test_return_subtype_violated.java:
  New test.

  * tests/regression/resolving/Makefile.am: Added new test.
........
  r7445 | edwin | 2007-03-04 13:32:59 +0100 (Sun, 04 Mar 2007) | 4 lines

  * tests/regression/resolving/test_return_subtype_ok.java: New test.

  * tests/regression/resolving/Makefile.am: Added new test.
........
  r7446 | edwin | 2007-03-04 15:02:49 +0100 (Sun, 04 Mar 2007) | 2 lines

  * src/vm/jit/inline/inline.c: Committed breadth-first inlining code.
........
  r7447 | edwin | 2007-03-04 15:22:42 +0100 (Sun, 04 Mar 2007) | 6 lines

  * src/vmcore/method.h (methodinfo): Added hitcountdown field. (Only
  if ENABLE_REPLACEMENT).

  * src/vmcore/loader.c (loader_load_method): Initialize hitcountdown
  field.
........
  r7448 | edwin | 2007-03-04 15:46:21 +0100 (Sun, 04 Mar 2007) | 5 lines

  * src/vm/jit/i386/codegen.c (codegen): Emit code for countdown traps.

  * src/vm/jit/i386/emit.c (emit_replacement_stubs): Add jump reference
  for countdown traps.
........
  r7449 | twisti | 2007-03-04 19:07:55 +0100 (Sun, 04 Mar 2007) | 5 lines

  * src/vm/jit/x86_64/emit.c (emit_load): Use switch-case instead of
  if-else contruct.
  (emit_store): Likewise.
  (emit_copy): Likewise.
........
  r7450 | edwin | 2007-03-04 20:13:29 +0100 (Sun, 04 Mar 2007) | 8 lines

  * src/vmcore/options.h, src/vmcore/options.c, src/vmcore/method.c,
  src/vmcore/linker.c: Replayed lost parts of commit 7228.

  * src/vm/jit/intrp/intrp.h: Added missing #include to make it compile.

  * src/vm/jit/inline/inline.c: Fixed names of vmcore/ #include files.
........
  r7451 | edwin | 2007-03-04 21:10:18 +0100 (Sun, 04 Mar 2007) | 7 lines

  * src/vm/jit/replace.c: Handle countdown traps. Request optimization
  of hot methods and their callers.

  * src/vm/jit/jit.c (jit_compile): Set JITDATA_FLAG_COUNTDOWN for
  inlining.
  (jit_recompile): Set JITDATA_FLAG_INLINE for inlining.
........
  r7453 | pm | 2007-03-05 09:38:29 +0100 (Mon, 05 Mar 2007) | 8 lines

  * src/vm/jit/s390/md-abi.h,
  src/vm/jit/s390/emit.c,
  src/vm/jit/s390/emit.h,
  src/vm/jit/s390/codegen.c,
  src/vm/jit/s390/codegen.h,
  src/vm/jit/s390/patcher.c: Changed a lot.
........
  r7457 | edwin | 2007-03-05 17:53:45 +0100 (Mon, 05 Mar 2007) | 3 lines

  * src/vmcore/resolve.h, src/vmcore/resolve.c
  (resolve_classref_or_classinfo_eager): New function.
........
  r7458 | edwin | 2007-03-05 18:32:38 +0100 (Mon, 05 Mar 2007) | 2 lines

  * src/vm/jit/code.c (code_get_methodinfo_from_pv): New function.
........
  r7459 | edwin | 2007-03-05 18:34:43 +0100 (Mon, 05 Mar 2007) | 4 lines

  * src/vm/builtin.h (builtintable_replace_function): Don't use
  instruction * to avoid bootstrapping problems.
  * src/vm/builtin.c (builtintable_replace_function): Likewise.
........
  r7460 | edwin | 2007-03-05 18:44:20 +0100 (Mon, 05 Mar 2007) | 5 lines

  * src/native/vm/java_lang_Class.c (_Jv_java_lang_Class_getSuperclass),
  (_Jv_java_lang_Class_getDeclaringClass)
  (_Jv_java_lang_Class_getDeclaredClasses):
  Use resolve_classref_or_classinfo_eager.
........
  r7461 | edwin | 2007-03-06 00:50:33 +0100 (Tue, 06 Mar 2007) | 3 lines

  * src/native/native.c (native_get_exceptiontypes):
  Use resolve_classref_or_classinfo_eager.
........
  r7462 | edwin | 2007-03-06 00:56:41 +0100 (Tue, 06 Mar 2007) | 2 lines

  * src/cacaoh/headers.c: Don't include asmpart.h.
........
  r7463 | edwin | 2007-03-06 01:02:04 +0100 (Tue, 06 Mar 2007) | 3 lines

  * src/vmcore/linker.c (link_class_intern):
  Use resolve_classref_or_classinfo_eager.
........
  r7464 | edwin | 2007-03-06 01:26:31 +0100 (Tue, 06 Mar 2007) | 30 lines

  * src/vmcore/resolve.c: Moved back to src/vm/resolve.c.
  * src/vmcore/resolve.h: Moved back to src/vm/resolve.h.
  * src/vm/jit/code.h (codeinfo): Moved typedef to method.h.
  (code_get_methodinfo_for_pv): Added prototype.
  * src/vmcore/method.h (codeinfo): Moved typedef here.

  * src/vm/jit_interface.h: New file.

  * src/vm/Makefile.am: Added resolve.[ch] and jit_interface.h.
  * src/vmcore/Makefile.am: Removed resolve.[ch].

  * src/vmcore/class.c: Include "arch.h", but don't include "resolve.h".

  * src/vmcore/method.c (method_vftbl_lookup):
  Use code_get_methodinfo_for_pv.

  * src/vmcore/linker.c (resolve_classref_or_classinfo_eager): Added
  copy of prototype to avoid bootstrapping issues.

  * src/cacaoh/dummy.c (code_get_methodinfo_for_pv): New dummy.
  (resolve_classref_or_classinfo_eager): Simple implementation that does
  not use resolve.c code.
  (typeinfo_init_class): Removed dummy.
  (typeinfo_init_classinfo): Likewise.
  (typeinfo_is_assignable_to_class): Likewise.
  (typeinfo_print): Likewise.

  * many other files: Changed #include "vmcore/resolve.h" to
  "vm/resolve.h".
........
  r7465 | edwin | 2007-03-06 01:27:12 +0100 (Tue, 06 Mar 2007) | 2 lines

  * src/vm/jit_interface.h: Added Id keyword.
........
  r7468 | twisti | 2007-03-06 12:12:03 +0100 (Tue, 06 Mar 2007) | 11 lines

  * src/vmcore/statistics.c (vm/jit/code.h): Added for codeinfo.
  (vmcore/class.h): Added.
  (vmcore/field.h): Likewise.
  (vmcore/method.h): Likewise.

  * src/vm/jit/optimizing/recompile.c (vm/jit/code.h): Likewise.
  (vm/jit/jit.h): Likewise.

  * src/vm/jit/x86_64/md.c (vm/jit/codegen-common.h): Likewise.
  * src/vm/jit/x86_64/md-abi.c (vm/jit/jit.h): Likewise.
........
  r7470 | twisti | 2007-03-06 18:01:19 +0100 (Tue, 06 Mar 2007) | 6 lines

  * src/vm/vm.c (vm_create): Reenabled signal-thread. This only works on
  NPTL-threads and NOT with linuxthreads!

  * src/vm/signal.c (signal_init): Reenabled blocking for SIGINT and
  SIGQUIT.
........
  r7471 | twisti | 2007-03-06 18:01:49 +0100 (Tue, 06 Mar 2007) | 2 lines

  * src/vm/signal.c (arch.h): Added.
........
  r7472 | ajordan | 2007-03-06 19:55:12 +0100 (Tue, 06 Mar 2007) | 10 lines

  * src/vm/jit/sparc64/emit.c: emit_{load,store,copy} changed to switch/case for handling different types.

  * src/vm/jit/sparc64/codegen.h: fixed f2d and d2f conversion.

  * src/vm/jit/sparc64/md-abi.c: removed md_native_reg_setup(), not needed any longer.

  * src/vm/jit/sparc64/codegen.c: implemented ICMD_MULTIANEWARRAY.
  fixed FRETURN, DRETURN.
  repaired native float arg passing.
........
  r7473 | ajordan | 2007-03-07 01:32:35 +0100 (Wed, 07 Mar 2007) | 6 lines

  * src/vm/jit/sparc64/md-abi.h: increased number of JIT float argument registers to 5.
  * src/vm/jit/sparc64/md-asm.h: likewise.
  * src/vm/jit/sparc64/md-abi.c: likewise.

  * src/vm/jit/sparc64/asmpart.S: added floating point argument handling in asm_vm_call.
........
  r7474 | michi | 2007-03-07 12:47:45 +0100 (Wed, 07 Mar 2007) | 9 lines

  * src/threads/native/threads.h (threadobject): This structure is no longer an
  instance of java.lang.Thread, but contains a reference to it.

  * src/threads/native/threads.c (threads_start_javathread): Added.

  * src/threads/threads-common.c: Adapted to above changes.
  * src/threads/native/threads.c: See above.
  * src/native/vm/java_lang_Thread.c: See above.
........
  r7475 | twisti | 2007-03-07 13:37:34 +0100 (Wed, 07 Mar 2007) | 3 lines

  * src/vm/jit/x86_64/asmpart.S (asm_compare_and_swap): New function.
  (asm_memory_barrier): Likewise.
........
  r7476 | twisti | 2007-03-07 14:12:01 +0100 (Wed, 07 Mar 2007) | 2 lines

  * src/vm/jit/x86_64/emit.c (emit_call_reg): Call emit_rex with size 0.
........
  r7477 | twisti | 2007-03-07 15:05:04 +0100 (Wed, 07 Mar 2007) | 2 lines

  * src/vm/jit/mips/md.c (vm/jit/codegen-common.h): Temporarily added.
........
  r7478 | michi | 2007-03-08 03:59:31 +0100 (Thu, 08 Mar 2007) | 5 lines

  * src/threads/native/threads.c (threads_init) [!ENABLE_GC_CACAO]: Fixed bug for
  lost java.lang.Thread object of mainthread with BoehmGC.

  * src/native/vm/java_lang_Thread.c: Fixed includes to prevend compiler warnings.
........

--HG--
branch : exact-gc
81 files changed:
src/cacaoh/dummy.c
src/cacaoh/headers.c
src/mm/cacao-gc/rootset.c
src/native/jni.c
src/native/native.c
src/native/vm/gnu/java_lang_reflect_Field.c
src/native/vm/java_lang_Class.c
src/native/vm/java_lang_Thread.c
src/threads/native/threads.c
src/threads/native/threads.h
src/threads/threads-common.c
src/vm/Makefile.am
src/vm/builtin.c
src/vm/builtin.h
src/vm/jit/allocator/simplereg.c
src/vm/jit/alpha/patcher.c
src/vm/jit/arm/patcher.c
src/vm/jit/code.c
src/vm/jit/code.h
src/vm/jit/i386/codegen.c
src/vm/jit/i386/emit.c
src/vm/jit/i386/patcher.c
src/vm/jit/inline/inline.c
src/vm/jit/intrp/intrp.h
src/vm/jit/intrp/patcher.c
src/vm/jit/jit.c
src/vm/jit/jit.h
src/vm/jit/mips/md.c
src/vm/jit/mips/patcher.c
src/vm/jit/optimizing/recompile.c
src/vm/jit/parse.c
src/vm/jit/powerpc/patcher.c
src/vm/jit/powerpc64/patcher.c
src/vm/jit/replace.c
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.h
src/vm/jit/s390/md-asm.h
src/vm/jit/s390/patcher.c
src/vm/jit/sparc64/asmpart.S
src/vm/jit/sparc64/codegen.c
src/vm/jit/sparc64/codegen.h
src/vm/jit/sparc64/emit.c
src/vm/jit/sparc64/md-abi.c
src/vm/jit/sparc64/md-abi.h
src/vm/jit/sparc64/md-asm.h
src/vm/jit/sparc64/patcher.c
src/vm/jit/stack.c
src/vm/jit/stacktrace.h
src/vm/jit/verify/typecheck-typeinferer.c
src/vm/jit/verify/typecheck.c
src/vm/jit/verify/typeinfo.c
src/vm/jit/x86_64/asmpart.S
src/vm/jit/x86_64/emit.c
src/vm/jit/x86_64/md-abi.c
src/vm/jit/x86_64/md.c
src/vm/jit/x86_64/patcher.c
src/vm/jit_interface.h [new file with mode: 0644]
src/vm/resolve.c [new file with mode: 0644]
src/vm/resolve.h [new file with mode: 0644]
src/vm/signal.c
src/vm/vm.c
src/vmcore/Makefile.am
src/vmcore/class.c
src/vmcore/descriptor.c
src/vmcore/linker.c
src/vmcore/loader.c
src/vmcore/method.c
src/vmcore/method.h
src/vmcore/options.c
src/vmcore/options.h
src/vmcore/resolve.c [deleted file]
src/vmcore/resolve.h [deleted file]
src/vmcore/statistics.c
tests/regression/resolving/Makefile.am
tests/regression/resolving/classes2/BarPassFoo.java
tests/regression/resolving/test_return_subtype_ok.java [new file with mode: 0644]
tests/regression/resolving/test_return_subtype_violated.java [new file with mode: 0644]