Merged revisions 7642-7664 via svnmerge from
authormichi <none@none>
Thu, 5 Apr 2007 00:16:05 +0000 (00:16 +0000)
committermichi <none@none>
Thu, 5 Apr 2007 00:16:05 +0000 (00:16 +0000)
commit4bca02837622e8ab576a2d177ff5eda0d3987dfc
tree0f6e17cc05d651d49cd66181eb95d48c68e964c7
parent9ae5b21542c6513b59af2bd4f11799e13b5b2ff4
Merged revisions 7642-7664 via svnmerge from
svn+ssh://michi@c1.complang.tuwien.ac.at/ahome/cacao/svn/cacao/trunk

........
  r7643 | twisti | 2007-04-03 13:35:40 +0200 (Tue, 03 Apr 2007) | 3 lines

  * src/vmcore/statistics.c (statistics_print_memory_usage): Prevent
  compiler warning on 64-bit machines.
........
  r7644 | twisti | 2007-04-03 13:37:30 +0200 (Tue, 03 Apr 2007) | 3 lines

  * src/vm/jit/x86_64/emit.c (emit_replacement_stubs): Removed unused
  variable disp.
........
  r7645 | twisti | 2007-04-03 13:46:50 +0200 (Tue, 03 Apr 2007) | 3 lines

  * src/vm/jit/allocator/simplereg.c (simplereg_make_statistics): Fixed
  compiler warning.
........
  r7646 | twisti | 2007-04-03 13:56:21 +0200 (Tue, 03 Apr 2007) | 3 lines

  * src/vm/jit/replace.c (native/include/java_lang_String.h): Removed.
  (java_value_print): Don't cast to java_lang_String.
........
  r7647 | twisti | 2007-04-03 14:10:22 +0200 (Tue, 03 Apr 2007) | 2 lines

  * src/vm/jit/jit.h: Includes alpha-sorted.
........
  r7648 | twisti | 2007-04-03 15:14:09 +0200 (Tue, 03 Apr 2007) | 3 lines

  * src/vm/jit/i386/linux/md-os.c (md_signal_handler_sigfpe): Use
  exceptions_new_hardware_exception.
........
  r7649 | twisti | 2007-04-03 15:47:39 +0200 (Tue, 03 Apr 2007) | 4 lines

  * src/vm/jit/arm/linux/md-os.c (md_signal_handler_sigsegv): Use
  exceptions_new_hardware_exception.
  [ENABLE_THREADS] (md_signal_handler_sigusr2): New function.
........
  r7650 | twisti | 2007-04-03 15:48:10 +0200 (Tue, 03 Apr 2007) | 2 lines

  * configure.ac: Added armv4 architecture.
........
  r7651 | twisti | 2007-04-03 16:00:32 +0200 (Tue, 03 Apr 2007) | 13 lines

  * src/vm/jit/stacktrace.c (stacktrace_create_inline_stackframeinfo):
  Removed.
  (stacktrace_inline_arithmeticexception): Likewise.
  (stacktrace_inline_arrayindexoutofboundsexception): Likewise.
  (stacktrace_inline_arraystoreexception): Likewise.
  (stacktrace_inline_classcastexception): Likewise.
  (stacktrace_inline_nullpointerexception): Likewise.
  (stacktrace_inline_fillInStackTrace): Likewise.
  (stacktrace_hardware_arithmeticexception): Likewise.
  (stacktrace_hardware_nullpointerexception): Likewise.

  * src/vm/jit/stacktrace.h: Likewise.
........
  r7652 | twisti | 2007-04-03 16:23:16 +0200 (Tue, 03 Apr 2007) | 15 lines

  * src/threads/native/threads.h (STACKFRAMEINFO): Return stackframeinfo
  instead of a pointer to it.
  * src/threads/none/threads.h (STACKFRAMEINFO): Likewise.

  * src/vm/jit/codegen-common.c (codegen_finish_native_call):
  STACKFRAMEINFO changes.

  * src/vm/jit/replace.c (replace_recover_source_state): Likewise.

  * src/vm/jit/stacktrace.c (stacktrace_create_stackframeinfo):
  Likewise.
  (stacktrace_create_extern_stackframeinfo): Likewise.
  (stacktrace_create_native_stackframeinfo): Likewise.
  (stacktrace_remove_stackframeinfo): Likewise.
........
  r7653 | twisti | 2007-04-03 16:34:23 +0200 (Tue, 03 Apr 2007) | 5 lines

  * src/vm/jit/arm/emit.c (emit_exception_stubs): Removed.

  * src/vm/jit/arm/md.c (md_codegen_patch_branch): Likewise.
  (md_stacktrace_get_returnaddress): Removed debug code.
........
  r7654 | twisti | 2007-04-03 17:22:21 +0200 (Tue, 03 Apr 2007) | 4 lines

  * src/vm/exceptions.c (exceptions_fillinstacktrace)
  [ENABLE_JAVAME_CLDC1_1]: fillInStackTrace has another signature in
  CLDC-1.1.
........
  r7655 | twisti | 2007-04-03 17:22:57 +0200 (Tue, 03 Apr 2007) | 3 lines

  * src/vm/jit/x86_64/linux/md-os.c (md_signal_handler_sigfpe): Use
  exceptions_new_hardware_exception.
........
  r7656 | twisti | 2007-04-03 17:29:26 +0200 (Tue, 03 Apr 2007) | 5 lines

  * src/vm/jit/replace.c (threads/threads-common.h): Added.

  * src/vm/jit/replace.h: Moved empty defines to the top of the file to
  see what's happening when !defined(ENABLE_REPLACEMENT).
........
  r7657 | twisti | 2007-04-03 17:51:52 +0200 (Tue, 03 Apr 2007) | 24 lines

  * src/vm/jit/stacktrace.c (stacktrace_create): Changed signature.

  (stacktrace_fillInStackTrace): Pass stackframeinfo to
  stacktrace_create.
  (stacktrace_getClassContext): Likewise.
  (stacktrace_getCurrentClass): Likewise.
  (stacktrace_getStack): Likewise.
  (stacktrace_dump_trace): Removed.

  * src/vm/jit/stacktrace.h (threads/native/threads.h)
  (threads/none/threads.h): Removed.
  (stacktrace_create): Added.
  (stacktrace_dump_trace): Removed.

  * src/threads/native/threads.c (threads_dump): Removed.
  * src/threads/native/threads.h (threads_dump): Likewise.

  * src/threads/threads-common.c (vm/jit/stacktrace.h): Added.
  (threads_dump): Added.
  (threads_print_stacktrace): Likewise.

  * src/threads/threads-common.h (threads_dump): Added.
  (threads_print_stacktrace): Likewise.
........
  r7658 | twisti | 2007-04-03 18:06:30 +0200 (Tue, 03 Apr 2007) | 10 lines

  * src/threads/threads-common.c (threads_print_stacktrace): Pass
  stackframeinfo to stacktrace_create.

  * src/vm/jit/codegen-common.c (threads/native/threads.h): Removed.
  (threads/threads-common.h): Added.
  (codegen_get_pv_from_pc): Replaced stacktrace_dump_trace with
  threads_print_stacktrace.

  * src/vm/jit/stacktrace.h (stacktrace_print_trace_from_buffer): Added.
........
  r7659 | twisti | 2007-04-03 20:02:48 +0200 (Tue, 03 Apr 2007) | 2 lines

  * src/vm/jit/mips/md-abi.h (REG_FA0, REG_FA1, REG_FA2): Defined.
........
  r7660 | twisti | 2007-04-03 23:30:13 +0200 (Tue, 03 Apr 2007) | 2 lines

  * src/vm/jit/i386/linux/md-os.c (threads/threads-common.h): Added.
........
  r7661 | twisti | 2007-04-04 00:29:59 +0200 (Wed, 04 Apr 2007) | 11 lines

  * src/vm/jit/alpha/asmpart.S: Replaced __GNU__ with __linux__ for
  exec-stacks.
  * src/vm/jit/arm/asmpart.S: Likewise.
  * src/vm/jit/i386/asmpart.S: Likewise.
  * src/vm/jit/mips/asmpart.S: Likewise.
  * src/vm/jit/powerpc/asmpart.S: Likewise.
  * src/vm/jit/powerpc64/asmpart.S: Likewise.
  * src/vm/jit/s390/asmpart.S: Likewise.
  * src/vm/jit/sparc64/asmpart.S: Likewise.
  * src/vm/jit/x86_64/asmpart.S: Likewise.
........
  r7662 | twisti | 2007-04-04 16:16:37 +0200 (Wed, 04 Apr 2007) | 8 lines

  * src/native/vm/gnu/sun_misc_Unsafe.c: Header changes.

  * src/native/native.c [ENABLE_JAVASE]
  (native/include/sun_misc_Unsafe.h): Added.
  [ENABLE_JAVASE] (dummynativetable): Added
  Java_sun_misc_Unsafe_objectFieldOffset and
  Java_sun_misc_Unsafe_compareAndSwapInt.
........
  r7663 | twisti | 2007-04-05 00:14:42 +0200 (Thu, 05 Apr 2007) | 24 lines

  * src/vm/jit/parse.c (BYTECODEINDEX_TO_BASICBLOCK): Added.
  (parsedata_t): Removed instructionstart, added bytecodestart,
  basicblockstart, bytecodemap, instructionmap.
  (parse_setup): Allocate new arrays.
  (parse_bytecodeindex_to_basicblock): New function.
  (parse_mark_exception_boundaries): Pass parsedata_t.
  (parse_resolve_exception_table): Likewise.
  (parse): Completely rewritten so we are able to have basic block
  boundaries on IR instruction level. We now also resolve basic block
  pointers in this pass.

  * src/vm/jit/parse.h (MARK_BASICBLOCK): Pass parsedata_t.
  (BLOCK_OF): Removed.

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

  * src/vm/jit/show.c (SHOW_TARGET): Print block instead of insindex.
  (show_icmd): Likewise.

  * src/vm/jit/stack.c (BRANCH_TARGET): Directly use block.
  (stack_analyse): Likewise.
  * src/vm/jit/verify/icmds.c: Likewise.
  * src/vm/jit/verify/typecheck-stackbased.c: Likewise.
........
  r7664 | twisti | 2007-04-05 00:29:36 +0200 (Thu, 05 Apr 2007) | 4 lines

  * src/vm/jit/verify/typecheck-stackbased.c: Use block directly instead
  of insindex.
  * src/vm/jit/verify/typecheck-stackbased-gen.inc: Newly generated.
........

--HG--
branch : exact-gc
41 files changed:
configure.ac
src/mm/cacao-gc/gc.c
src/native/native.c
src/native/vm/gnu/sun_misc_Unsafe.c
src/threads/native/threads.c
src/threads/native/threads.h
src/threads/none/threads.h
src/threads/threads-common.c
src/threads/threads-common.h
src/vm/exceptions.c
src/vm/jit/allocator/simplereg.c
src/vm/jit/alpha/asmpart.S
src/vm/jit/arm/asmpart.S
src/vm/jit/arm/emit.c
src/vm/jit/arm/linux/md-os.c
src/vm/jit/arm/md.c
src/vm/jit/codegen-common.c
src/vm/jit/i386/asmpart.S
src/vm/jit/i386/linux/md-os.c
src/vm/jit/jit.h
src/vm/jit/mips/asmpart.S
src/vm/jit/mips/md-abi.h
src/vm/jit/parse.c
src/vm/jit/parse.h
src/vm/jit/powerpc/asmpart.S
src/vm/jit/powerpc64/asmpart.S
src/vm/jit/replace.c
src/vm/jit/replace.h
src/vm/jit/s390/asmpart.S
src/vm/jit/show.c
src/vm/jit/sparc64/asmpart.S
src/vm/jit/stack.c
src/vm/jit/stacktrace.c
src/vm/jit/stacktrace.h
src/vm/jit/verify/icmds.c
src/vm/jit/verify/typecheck-stackbased-gen.inc
src/vm/jit/verify/typecheck-stackbased.c
src/vm/jit/x86_64/asmpart.S
src/vm/jit/x86_64/emit.c
src/vm/jit/x86_64/linux/md-os.c
src/vmcore/statistics.c