* src/vm/jit/i386/asmpart.S (asm_patcher_wrapper): Restore REG_ITMP3
from stub stack. I missed this when I did the last changes.

* src/vm/jit/optimizing/.cvsignore: New file.

* src/vm/jit/stack.c (stack_analyse): Use of real PEI data
(op_data[opcode][PEI]) to prevent copy propagation to LOCALVAR with
ICMD_XSTORE instead of just regarding INVOKES as PEI's.

* src/toolbox/worklist.h: Comments added.

* src/toolbox/bitvector.c: Comments added.

* src/toolbox/bitvector.h: Comments added.

* src/toolbox/worklist.c: Comments added.

* src/toolbox/worklist.c: Corrected Header information.

* src/toolbox/worklist.h: Likewise.

* src/toolbox/bitvector.c: Likewise.

* src/toolbox/bitvector.h: Likewise.

* src/vm/jit/allocator/liveness.c: Corrected Header information.

* src/vm/jit/allocator/liveness.h: Likewise.

* src/vm/jit/allocator/lsra.c: Likewise.

* src/vm/jit/allocator/lsra.h: Likewise.

* src/vm/jit/optimizing/dominators.c: Corrected Header information.

* src/vm/jit/optimizing/dominators.h: Likewise.

* src/vm/jit/optimizing/graph.c: Likewise.

* src/vm/jit/optimizing/graph.h: Likewise.

* src/vm/jit/optimizing/lifetimes.c: Likewise.

* src/vm/jit/optimizing/lifetimes.h: Likewise.

* src/vm/jit/optimizing/lsra.c: Likewise.

* src/vm/jit/optimizing/lsra.h: Likewise.

* src/vm/jit/optimizing/ssa.c: Likewise.

* src/vm/jit/optimizing/ssa.h: Likewise.

* src/vm/jit/optimizing/ssa.c (ssa_print_phi): Printing now phi
functions correctly for debug output.

* src/vm/jit/optimizing/ssa.c (dead_code_elimination): No removal of
potential exception throwing instructions (PEI) anymore.

* src/vm/jit/jit.h: Renamed op_needs_saved[] to op_data[][NEEDS_SAVED]
and introduced the new op_data[][PEI].

* src/vm/jit/jit.c (jit_init): Added init of op_data[NEEDS_SAVED|PEI]

* src/vm/jit/optimizing/lifetimes.c (LifeOutAtStatement): Renamed
op_needs_saved[] to the new op_data[][NEEDS_SAVED]

* src/vm/jit/optimizing/lifetimes.c (LifenessAnalysis): Ignore
variables used in phi functions, if they define itself (x =
phi(...,x,...)).

* src/vm/jit/i386/codegen.c (codegen): Bugfix in code created for
ICMD_IINC for SSA.

* src/vm/jit/show.c (new_show_method): Regard ENABLE_SSA like
ENABLE_LSRA to suppress output of interfaces.

* src/vm/jit/show.c (show_method): likewise.

* src/vm/jit/show.c (show_icmd): Regard special operand format for
ICMD_IINC with SSA.

* src/vm/jit/optimizing/: New directory for optimizing compiler (SSA
by now - does not work by now, code merging with svn head introduced
some hazardous faults).

* src/vm/jit/optimizing/dominators.c: Computation of dominators and
domination frontier for SSA.

* src/vm/jit/optimizing/dominators.h: Include file for dominators.c.

* src/vm/jit/optimizing/graph.c: CFG functions needed for SSA.

* src/vm/jit/optimizing/graph.h: Include file for graph.c

* src/vm/jit/optimizing/lifetimes.c: Scanning lifetimes for SSA.

* src/vm/jit/optimizing/lifetimes.h: Include file for lifetimes.c

* src/vm/jit/optimizing/lsra.c: LSRA based on SSA.

* src/vm/jit/optimizing/lsra.h: Include file for lsra.c.

* src/vm/jit/optimizing/Makefile.am: New Makefile.am for this
directory.

* src/vm/jit/optimizing/ssa.c: Computation of SSA form.

* src/vm/jit/optimizing/ssa.h: Include File for ssa.c.

* src/vm/jit/optimizing/: New directory for optimizing compiler (SSA
by now - does not work by now, code merging with svn head introduced
some hazardous faults).

* src/vm/jit/optimizing/dominators.c: Computation of dominators and
domination frontier for SSA.

* src/vm/jit/optimizing/dominators.h: Include file for dominators.c.

* src/vm/jit/optimizing/graph.c: CFG functions needed for SSA.

* src/vm/jit/optimizing/graph.h: Include file for graph.c

* src/vm/jit/optimizing/lifetimes.c: Scanning lifetimes for SSA.

* src/vm/jit/optimizing/lifetimes.h: Include file for lifetimes.c

* src/vm/jit/optimizing/lsra.c: LSRA based on SSA.

* src/vm/jit/optimizing/lsra.h: Include file for lsra.c.

* src/vm/jit/optimizing/Makefile.am: New Makefile.am for this
directory.

* src/vm/jit/optimizing/ssa.c: Computation of SSA form.

* src/vm/jit/optimizing/ssa.h: Include File for ssa.c.

* src/vm/jit/allocator/lsra.c: Moved from src/vm/jit. Quite complete
code change (including: no more allocation of unused reserved
registers, possibility of exact lifetime analysis, removal of old
lifetime test functions).

* src/vm/jit/allocator/lsra.h: Moved from src/vm/jit.

* src/vm/jit/allocator/liveness.c: New File. Exact lifetime analysis
for LSRA.

* src/vm/jit/allocator/liveness.h: New File. Include File for
liveness.c. The #define LV enables by now the exact liveness analysis.

* src/vm/jit/allocator/Makefile.am: Adopted for new/moved files in
src/vm/jit/allocator.

* sc/vm/jit/Makefile.am: Adopted for above new/moved files.

* configure.ac: Introduced ENABLE_SSA: new option --enable-ssa.
Changes for ENABLE_LSRA (--enable-lsra). New Makefile in
src/vm/jit/optimizing added.

* src/vm/jit/allocator/simplereg.c (reg_make_statistics): Support for
ENABLE_SSA for statistics.

* src/vm/options.h: opt_lsra is used with ENABLE_SSA like with
ENABLE_LSRA.

* src/vm/options.c: opt_lsra is used with ENABLE_SSA like with
ENABLE_LSRA.

* src/vm/global.h: New struct imm for union imm_union to get another
operand for IINC in combination with SSA added.

* src/vm/vm.c: opt_lsra and the option -lsra is used with ENABLE_SSA
like with ENABLE_LSRA.

* src/vm/jit/stack.c (stack_analyse): No stack element lifetimes
counting anymore for lsra/ssa (m->maxlifetimes).

* src/vm/jit/stack.h: No stack lifetime counting anymore for lsra/ssa
(m->maxlifetimes).

* src/vm/jit/i386/codegen.c: Support for ENABLE_SSA added.

* src/vm/jit/i386/codegen.c (codegen_insert_phi_moves): New function
to insert phi moves for SSA at the end of Basic Blocks.

* src/vm/jit/i386/codegen.c (cg_move): New function to create the
instructions for the actual move for codegen_insert_phi_moves).

* src/vm/jit/i386/codegen.c (codegen): Logic and calls to use
codegen_insert_phi_moves for SSA added. With SSA for parameters in
memory this memory positions cannot be reused to avoid copying. Checks
added to prevent moves to or from stackslots removed by the dead code
elimination. Special handling for the new ICMD_IINC operand format
used by SSA added.

* src/vm/jit/i386/codegen.h (M_COPY): Checks added to prevent moves to
or from stackslots removed by the dead code elimination. Original
M_COPY renamed to _M_COPY.

* src/vm/jit/jit.c (jit_init): Populate op_needs_saved. Regard
ENABLE_SSA.

* src/vm/jit/jit.h: Support for ENABLE_SSA added. Added an array which
shows which ICMD's need a SAVEDVAR for SSA and the new LSRA with exact
liveness analysis.  src/toolbox/Makefile.am: Changed to include the
following new files:

* src/toolbox/bitvector.c: Bitvector implementation for SSA.

* src/toolbox/bitvector.h: Include file for bitvector.c.

* src/toolbox/worklist.c: Worklist implementation for SSA.

* src/toolbox/worklist.h: Include file for worklist.c.

* src/vm/jit/codegen-common.c (codegen_findmethod): Renamed to
codegen_get_pv_from_pc.

* src/vm/jit/codegen-common.h (codegen_findmethod): Likewise.
(md_codegen_findmethod): Renamed to md_codegen_get_pv_from_pc.

* src/vm/jit/stacktrace.c (stacktrace_create_stackframeinfo):
Likewise.
(stacktrace_create_inline_stackframeinfo): Likewise.
(stacktrace_create_extern_stackframe): Likewise.
(stacktrace_create): Likewise.

* src/vm/jit/alpha/md.c (md_codegen_findmethod): Renamed to
md_codegen_get_pv_from_pc.
* src/vm/jit/i386/md.c: Likewise.
* src/vm/jit/mips/md.c: Likewise.
* src/vm/jit/powerpc/md.c: Likewise.
* src/vm/jit/powerpc64/md.c: Likewise.
* src/vm/jit/sparc64/md.c: Likewise.
* src/vm/jit/x86_64/md.c: 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/x86_64/asmpart.S: Likewise.
* src/vm/jit/intrp/asmpart.c: Likewise.

* src/vm/jit/i386/patcher.c (patcher_wrapper): Fixed comment.
* src/vm/jit/x86_64/patcher.c: Likewise.

* src/vm/jit/powerpc64/linux/md-abi.h: LA_WORD_SIZE renamed to
 LA_SIZE_IN_POINTERS, value fixed
* src/vm/jit/powerpc64/linux/md-abi.c: LA_SIZE_IN_POINTERS rename
* src/vm/jit/powerpc64/linux/md.c (md_codegen_findmethod): PPC64 uses r14
 instead of r13 (as PPC) for PV so opcodes changed.
* src/vm/jit/powerpc64/asmpart.S: Using LA_SIZE instead of LA_WORD_SIZE,
 LA_SIZE_IN_POINTERS for SAVE_*_REGISTERS macros only.

* src/vm/jit/powerpc/linux/md-abi.h (LA_WORD_SIZE): Renamed to
LA_SIZE_IN_POINTERS.

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

* src/vm/jit/powerpc/linux/md-abi.c (md_param_alloc): Use
LA_SIZE_IN_POINTERS instead of LA_WORD_SIZE.

* src/vm/jit/powerpc/darwin/md-abi.c (md_param_alloc): Likewise.

* src/vm/jit/powerpc/asmpart.S: Likewise.

* src/vm/jit/stack.c (new_stack_analyse): Likewise.
(stack_analyse): Likewise.

* src/vm/jit/reg.c (reg_setup): Likewise.

* src/vm/jit/powerpc64/linux/md-abi.h: fixed linkage area defines for 64bit abi.
* src/vm/jit/powerpc64/linux/md-asm.h: fixed register name defines and
 SAVE/RESTORE macros.
* src/vm/jit/powerpc64/asmpart.S (asm_vm_call_method): fixed no argument method
 call path, coming back to C now.

* src/boehm-gc/darwin_stop_world.c: Updated to version 6.8.
* src/boehm-gc/doc/README.changes: Likewise.
* src/boehm-gc/doc/README: Likewise.
* src/boehm-gc/include/gc.h: Likewise.
* src/boehm-gc/include/gc_config_macros.h: Likewise.
* src/boehm-gc/include/private/gcconfig.h: Likewise.
* src/boehm-gc/configure.in: Likewise.
* src/boehm-gc/version.h: Likewise.
* src/boehm-gc/malloc.c: Likewise.
* src/boehm-gc/pthread_support.c: Likewise.
* src/boehm-gc/os_dep.c: Likewise.
* src/boehm-gc/dyn_load.c: Likewise.

* src/vm/jit/i386/codegen.c (codegen): Fixed ICMD_LMUL bug.

* src/vm/jit/i386/emit.c (emit_load_s1): Coding style changes.
(emit_load_s2): Likewise.
(emit_load_s3): Likewise.
(emit_load_s1_low): Likewise.
(emit_load_s2_low): Likewise.
(emit_load_s1_high): Likewise.
(emit_store): Likewise.

* src/vm/jit/jit.c (stackreq): Initialize this table statically.
(jit_init): Removed dynamic initialization of stackreq table.

* src/native/vm/java_lang_reflect_Method.c
(Java_java_lang_reflect_Method_invokeNative): Removed unused
variables.

* src/native/vm/java_lang_reflect_Constructor.c (vm/access.h):
Include to fix warning.

* src/native/vm/java_lang_reflect_Field.c (cacao_get_field_address):
Use access_check_caller.

* src/vm/access.h, src/vm/access.c (access_check_caller): Added.

* src/native/vm/java_lang_reflect_Method.c
(Java_java_lang_reflect_Method_invokeNative): Use access_check_caller
for the access check.

* src/native/vm/java_lang_reflect_Constructor.c
(Java_java_lang_reflect_Constructor_constructNative): Likewise. This
should fix the mauve test case
java.lang.reflect.AccessibleObject.security.

* src/cacaoh/headers.c (stacktrace_getClassContext): Added dummy
implementation.

* src/vm/jit/parse.h (new_block_insert): Renamed to
NEW_MARK_BASICBLOCK.
(block_insert): Renamed to MARK_BASICBLOCK.

* src/vm/jit/parse.c (new_fillextable): Likewise.
(fillextable): Likewise.
(new_parse): Likewise.
(parse): Likewise.

* src/vm/jit/stack.c (new_stack_analyse): Replaced debug_nr with nr.

* src/vm/jit/verify/typecheck.c (typestate_reach): Likewise.
(verify_basic_block): Likewise.

* src/vm/jit/i386/codegen.c (codegen): Likewise.
* src/vm/jit/powerpc/codegen.c (codegen): Likewise.
* src/vm/jit/x86_64/codegen.c (codegen): Likewise.

* src/vm/jit/cfg.c (cfg_insert_predecessors): New method.
(cfg_build): Use cfg_insert_predecessors for TABLESWITCH and
LOOKUPSWITCH.

* src/vm/resolve.h, src/vm/resolve.c (new_resolve_method_lazy):
Removed curstack parameter.
(new_resolve_field_lazy): Likewise.
(new_constrain_unresolved_field): New function.
(new_constrain_unresolved_method): Likewise.

* src/vm/jit/parse.c (new_parse): Use new_resolve_field_lazy and
new_resolve_method_lazy.

* src/vm/jit/stack.c (new_stack_analyse): For INVOKE* instructions,
store the live-through stack slots as additional arguments after
the live-in slots. These live-through slots are needed by the
verifier and by on-stack replacement in order to create a replacement
point at the call site.
NOTE: Currently the live-through slots are also stored for builtins.
This should change in the final version.

* src/vm/jit/jit.h (NEW_INSTRUCTION_IS_RESOLVED): New macro.
(NEW_INSTRUCTION_IS_UNRESOLVED): Likewise.
(NEW_INSTRUCTION_MUST_CHECK): Likewise.

* src/vm/jit/cfg.h (CFG_UNKNOWN_PREDECESSORS): Defined.

* src/vm/jit/stack.c (vm/jit/cfg.h): Added.
(new_stack_analyse): Set predecessorcount for EXH blocks to
CFG_UNKNOWN_PREDECESSORS.
(stack_analyse): Likewise.

* src/vm/jit/show.c (new_show_basicblock): Print predecessor block
numbers.
(show_basicblock): Likewise.

* src/vm/jit/reorder.c (reorder): Iterate to m->basicblockcount + 1,
so we kind of set the last basic block too.

* src/vm/jit/jit.h (basicblock): Renamed debug_nr to nr.
(BASICBLOCK_INIT): Likewise.

* src/vm/jit/reorder.c (reorder_place_next_unplaced_block): Likewise.
(reorder): Likewise.

* src/vm/jit/show.c (new_show_method): Likewise.
(show_method): Likewise.
(new_show_basicblock): Likewise.
(show_basicblock): Likewise.
(SHOW_TARGET): Likewise.
(show_icmd): Likewise.

* src/vm/jit/ifconv/ifconv.c (check): Likewise.

* src/vm/jit/loop/analyze.c (insert_exception): Likewise.
(copy_handler): Likewise.
(create_static_checks): Likewise.

* src/vm/jit/verify/typecheck.c (verify_basic_block): Likewise.
(typecheck_reset_flags): Likewise.
(typecheck): Likewise.

* src/vm/jit/verify/typeinfo.c (typeinfo_print): Likewise.
(typeinfo_print_short): Likewise.
(typeinfo_print_stacktype): Likewise.

* src/vm/jit/powerpc64/asmpart.S (asm_vm_call_method, asm_cacheflush):
ppc64 abi needs function descriptor for function called from other
relocateable modules and uses direct calling for module intern calls.

* src/vm/jit/reorder.c (reorder): #ifdef debug output.

* src/vm/jit/Makefile.am (libjit_la_SOURCES): Add cfg.[ch] and
reorder.[ch] for debugging.

* src/vm/jit/jit.c (vm/jit/cfg.h): Added.
(vm/jit/reorder.h): Likewise.
(jit_recompile): Set JITDATA_FLAG_REORDER flag.
(jit_compile_intern): Call cfg_build and reorder.
(jit_complement_condition): New function.

* src/vm/jit/jit.h (basicblock): Changed type of predecessors and
successors.
(jit_complement_condition): Added.

* src/vm/jit/cfg.c (cfg_allocate_predecessors): New method.
(cfg_allocate_successors): Likewise.
(cfg_build): Finished implementation.

* src/vm/jit/reorder.c (reorder_place_next_unplaced_block): New
function.
(reorder): Improved, still not working.

* src/vm/jit/show.c (new_show_method): Walk the basic block chain to
find the last block, as this may change.
(show_method): Likewise.

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

* src/vm/jit/parse.c (new_parse): MZERO basicblock array.
(parse): Likewise.

* src/vm/jit/jit.h (JITDATA_FLAG_REORDER): Added.
(JITDATA_HAS_FLAG_REORDER): Likewise.
(basicblock): Removed pre_count and added predecessorcount,
successorcount, predecessors, successors.
(BASICBLOCK_INIT): Don't zero fields.

* src/vm/jit/stack.c (new_stack_analyse): Renamed pre_count to
predecessorcount.
(stack_analyse): Likewise and removed predecessor count calculation.

* src/vm/jit/show.c (new_show_basicblock): Likewise.
(show_basicblock): Likewise.

* src/vm/jit/ifconv/ifconv.c (ifconv_static): Likewise.

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

* src/vm/options.c (opt_foo): Added.  This is a development option.
* src/vm/options.h (opt_foo): Likewise.

* src/vm/vm.c (vm_create): Added OPT_FOO.

* autogen.sh: Recognize autoconf 2.60.

* src/vm/jit/codegen-common.c (codegen_createnativestub): Set
JITDATA_FLAG_INSTRUMENT for opt_prof.

* src/vm/jit/recompile.c (recompile_thread): Check return value of
jit_recompile and print the exception in error case.

* src/vm/jit/parse.c (new_parse): Replaced opt_verify with
JITDATA_HAS_FLAG_VERIFY, because on recompilation we don't turn
verifying on.

* src/vm/jit/x86_64/codegen.c (codegen): Load address for INVOKESTATIC
from data segment and pass the displacement to the patcher.

* src/vm/jit/x86_64/patcher.c (patcher_get_putstatic): Use
displacement from patcher, not from the instruction.
(patcher_builtin_multianewarray): Don't patch BUILTIN_multianewarray
address, it's not required.
(patcher_invokestatic_special): Use displacement passed and patch the
data segment.

* src/vm/jit/x86_64/md.c (md_stacktrace_get_returnaddress): Changed to
new INVOKESTATIC calling sequence.

* src/native/native.c
(native/include/java_lang_management_VMManagementFactory.h): Added.
(dummynativetable): Added VMManagementFactory methods.

* src/native/include/.cvsignore: Added
java_lang_management_VMManagementFactory.h.

* src/native/vm/java_lang_management_VMManagementFactory.c: New file.

* src/native/vm/Makefile.am (libnativevm_la_SOURCES): Added
java_lang_management_VMManagementFactory.c.

* src/native/include/Makefile.am
(ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADERS): Added
java_lang_management_VMManagementFactory.h.

* src/native/include/Makefile.am (DO_HEADER_FILES): Do not depend on
CACAO_VM_ZIP.

* src/native/include/.cvsignore: Added
gnu_java_lang_management_VMThreadMXBeanImpl.h and
java_lang_management_ThreadInfo.h.

* src/native/vm/gnu_java_lang_management_VMThreadMXBeanImpl.c: New file.

* src/native/vm/Makefile.am (libnativevm_la_SOURCES): Added
gnu_java_lang_management_VMThreadMXBeanImpl.c.

* src/native/include/Makefile.am
(ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADERS): Added
gnu_java_lang_management_VMThreadMXBeanImpl.h and
java_lang_management_ThreadInfo.h.
(VM_ZIP): Removed.

* src/native/jni.h (_Jv_JavaVM): Added total_started_thread_count.

* src/threads/native/threads.c (threads_startup_thread): Count
total_started_thread_count.

* src/cacao/cacao.c (main): Likewise.

* src/cacaoh/headers.c (_Jv_jvm): Added.

* src/native/vm/gnu_java_lang_management_VMClassLoadingMXBeanImpl.c:
New file.

* src/native/vm/Makefile.am (libnativevm_la_SOURCES): Added
gnu_java_lang_management_VMClassLoadingMXBeanImpl.c.

* src/native/include/Makefile.am
(ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES): Added
gnu_java_lang_management_VMClassLoadingMXBeanImpl.h.

* src/native/include/.cvsignore: Likewise.

* src/native/jni.h (_Jv_JavaVM): Added
Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_verbose.

* src/native/native.c
(native/include/gnu_java_lang_management_VMClassLoadingMXBeanImpl.h):
Added.
(native/include/gnu_java_lang_management_VMMemoryMXBeanImpl.h):
Likewise.
(dummynativetable): Added VMClassLoadingMXBeanImpl and
VMMemoryMXBeanImpl functions.

* src/vm/classcache.c (classcache_number_of_loaded_classes): New
internal function.
(classcache_get_loaded_class_count): New function.
(classcache_jvmti_GetLoadedClasses): Renamed to
classcache_get_loaded_classes and reimplemented.

* src/vm/classcache.h (classcache_get_loaded_class_count): Added.
(classcache_jvmti_GetLoadedClasses): Renamed to
classcache_get_loaded_classes.

* src/native/include/.cvsignore: Added
gnu_java_lang_management_VMMemoryMXBeanImpl.h and
java_lang_management_MemoryUsage.h.

* src/lib/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java:
New file.

* src/lib/Makefile.am (VM_JAVA_FILES): Added
gnu/java/lang/management/VMMemoryMXBeanImpl.java.
(VM_CLASS_FILES): Likewise.

* src/native/include/Makefile.am
(ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADERS): Added
gnu_java_lang_management_VMMemoryMXBeanImpl.h and
java_lang_management_MemoryUsage.h.

* src/native/vm/Makefile.am (libnativevm_la_SOURCES): Added
gnu_java_lang_management_VMMemoryMXBeanImpl.c.

* src/native/vm/gnu_java_lang_management_VMMemoryMXBeanImpl.c
(vm/loader.h): Added.

* src/mm/boehm.c (gc_get_total_bytes): New function.
* src/mm/boehm.h (gc_get_total_bytes): Added.

* src/lib/vm/reference/java/lang/VMClassLoader.java: Merged GNU
Classpath changes.

* src/native/Makefile.am (nativetable.inc): Renamed VM_ZIP to
CACAO_VM_ZIP.

* src/vm/jit/dseg.c (desg_increase): Removed.
(dseg_finish): New function.
(dseg_find_s4): Likewise.
(dseg_find_s8): Likewise.
(dseg_find_float): Likewise.
(dseg_find_double): Likewise.
(dseg_find_address): Likewise.
(dseg_add_s4_intern): Likewise.
(dseg_add_unique_s4): Likewise.
(dseg_add_s4): Likewise.
(dseg_add_s8_intern): Likewise.
(dseg_add_unique_s8): Likewise.
(dseg_add_s8): Likewise.
(dseg_add_float_intern): Likewise.
(dseg_add_unique_float): Likewise.
(dseg_add_float): Likewise.
(dseg_add_double_intern): Likewise.
(dseg_add_unique_double): Likewise.
(dseg_add_double): Likewise.
(dseg_add_address_intern): Likewise.
(dseg_add_unique_address): Likewise.
(dseg_add_address): Likewise.

* src/vm/jit/dseg.h (dsegentry): New structure.

* src/vm/jit/codegen-common.c (codegen_setup): Don't allocate memory
for data segment.
(codegen_finish): Call dseg_finish.

* src/vm/jit/codegen-common.h (codegendata): Removed dsegtop and
dsegsize, added dseg.

* src/vm/jit/powerpc/codegen.c: Use new dseg function names.

* src/vm/jit/powerpc/emit.c (vm/jit/dseg.h): Added.
(emit_iconst): Use new dseg function names.

* src/vm/jit/powerpc/linux/md-abi.h (REG_ITMP23_PACKED): New define.
* src/vm/jit/powerpc/darwin/md-abi.h (REG_ITMP23_PACKED): Likewise.

* src/vm/loader.c (load_class_from_classbuffer): Enable "Extra bytes
at the end of class file"-check, since we are something like Java 1.5.

* src/vm/jit/jit.h (INSTRUCTION_UNRESOLVED_CLASS): Defined.

* src/vm/jit/alpha/codegen.c (codegen): First changes for duplicate
patcher removal.

* src/vm/jit/show.c (new_show_method): Print stub length in method
header.
(show_method): Likewise.

* src/vm/jit/codegen-common.c (codegen_addpatchref): Don't cast to
u1*.

* src/vm/jit/parse.h (code_get_u1, code_get_s1, code_get_u2)
(code_get_s2, code_get_u4, code_get_s4): Removed.

* src/vm/suck.h (SUCK_BE_S1, SUCK_BE_S2, SUCK_BE_S4, SUCK_BE_S8):
Defined.

* src/vm/jit/parse.c (vm/suck.h): Added.
(new_parse): Use SUCK_BE_* macros instead of code_get_*.
(parse): Likewise.

* src/vm/builtin.c (builtin_print_argument): #ifndef NDEBUG.

* src/vm/jit/powerpc/linux/md-asm.h: Added register defines.

* src/vm/jit/powerpc/darwin/md-asm.h: Added fr register defines again,
we need them.

* src/vm/jit/powerpc/asmpart.S (asm_replacement_out): Use internal
register defines instead of numbers, as darwin does not understand it.
(asm_replacement_in): Likewise.

* src/vm/jit/powerpc/darwin/md-asm.h (mach/ppc/asm.h): Removed. Don't
define the fr register names.

* src/vm/jit/powerpc/linux/md-asm.h (asm/ppc_asm.h): Removed, it's not
an official kernel header.

* src/vm/jit/powerpc/asmpart.S: Use CACAO internal register defines or
simple register numbers.

* src/vm/global.h (IS_FLT_TYPE): Added.
(IS_DBL_TYPE): Likewise.

* src/vm/jit/i386/md-emit.h (emit_ialu): Removed.
(emit_ialuconst): Likewise.
(emit_lalu): Likewise.
(emit_laluconst): Likewise.
(emit_ishift): Likewise.
(emit_ishiftconst): Likewise.
(emit_ifcc_iconst): Likewise.

* src/vm/jit/jit.h (ICMD_ELSE_ICONST): Removed.
(ICMD_IFEQ_ICONST): Likewise.
(ICMD_IFNE_ICONST): Likewise.
(ICMD_IFLT_ICONST): Likewise.
(ICMD_IFGE_ICONST): Likewise.
(ICMD_IFGT_ICONST): Likewise.
(ICMD_IFLE_ICONST): Likewise.

* src/vm/jit/jit.c (icmd_names): Set removed ICMDs to UNDEF.

* src/vm/jit/allocator/simplereg.c (new_allocate_scratch_registers):
Removed ICMDs.
(allocate_scratch_registers): Likewise.

* src/vm/jit/verify/typecheck.c (verify_basic_block): Likewise.

* src/vm/jit/stack.c (new_stack_analyse): Likewise.
(stack_analyse): Likewise.

* src/vm/jit/show.c (new_show_icmd): Likewise.
(show_icmd): Likewise.

* src/vm/jit/alpha/arch.h (CONDITIONAL_LOADCONST): Removed.
* src/vm/jit/i386/arch.h: Likewise.
* src/vm/jit/mips/arch.h: Likewise.
* src/vm/jit/powerpc/arch.h: Likewise.
* src/vm/jit/powerpc64/arch.h: Likewise.
* src/vm/jit/sparc64/arch.h: Likewise.
* src/vm/jit/x86_64/arch.h: Likewise.

* src/vm/jit/alpha/codegen.c (codegen): Removed ICMDs.
* src/vm/jit/i386/codegen.c: Likewise.
* src/vm/jit/mips/codegen.c: Likewise.
* src/vm/jit/sparc64/codegen.c: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.

* src/vm/jit/i386/emit.c (emit_ifcc_iconst): Removed.

* src/vm/jit/x86_64/md.c (md_signal_handler_sigusr2): Fixed comment.

* src/vm/jit/i386/linux/md-os.c (md_signal_handler_sigusr2): New
function.

* src/vm/jit/jit.h (TYPE_INT, TYPE_LNG, TYPE_FLT, TYPE_DBL, TYPE_ADR)
(IS_INT_LNG_TYPE, IS_FLT_DBL_TYPE, IS_2_WORD_TYPE)
(IS_INT_TYPE, IS_LNG_TYPE, IS_ADR_TYPE, IS_VOID_TYPE): Removed.

* src/vm/global.h (TYPE_LONG, TYPE_FLOAT, TYPE_DOUBLE, TYPE_ADDRESS):
Removed.
(TYPE_INT, TYPE_LNG, TYPE_FLT, TYPE_DBL, TYPE_ADR)
(IS_INT_LNG_TYPE, IS_FLT_DBL_TYPE, IS_2_WORD_TYPE)
(IS_INT_TYPE, IS_LNG_TYPE, IS_ADR_TYPE, IS_VOID_TYPE): Added.

* src/vm/loader.c (load_field): Use short TYPE_* defines.
(load_newly_created_array): Likewise.

* src/vm/descriptor.c (descriptor_to_basic_type): Likewise.
(descriptor_typesize): Likewise.
(descriptor_to_typedesc): Likewise.
(descriptor_pool_parse_method_descriptor): Likewise.
(descriptor_debug_print_typedesc): Likewise.

* src/vm/jit/verify/typecheck.c (typestack_copy): Likewise.
(typestack_put_retaddr): Likewise.
(typestack_merge): Likewise.
(verify_basic_block): Likewise.
(verify_init_locals): Likewise.

* src/vm/jit/verify/typeinfo.c (typevectorset_copymergedtype):
Likewise.
(typevectorset_store_retaddr): Likewise.
(typevectorset_store_twoword): Likewise.
(typevector_merge): Likewise.
(typeinfos_init_from_methoddesc): Likewise.
(typeinfo_test_parse): Likewise.
(typeinfo_print_type): Likewise.
(typeinfo_print_stacktype): Likewise.

* src/vm/jit/verify/typeinfo.h (TYPE_IS_RETURNADDRESS): Likwise.
(TYPE_IS_REFERENCE): Likwise.

* src/native/jni.c (_Jv_jni_vmargs_from_objectarray): Likewise.

* src/mm/memory.c (memory_cnew): When MAP_ANONYMOUS and MAP_ANON are
not defined, we use simply malloc. This is required for IRIX.

* configure.ac (AC_FUNC_MMAP): Added.
(AC_CHECK_FUNCS): Removed mprotect.

* src/mm/memory.c (DEFAULT_CODEMEM_SIZE): Renamed to
DEFAULT_CODE_MEMORY_SIZE.
(codememlock): Renamed to lock_code_memory.
(codememptr): Renamed to code_memory.
(codememsize): Renamed to code_memory_size.
(pagesize): Added global static variable.
(memory_init): Use new variable names and set pagesize.
(memory_cnew): Don't use malloc/mprotect as this makes some problems
with selinux enabled distributions. Instead use mmap.

* src/boehm-gc/configure.in (MY_CFLAGS): Commented. We want to use the
top-level CFLAGS.
* src/boehm-gc/Makefile.am (LTCOMPILE): Likewise.
(LINK): Likewise.

* src/vm/jit/powerpc/linux/md-asm.h (__ASSEMBLY__): Defined. It's
required for <asm/ppc_asm.h> on my Debian system.

* src/vm/exceptions.c (new_verifyerror): Renamed to
exceptions_new_verifyerror.
(exceptions_throw_verifyerror): New function.
* src/vm/exceptions.h (new_verifyerror): Renamed to
exceptions_new_verifyerror.
(exceptions_throw_verifyerror): Added.

* src/vm/resolve.c: Use exceptions_throw_verifyerror instead of
new_verifyerror.
* src/vm/jit/parse.c: Likewise.
* src/vm/jit/stack.c: Likewise.
* src/vm/jit/verify/typecheck.c: Likewise.
* src/vm/jit/verify/typeinfo.c: Likewise.

* src/cacaoh/headers.c (new_verifyerror): Renamed to
exceptions_throw_verifyerror.

* src/vm/builtin.c (builtin_asm_get_exceptionptrptr): Removed.
* src/vm/builtin.h (builtin_get_exceptionptrptr): Likewise.

* src/vm/jit/mips/patcher.c (assert.h): Added.
(vm/exceptions.h): Added.
(vm/jit/methodheader.h): Likewise.
(patcher_wrapper): New function.
(patcher_get_putstatic): Removed monitor enter/exit, this is now done
by the wrapper.
(patcher_get_putfield): Likewise.
(patcher_aconst): Likewise.
(patcher_builtin_multianewarray): Likewise.
(patcher_builtin_arraycheckcast): Likewise.
(patcher_invokestatic_special): Likewise.
(patcher_invokevirtual): Likewise.
(patcher_invokeinterface): Likewise.
(patcher_checkcast_instanceof_flags): Likewise.
(patcher_checkcast_instanceof_interface): Likewise.
(patcher_checkcast_instanceof_class): Likewise.
(patcher_clinit): Likewise.
(patcher_athrow_areturn): Likewise.
(patcher_resolve_native): Likewise.

* src/vm/jit/mips/asmpart.S (asm_call_jit_compiler): Use
exceptions_get_and_clear_exception.
(asm_abstractmethoderror): Added missing .ent/.end.
(asm_wrapper_patcher): Use patcher_wrapper.

* src/vm/jit/show.c (new_show_method): Print data length.
(show_method): Likewise.

* src/vm/jit/powerpc64/* (global): changed all powerpc references to
 powerpc64.

* src/vm/jit/show.c (new_show_method): Print method's code length.
(show_method): Likewise.

* src/vm/jit/alpha/patcher.c (patcher_wrapper): Patch back the
original instruction on successful returns.
(patcher_get_putstatic): Removed instruction patching.
(patcher_get_putfield): Likewise.
(patcher_aconst): Likewise.
(patcher_builtin_multianewarray): Likewise.
(patcher_builtin_arraycheckcast): Likewise.
(patcher_invokestatic_special): Likewise.
(patcher_invokevirtual): Likewise.
(patcher_invokeinterface): Likewise.
(patcher_checkcast_instanceof_flags): Likewise.
(patcher_checkcast_instanceof_interface): Likewise.
(patcher_checkcast_instanceof_class): Likewise.
(patcher_clinit): Likewise.
(patcher_athrow_areturn): Likewise.
(patcher_resolve_native): Likewise.

* src/vm/jit/powerpc64/linux/md-abi.c (md_return_alloc): isleafmethod
 has been moved to jitdata.

* src/vm/jjit/powerpc64/codegen.c (global): fixes for isleafmethod
 changes, BUILTIN_monitor* renamed to LOCK_monitor_*
 codegen_add_classcastexception_ref api changed.

* src/vm/jit/powerpc64/asmpart.S (global): fixed R_PPC64_ADDR32
 issues (32 bit adresses) all jump tables data types from
 long to quad and synched with powerpc asmpart.S.

* src/mm/memory.c (memory_cfree): New function.
* src/mm/memory.h (CFREE): Define to memory_cfree.
(memory_cfree): Added.

* src/native/jvmti/Makefile.am (lib_LTLIBRARIES): Removed libjdwp.la.
(libjdwp_la_SOURCES): Removed.

* src/native/jvmti/VMjdwp.c: Removed.
* src/native/jvmti/VMjdwp.h: Likewise.

* src/native/vm/Makefile.am [ENABLE_JVMTI] (lib_LTLIBRARIES): Added
libjdwp.la.
(libjdwp_la_SOURCES): Added.

* src/native/vm/VMFrame.c: Removed.
* src/native/vm/VMMethod.c: Likewise.
* src/native/vm/VMVirtualMachine.c: Likewise.

* src/native/vm/VMjdwp.c: Added.
* src/native/vm/VMjdwp.h: Likewise.
* src/native/vm/gnu_classpath_jdwp_VMVirtualMachine.c: Likewise.
* src/native/vm/gnu_classpath_jdwp_VMFrame.c: Likewise.
* src/native/vm/gnu_classpath_jdwp_VMMethod.c: Likewise.

--HG--
rename : src/native/jvmti/VMjdwp.c => src/native/vm/VMjdwp.c
rename : src/native/jvmti/VMjdwp.h => src/native/vm/VMjdwp.h
rename : src/native/vm/VMFrame.c => src/native/vm/gnu_classpath_jdwp_VMFrame.c
rename : src/native/vm/VMMethod.c => src/native/vm/gnu_classpath_jdwp_VMMethod.c
rename : src/native/vm/VMVirtualMachine.c => src/native/vm/gnu_classpath_jdwp_VMVirtualMachine.c

* src/native/jvmti/VMjdwp.c (Breakpoint): adapt BreakpointEvent signature to changed gnu classpath jdwp implementation.
(fillidcache): idem

* src/vm/builtin.c (builtin_trace_args): Added missing
TRACE_ARGS_NUM >= 4 case.

* src/vm/jit/powerpc/darwin/md-asm.h (asm_wrapper_patcher): Renamed to
asm_patcher_wrapper.

* src/native/vm/Makefile.am (libnativevm_la_SOURCES): Added package
prefix to filenames.

* src/native/vm/VMClassLoader.c: Removed.
* src/native/vm/VMThrowable.c: Likewise.
* src/native/vm/VMAccessController.c: Likewise.
* src/native/vm/VMString.c: Likewise.
* src/native/vm/VMObject.c: Likewise.
* src/native/vm/VMStackWalker.c: Likewise.
* src/native/vm/Field.c: Likewise.
* src/native/vm/VMSystem.c: Likewise.
* src/native/vm/VMSystemProperties.c: Likewise.
* src/native/vm/VMClass.c: Likewise.
* src/native/vm/VMThread.c: Likewise.
* src/native/vm/Method.c: Likewise.
* src/native/vm/VMProxy.c: Likewise.
* src/native/vm/Constructor.c: Likewise.
* src/native/vm/VMRuntime.c: Likewise.

* src/native/vm/gnu_classpath_VMStackWalker.c: Added.
* src/native/vm/java_lang_VMSystem.c: Likewise.
* src/native/vm/java_lang_reflect_Method.c: Likewise.
* src/native/vm/java_lang_VMObject.c: Likewise.
* src/native/vm/java_lang_VMString.c: Likewise.
* src/native/vm/gnu_classpath_VMSystemProperties.c: Likewise.
* src/native/vm/java_lang_VMRuntime.c: Likewise.
* src/native/vm/java_lang_reflect_Field.c: Likewise.
* src/native/vm/java_lang_VMThrowable.c: Likewise.
* src/native/vm/java_lang_VMClassLoader.c: Likewise.
* src/native/vm/java_lang_VMClass.c: Likewise.
* src/native/vm/java_lang_VMThread.c: Likewise.
* src/native/vm/java_security_VMAccessController.c: Likewise.
* src/native/vm/java_lang_reflect_VMProxy.c: Likewise.
* src/native/vm/java_lang_reflect_Constructor.c: Likewise.

--HG--
rename : src/native/vm/VMStackWalker.c => src/native/vm/gnu_classpath_VMStackWalker.c
rename : src/native/vm/VMSystemProperties.c => src/native/vm/gnu_classpath_VMSystemProperties.c
rename : src/native/vm/VMClass.c => src/native/vm/java_lang_VMClass.c
rename : src/native/vm/VMClassLoader.c => src/native/vm/java_lang_VMClassLoader.c
rename : src/native/vm/VMObject.c => src/native/vm/java_lang_VMObject.c
rename : src/native/vm/VMRuntime.c => src/native/vm/java_lang_VMRuntime.c
rename : src/native/vm/VMString.c => src/native/vm/java_lang_VMString.c
rename : src/native/vm/VMSystem.c => src/native/vm/java_lang_VMSystem.c
rename : src/native/vm/VMThread.c => src/native/vm/java_lang_VMThread.c
rename : src/native/vm/VMThrowable.c => src/native/vm/java_lang_VMThrowable.c
rename : src/native/vm/Constructor.c => src/native/vm/java_lang_reflect_Constructor.c
rename : src/native/vm/Field.c => src/native/vm/java_lang_reflect_Field.c
rename : src/native/vm/Method.c => src/native/vm/java_lang_reflect_Method.c
rename : src/native/vm/VMProxy.c => src/native/vm/java_lang_reflect_VMProxy.c
rename : src/native/vm/VMAccessController.c => src/native/vm/java_security_VMAccessController.c

* src/native/vm/gnu_java_lang_management_VMMemoryMXBeanImpl.c: New
file.

* src/native/vm/gnu_java_lang_management_VMRuntimeMXBeanImpl.c
(vm/vm.h): Added.
(getStartTime): Implemented.

* src/native/vm/VMSystemProperties.c (preInit): Added
gnu.java.compiler.name property.

* src/vm/jit/jit.h (IS_VOID_TYPE): Added.

* src/vm/builtin.c (builtin_print_argument): New function.
(builtin_trace_args): Rewritten. Uses builtin_trace_args and prints
arguments much better.
(builtin_displaymethodstop): Likewise.

* src/native/jvmti/.cvsignore (TAGS): Added.
(cacaodbgserver): Likewise.

* configure.ac (CACAO_LIBDIR): Added.

* src/vm/classcache.c [ENABLE_JVMTI] (lock_hashtable_classcache):
Don't export it.
(classcache_jvmti_GetLoadedClasses): New method.

* src/vm/classcache.h (CLASSCACHE_LOCK): Don't define it.
(CLASSCACHE_UNLOCK): Likewise.
(lock_hashtable_classcache): Don't export it.
(classcache_jvmti_GetLoadedClasses): Added.

* src/vm/vm.c (vm_create): Use CACAO_LIBDIR in OPT_XRUNJDWP.

* src/native/jvmti/jvmti.c (GetLoadedClasses): Use
classcache_jvmti_GetLoadedClasses.
(jvmti_agentload): Some code cleanup.

* src/native/include/include/Makefile.am (GEN_JVMTI_HEADER_FILES):
Reordered.

* src/native/include/include/.cvsignore
(gnu_classpath_jdwp_VMMethod.h): Added.
(gnu_classpath_jdwp_util_VariableTable.h): Likewise.

* src/vm/jit/asmpart.h (asm_wrapper_patcher): Renamed to
asm_patcher_wrapper.

* src/vm/jit/alpha/codegen.c (codegen): Likewise.
(createnativestub): Likewise.
* src/vm/jit/alpha/asmpart.S (asm_wrapper_patcher): Likewise.

* src/vm/jit/i386/codegen.c (codegen): Likewise.
(createnativestub): Likewise.
* src/vm/jit/i386/asmpart.S (asm_wrapper_patcher): Likewise.

* src/vm/jit/mips/codegen.c (codegen): Likewise.
(createnativestub): Likewise.
* src/vm/jit/mips/asmpart.S (asm_wrapper_patcher): Likewise.

* src/vm/jit/powerpc/codegen.c (codegen): Likewise.
(createnativestub): Likewise.
* src/vm/jit/powerpc/asmpart.S (asm_wrapper_patcher): Likewise.

* src/vm/jit/powerpc64/codegen.c (codegen): Likewise.
(createnativestub): Likewise.
* src/vm/jit/powerpc64/asmpart.S (asm_wrapper_patcher): Likewise.

* src/vm/jit/x86_64/codegen.c (codegen): Likewise.
(createnativestub): Likewise.
* src/vm/jit/x86_64/asmpart.S (asm_wrapper_patcher): Likewise.