cacao.git
16 years agoMerging 7888.
Peter Molnar [Thu, 28 Feb 2008 09:26:32 +0000 (10:26 +0100)]
Merging 7888.

16 years ago* src/vm/jit/cfg.c (cfg_add_exceptional_edges): New function
Peter Molnar [Thu, 28 Feb 2008 09:24:36 +0000 (10:24 +0100)]
* src/vm/jit/cfg.c (cfg_add_exceptional_edges): New function
* src/vm/jit/jit.c (jit_compile_intern) [ENABLE_SSA]: Adapted.
* src/vm/jit/jit.h (struct basicblock) [ENABLE_SSA]: New fileds for exception handlers in cfg.
* src/vm/jit/optimizing/ssa.c (ssa): Adapted.
* src/vm/jit/optimizing/ssa3.c: Changed a lot, currenly broken.

16 years ago* src/vm/jit/s390/asmpart.S (L_offsets): Removed references to unused functions.
Peter Molnar [Thu, 28 Feb 2008 09:03:39 +0000 (10:03 +0100)]
* src/vm/jit/s390/asmpart.S (L_offsets): Removed references to unused functions.
* src/vm/jit/s390/md.c: Including vm/jit/s390/md.h.

16 years ago* tests/threadInterrupt.java: Added a test showing a bug in the pre-sable
Stefan Ring [Wed, 27 Feb 2008 16:11:58 +0000 (17:11 +0100)]
* tests/threadInterrupt.java: Added a test showing a bug in the pre-sable
implementation.

16 years ago* src/threads/native/threads.c (threads_set_current_threadobject): Added
Stefan Ring [Wed, 27 Feb 2008 16:04:29 +0000 (17:04 +0100)]
* src/threads/native/threads.c (threads_set_current_threadobject): Added
a few vm_abort_errnum calls.
(threads_get_current_thread): Likewise.

* src/threads/native/lock.c (lock_record_new): Likewise.
(lock_record_free): Likewise.

16 years ago* src/vm/jit/x86_64/linux/md-os.c (md_replace_executionstate_read): Fix
Edwin Steiner [Wed, 20 Feb 2008 23:38:41 +0000 (00:38 +0100)]
* src/vm/jit/x86_64/linux/md-os.c (md_replace_executionstate_read): Fix
copy&paste mistake (for reading the PC).

16 years ago* src/vm/jit/replace.h (executionstate_t): Added 'ra' field for return
Edwin Steiner [Wed, 20 Feb 2008 22:53:44 +0000 (23:53 +0100)]
* src/vm/jit/replace.h (executionstate_t): Added 'ra' field for return
address register. Otherwise replacement code for the PowerPC gets very
ugly, as the LR is not part of the intregs on PowerPC.

* src/vm/jit/replace.c (replace_executionstate_println): Added print
statements.
(replace_sanity_check_read_write): Check 'ra' field.

* src/vm/jit/alpha/linux/md-os.c (md_replace_executionstate_read):
Use new 'ra' field.
(md_replace_executionstate_write): Likewise.

* src/vm/jit/powerpc/linux/md-os.c (md_replace_executionstate_read):
Implemented for PowerPC/Linux.
(md_replace_executionstate_write): Likewise.

16 years ago* src/vm/jit/alpha/linux/md-os.c (md_replace_executionstate_read):
Edwin Steiner [Wed, 20 Feb 2008 20:38:41 +0000 (21:38 +0100)]
* src/vm/jit/alpha/linux/md-os.c (md_replace_executionstate_read):
Do not use the assignment operator for the float registers, as the type
conversion messes up their values (they are not 'double' in the
context).
(md_replace_executionstate_write): Likewise.

16 years ago* src/vm/jit/replace.c (replace_sanity_check_read_write): New function.
Edwin Steiner [Wed, 20 Feb 2008 20:30:03 +0000 (21:30 +0100)]
* src/vm/jit/replace.c (replace_sanity_check_read_write): New function.
Perform some basic sanity checks of the md_replacement_* implementations.
(replace_me_wrapper): Call above function in debugging mode.

16 years agoMerged with tip
Roland Lezuo [Wed, 20 Feb 2008 00:04:22 +0000 (01:04 +0100)]
Merged with tip

16 years ago* src/vm/jit/x86_64/emit.c (emit_alu_imm_membase): Fix emit_rex call.
Edwin Steiner [Tue, 19 Feb 2008 22:27:28 +0000 (23:27 +0100)]
* src/vm/jit/x86_64/emit.c (emit_alu_imm_membase): Fix emit_rex call.

--HG--
extra : transplant_source : e%05v%98%F6D%C1I%86l%C4%5Bo%05%E7f%C9A%20%F8

16 years ago* src/vm/jit/x86_64/emit.c (emit_alul_imm_membase): Fix emit_rex call.
Edwin Steiner [Tue, 19 Feb 2008 22:10:50 +0000 (23:10 +0100)]
* src/vm/jit/x86_64/emit.c (emit_alul_imm_membase): Fix emit_rex call.

--HG--
extra : transplant_source : %DA%DE%83%98%F3%D2%05u%BE%C8L%A4I%CB%DD%F60%AF%A7%5E

16 years agoMerged with cldc-branch
Roland Lezuo [Tue, 19 Feb 2008 17:04:20 +0000 (18:04 +0100)]
Merged with cldc-branch

16 years ago* src/vm/jit/m68k/asmpart.S (asm_vm_call_method): Do not overwrite return
tbfg@c1.complang.tuwien.ac.at [Tue, 19 Feb 2008 16:46:44 +0000 (17:46 +0100)]
* src/vm/jit/m68k/asmpart.S (asm_vm_call_method): Do not overwrite return
address with method to be invoked.

* src/vm/jit/m68k/codegen.c (codegen_emit_stub_native): Removed call to trace
function as seen in other archs.

*  src/vm/jit/m68k/codegen.h (COMPILERSTUB_CODESIZE): Fix size for new compiler
trap.

16 years ago* src/vm/jit/powerpc/linux/md-abi.c (md_return_alloc): Use
Christian Thalinger [Tue, 19 Feb 2008 15:21:50 +0000 (16:21 +0100)]
* src/vm/jit/powerpc/linux/md-abi.c (md_return_alloc): Use
switch-case.

16 years ago* src/vm/jit/powerpc/codegen.c (codegen_emit): Use switch-case to
Christian Thalinger [Tue, 19 Feb 2008 14:12:44 +0000 (15:12 +0100)]
* src/vm/jit/powerpc/codegen.c (codegen_emit): Use switch-case to
store return values for invokes.

16 years ago* src/vm/jit/powerpc/codegen.c (codegen_emit_stub_native): Use
Christian Thalinger [Mon, 18 Feb 2008 22:05:32 +0000 (23:05 +0100)]
* src/vm/jit/powerpc/codegen.c (codegen_emit_stub_native): Use
switch-case for argument copying.

16 years ago* src/vmcore/options.h, src/vmcore/options.c, src/vm/jit/inline/inline.c:
Edwin Steiner [Mon, 18 Feb 2008 22:02:24 +0000 (23:02 +0100)]
* src/vmcore/options.h, src/vmcore/options.c, src/vm/jit/inline/inline.c:
Trace levels for inlining.

--HG--
extra : transplant_source : 0%BE%2AL%B3%8F%A9%3A%A5Q%F5%AE%3BC%BA%87%7F%2B%D3%19

16 years ago* src/vm/jit/inline/inline.c (inline_transform): Make semantics of opt_InlineCount
Edwin Steiner [Mon, 18 Feb 2008 21:33:05 +0000 (22:33 +0100)]
* src/vm/jit/inline/inline.c (inline_transform): Make semantics of opt_InlineCount
less confusing.

--HG--
extra : transplant_source : %88b%95%00%E4x%03%E10%C0%84%0F%A4T%A3%CAa%14%D2%BA

16 years ago* src/vmcore/options.h, src/vmcore/options.c, src/vmcore/method.c,
Edwin Steiner [Mon, 18 Feb 2008 21:25:21 +0000 (22:25 +0100)]
* src/vmcore/options.h, src/vmcore/options.c, src/vmcore/method.c,
src/vmcore/linker.c, src/vm/vm.c, src/vm/jit/jit.c,
src/vm/jit/inline/inline.c: Changed inlining options to -XX options.

--HG--
extra : transplant_source : %CCn%93%AB%1B%B4RQ%93%21%2A1ljD-%D7%2C%A2%F9

16 years ago* src/vm/jit/powerpc/codegen.c (codegen_emit): Removed variable a,
Christian Thalinger [Mon, 18 Feb 2008 18:52:07 +0000 (19:52 +0100)]
* src/vm/jit/powerpc/codegen.c (codegen_emit): Removed variable a,
added variable i.

16 years ago* src/vm/jit/powerpc/codegen.c (codegen_emit): Use switch-case when
Christian Thalinger [Mon, 18 Feb 2008 18:47:06 +0000 (19:47 +0100)]
* src/vm/jit/powerpc/codegen.c (codegen_emit): Use switch-case when
argument copying for invokes.

16 years ago* src/vm/jit/powerpc/codegen.h: Grouped and alpha-sorted the code
Christian Thalinger [Mon, 18 Feb 2008 13:19:30 +0000 (14:19 +0100)]
* src/vm/jit/powerpc/codegen.h: Grouped and alpha-sorted the code
generating macros.

16 years ago* src/vm/jit/replace.c (replace_gc_from_native): Fixed typo, again.
Christian Thalinger [Mon, 18 Feb 2008 13:08:06 +0000 (14:08 +0100)]
* src/vm/jit/replace.c (replace_gc_from_native): Fixed typo, again.

16 years ago* src/vm/jit/replace.c (replace_me): Fixed typo.
Christian Thalinger [Mon, 18 Feb 2008 13:05:30 +0000 (14:05 +0100)]
* src/vm/jit/replace.c (replace_me): Fixed typo.

16 years ago* src/vm/jit/replace.c (replace_me): Use
Christian Thalinger [Mon, 18 Feb 2008 12:42:21 +0000 (13:42 +0100)]
* src/vm/jit/replace.c (replace_me): Use
threads_get_current_stackframeinfo().
(replace_gc_from_native): Likewise.

16 years ago* src/vm/jit/stacktrace.c (stacktrace_get): Changed signature to take
Christian Thalinger [Mon, 18 Feb 2008 12:40:56 +0000 (13:40 +0100)]
* src/vm/jit/stacktrace.c (stacktrace_get): Changed signature to take
again a stackframeinfo_t.
(stacktrace_get_current): New function.
(stacktrace_stackframeinfo_add): Use
threads_get_current_stackframeinfo.
(stacktrace_stackframeinfo_remove): Likewise.
(stacktrace_first_nonnull_classloader): Likewise.
(stacktrace_getClassContext): Likewise.
(stacktrace_get_current_class): Likewise.
(stacktrace_get_stack): Likewise.
* src/vm/jit/stacktrace.h (stacktrace_get): Changed signature.
(stacktrace_get_current): New function.

* src/mm/cacao-gc/gc.c (gc_collect): Replaced stacktrace_get with
stacktrace_get_current.
* src/native/vm/cldc1.1/java_lang_Throwable.c (fillInStackTrace):
Likewise.
* src/native/vm/gnu/java_lang_VMThrowable.c (fillInStackTrace):
Likewise.
* src/native/vm/sun/jvm.c (JVM_FillInStackTrace): Likewise.

* src/threads/native/threads.h (STACKFRAMEINFO): Removed.
(threads_get_current_stackframeinfo): New function.
(threads_set_current_stackframeinfo): Likewise.
* src/threads/none/threads.h: Likewise.

* src/threads/threads-common.c (threads_dump) [ENABLE_GC_CACAO]: Added
code to suspend and resume the thread (NOTE: Not tested!).
(threads_thread_print_stacktrace): Rewritten to work again.

16 years ago* src/vmcore/options.c (opt_TraceSubsystemInitialization): Added.
Christian Thalinger [Mon, 18 Feb 2008 11:27:28 +0000 (12:27 +0100)]
* src/vmcore/options.c (opt_TraceSubsystemInitialization): Added.
* src/vmcore/options.h (TRACESUBSYSTEMINITIALIZATION): New macro.

* src/mm/boehm.c,
src/mm/codememory.c,
src/native/jni.c,
src/native/localref.c,
src/native/native.c,
src/native/vm/nativevm.c,
src/threads/native/threads.c,
src/threads/threads-common.c,
src/vm/builtin.c,
src/vm/exceptions.c,
src/vm/finalizer.c,
src/vm/jit/jit.c,
src/vm/jit/optimizing/recompile.c,
src/vm/package.c,
src/vm/primitive.c,
src/vm/properties.c,
src/vm/signal.c,
src/vm/string.c,
src/vmcore/classcache.c,
src/vmcore/linker.c,
src/vmcore/loader.c,
src/vmcore/primitivecore.c,
src/vmcore/suck.c,
src/vmcore/utf8.c: Added TRACESUBSYSTEMINITIALIZATION to the *_init
functions.

16 years ago* src/vmcore/options.c: Use int instead of int32_t for opt_*
Christian Thalinger [Mon, 18 Feb 2008 11:03:33 +0000 (12:03 +0100)]
* src/vmcore/options.c: Use int instead of int32_t for opt_*
variables.
* src/vmcore/options.h: Likewise.

16 years ago* contrib/vmlog/vmlog_cacao.c (vmlog_cacao_do_log): Deal with m->class == NULL.
Edwin Steiner [Sun, 17 Feb 2008 18:24:30 +0000 (19:24 +0100)]
* contrib/vmlog/vmlog_cacao.c (vmlog_cacao_do_log): Deal with m->class == NULL.

16 years agoMerged the "edwin-replacement" branch that I pushed accidentally.
Edwin Steiner [Sun, 17 Feb 2008 17:53:21 +0000 (18:53 +0100)]
Merged the "edwin-replacement" branch that I pushed accidentally.

16 years ago* src/vm/signal.c (signal_handle): vmlog signal type.
Edwin Steiner [Sun, 17 Feb 2008 10:41:43 +0000 (11:41 +0100)]
* src/vm/signal.c (signal_handle): vmlog signal type.

--HG--
branch : edwin-replacement
extra : transplant_source : MX%07%B9%27H%FAC%B9%9D%3AO%5B%80%A2%DE%E2m%3C%CC

16 years ago* contrib/vmlog/vmlog_cacao.h (vmlog_cacao_signl_type): New function.
Edwin Steiner [Sat, 16 Feb 2008 07:39:31 +0000 (08:39 +0100)]
* contrib/vmlog/vmlog_cacao.h (vmlog_cacao_signl_type): New function.
* contrib/vmlog/vmlog_cacao.c (vmlog_cacao_signl_type): Likewise.

--HG--
branch : edwin-replacement
extra : transplant_source : %19%1D%94-%60e%DB%1Am%40%27%21%A4%28/R%AF%B8z%DD

16 years ago* src/vmcore/options.c (TraceJavaCalls): Remove this option when vmlog
Edwin Steiner [Fri, 15 Feb 2008 20:35:01 +0000 (21:35 +0100)]
* src/vmcore/options.c (TraceJavaCalls): Remove this option when vmlog
is enabled. (It does not have the expected effect then).

--HG--
branch : edwin-replacement
extra : transplant_source : x%B8%10Pw%1B%7E%5E%A3%9F%83%FB%04%1B%B9%5B%F2%0Fq%CC

16 years ago* src/vmcore/options.c (options_xx): Integrated vmlog options handling.
Edwin Steiner [Fri, 15 Feb 2008 20:26:28 +0000 (21:26 +0100)]
* src/vmcore/options.c (options_xx): Integrated vmlog options handling.
* src/vm/vm.c (vm_create): Changed vmlog init interface.
* src/cacaoh/dummy.c (vmlog_cacao_set_prefix, vmlog_cacao_set_stringprefix,
vmlog_cacao_set_ignoreprefix): Dummies added.
* contrib/vmlog/vmlog.h, contrib/vmlog/vmlog.c, contrib/vmlog/vmlog_cacao.h,
contrib/vmlog/vmlog_cacao.c: Changed vmlog init interface.

--HG--
branch : edwin-replacement
extra : transplant_source : %F0%0C%E3%E5%7C%FB%E4%19%97J%E3%7D%EFNt%E6IP%16%9E

16 years ago* src/vm/jit/m68k/codegen.c (codegen_emit_stub_native): Handle builtin correctly.
tbfg@c1.complang.tuwien.ac.at [Fri, 15 Feb 2008 19:16:51 +0000 (20:16 +0100)]
* src/vm/jit/m68k/codegen.c (codegen_emit_stub_native): Handle builtin correctly.
* src/vm/jit/m68k/linux/md-abi.c (md_param_alloc_native): With 8 bytes stack
slots internally natives need a 4 byte stack slot allocation.
(md_param_alloc): Set index correctly.

16 years ago* contrib/vmlog/vmlog_cacao.c, contrib/vmlog/vmlog_cacao.h: Replaced
Edwin Steiner [Fri, 15 Feb 2008 19:03:51 +0000 (20:03 +0100)]
* contrib/vmlog/vmlog_cacao.c, contrib/vmlog/vmlog_cacao.h: Replaced
the old java_objectheader with java_object_t. Adapted lock function
calls. This makes cacao compile with --enable-vmlog again.

--HG--
branch : edwin-replacement
extra : transplant_source : b%8CEJ%B1%D5%80%19%B5%C2%BC3%A8%AE%20%96%8A%AB%93%1D

16 years ago* src/vm/jit/jit.h (FOR_EACH_BASICBLOCK, FOR_EACH_SUCCESSOR, FOR_EACH_PREDECESSOR...
Peter Molnar [Fri, 15 Feb 2008 17:55:18 +0000 (18:55 +0100)]
* src/vm/jit/jit.h (FOR_EACH_BASICBLOCK, FOR_EACH_SUCCESSOR, FOR_EACH_PREDECESSOR, FOR_EACH_INSTRUCTION, basicblock_reached): New symbols.
* src/vm/jit/optimizing/Makefile.am (SSA_SOURCES) [ENABLE_SSA]: AddeAd ssa3.c
* src/vm/jit/optimizing/ssa.c: Adapted for ssa3.c.
* src/vm/jit/optimizing/ssa2.c: Added copyright header.
* src/vm/jit/optimizing/ssa3.c: New file. Yet another SSA transofrmation algorithm prototype.
* src/vm/jit/python.c: Removed wrappers for creating variables and instructions because they were misdesigned.
* src/vm/jit/optimizing/ssa2.h: Removed.

16 years ago* src/vmcore/field.c (field_print): Print offset for non-static fields.
twisti@vulture.theobroma-systems.com [Fri, 15 Feb 2008 09:13:03 +0000 (10:13 +0100)]
* src/vmcore/field.c (field_print): Print offset for non-static fields.

16 years ago* src/vm/jit/powerpc/codegen.h (MI_and, MI_anddot, MI_andi, MI_lwarx)
Christian Thalinger [Thu, 14 Feb 2008 20:49:56 +0000 (21:49 +0100)]
* src/vm/jit/powerpc/codegen.h (MI_and, MI_anddot, MI_andi, MI_lwarx)
(MI_or, MI_ordot, MI_ori, MI_subf, MI_subfdot, MI_stwcxdot, MI_sync):
New macros, these machine instruction macros should make it easier to
understand them.

* src/vm/jit/powerpc/codegen.c: Use new MI macros.

16 years ago* src/vm/jit/optimizing/dominators.c: Adapted for changes in src/mm/dumpmemory.h.
Peter Molnar [Thu, 14 Feb 2008 16:10:58 +0000 (17:10 +0100)]
* src/vm/jit/optimizing/dominators.c: Adapted for changes in src/mm/dumpmemory.h.

16 years ago* src/threads/native/threads.c (threads_impl_thread_free): Use
Christian Thalinger [Thu, 14 Feb 2008 15:50:46 +0000 (16:50 +0100)]
* src/threads/native/threads.c (threads_impl_thread_free): Use
vm_abort_errnum.
(threads_list_lock): Likewise.
(threads_list_unlock): Likewise.
(threads_mutex_gc_lock): Likewise.
(threads_mutex_gc_unlock): Likewise.
(threads_mutex_join_lock): Likewise.
(threads_mutex_join_unlock): Likewise.
(threads_impl_thread_start): Likewise.

16 years ago* src/vm/vm.c (vm_abort_errnum): New function.
Christian Thalinger [Thu, 14 Feb 2008 15:49:32 +0000 (16:49 +0100)]
* src/vm/vm.c (vm_abort_errnum): New function.
(vm_abort_errno): Use vm_abort_errnum.
* src/vm/vm.h (vm_abort_errnum): Added.

16 years ago* src/vm/vm.c (vm_abort_errno): New function.
Christian Thalinger [Thu, 14 Feb 2008 15:29:36 +0000 (16:29 +0100)]
* src/vm/vm.c (vm_abort_errno): New function.
(vmcore/system.h): Added.
(vm_abort): Use system_abort.

* src/vm/vm.h (stdint.h): Added.
(vm_abort_errno): Likewise.

16 years ago* configure.ac (AC_CHECK_FUNCS): Added abort.
Christian Thalinger [Thu, 14 Feb 2008 15:27:58 +0000 (16:27 +0100)]
* configure.ac (AC_CHECK_FUNCS): Added abort.

* src/vmcore/system.h (system_abort): New function.
(system_strerror): Likewise.

16 years ago* tests/regression/Makefile.am: Always use the same bootclasspath for
Christian Thalinger [Thu, 14 Feb 2008 14:25:23 +0000 (15:25 +0100)]
* tests/regression/Makefile.am: Always use the same bootclasspath for
different configurations, it does not matter.

* tests/regression/assertion/Makefile.am,
tests/regression/codepatching/Makefile.am,
tests/regression/jasmin/Makefile.am,
tests/regression/native/Makefile.am,
tests/regression/resolving/Makefile.am: Likewise

16 years ago* Merged with 3683e6f66d90.
Christian Thalinger [Thu, 14 Feb 2008 14:16:07 +0000 (15:16 +0100)]
* Merged with 3683e6f66d90.

16 years ago* configure.ac (AC_CONFIG_FILES): Re-enabled resolving since Edwin
Christian Thalinger [Thu, 14 Feb 2008 14:14:52 +0000 (15:14 +0100)]
* configure.ac (AC_CONFIG_FILES): Re-enabled resolving since Edwin
fixed the tests.
* tests/regression/Makefile.am: Likewise.

16 years ago* src/toolbox/Makefile.am (libtoolbox_la_SOURCES): Added set.[ch]
Peter Molnar [Thu, 14 Feb 2008 13:49:34 +0000 (14:49 +0100)]
* src/toolbox/Makefile.am (libtoolbox_la_SOURCES): Added set.[ch]
* src/toolbox/bitvector.h: Added missing include

* src/toolbox/set.c,
src/toolbox/set.h: New file. Set (of pointers) implementation.

* src/vm/jit/allocator/simplereg.c [ENABLE_SSA]: Fix for SSA.

* src/vm/jit/cfg.c,
src/vm/jit/cfg.h (cfg_insert_successors, cfg_add_root): New functions.
(cfg_build): Using controlflow constants rather than opcodes, fixed multiple
predecessors/successors problem.

* src/vm/jit/jit.c,
src/vm/jit/jit.h: Added various inline accessors for varinfo and instruction.
(basicblock [ENABLE_SSA]): Added new fields.

* src/vm/jit/optimizing/Makefile.am (SSA_SOURCES): Added ssa2.c.
* src/vm/jit/optimizing/dominators.c,
src/vm/jit/optimizing/dominators.h: Added cleaned up dominator tree and dominance
frontier implementation.

* src/vm/jit/optimizing/ssa.c: Hooked in cleaned up ssa and dominators.

* src/vm/jit/optimizing/ssa2.c,
src/vm/jit/optimizing/ssa2.h: New (temporary) files.
Added cleanead up ssa implementation. Currently renames only locals and passes
all dacapo benchmarks.

* src/vm/jit/python.c.
src/vm/jit/python.h: Changed a lot.

* src/vm/jit/show.c (show_basicblock): Support NULL bptr->javalocals.

16 years ago* Merged with fd492236e7ac.
Christian Thalinger [Thu, 14 Feb 2008 08:22:26 +0000 (09:22 +0100)]
* Merged with fd492236e7ac.

16 years ago(src/vm/jit/m68k/md.c): md_stacktrace_get_returnaddress needs to be exported.
Roland Lezuo [Wed, 13 Feb 2008 22:14:35 +0000 (23:14 +0100)]
(src/vm/jit/m68k/md.c): md_stacktrace_get_returnaddress needs to be exported.
(src/vm/jit/m68k/md.h): Likewise.

16 years ago* src/vm/vm.c (version): Changed copyright message.
Christian Thalinger [Wed, 13 Feb 2008 16:04:33 +0000 (17:04 +0100)]
* src/vm/vm.c (version): Changed copyright message.

16 years ago* tests/regression/resolving/TestController.java: Better error messages and
Edwin Steiner [Mon, 11 Feb 2008 19:52:08 +0000 (20:52 +0100)]
* tests/regression/resolving/TestController.java: Better error messages and
more convenience methods (needed for following adaption of tests).

16 years ago* src/native/native.c (native_library_load): New function.
Christian Thalinger [Sun, 10 Feb 2008 14:13:52 +0000 (15:13 +0100)]
* src/native/native.c (native_library_load): New function.
* src/native/native.h: Likewise.

* src/native/vm/java_lang_Runtime.c: Removed.
* src/native/vm/java_lang_Runtime.h: Likewise.

* src/native/vm/Makefile.am (libnativevm_la_SOURCES): Removed
java_lang_Runtime.[ch].

* src/native/vm/cldc1.1/com_sun_cldchi_jvm_JVM.c
(native/vm/java_lang_Runtime.h): Removed.
(loadLibrary): Implemented directly.

* src/native/vm/cldc1.1/java_lang_Runtime.c (vm/types.h): Removed.
(stdint.h): Added.
(mm/gc-common.h): Likewise.
(native/vm/java_lang_Runtime.h): Removed.
(vm/vm.h): Added.
(vmcore/utf8.h): Likewise.
(exitInternal): Implemented directly.
(freeMemory): Likewise.
(totalMemory): Likewise.
(gc): Likewise.

* src/native/vm/gnu/java_lang_VMRuntime.c
(native/vm/java_lang_Runtime.h): Removed.
(finalizeOnExit): Added.
(exit): Likewise.
(freeMemory): Likewise.
(totalMemory): Likewise.
(gc): Likewise.
(runFinalizersOnExit): Likewise.
(nativeLoad): Likewise.

* src/native/vm/sun/jvm.c (native/vm/java_lang_Runtime.h): Removed.
(JVM_StartThread): Implemented directly.
(JVM_SetThreadPriority): Likewise.
(JVM_Sleep): Likewise.
(JVM_IsInterrupted): Likewise.

16 years ago* m4/annotations.m4 (AC_CHECK_ENABLE_ANNOTATIONS): Changed default
Christian Thalinger [Sat, 9 Feb 2008 15:49:48 +0000 (16:49 +0100)]
* m4/annotations.m4 (AC_CHECK_ENABLE_ANNOTATIONS): Changed default
value for different configurations.
(AC_CHECK_ENABLE_ANNOTATIONS_DEFAULT): New function.

16 years ago* m4/jni.m4 (AC_CHECK_ENABLE_JNI): Changed the comment for the default
Christian Thalinger [Sat, 9 Feb 2008 15:08:58 +0000 (16:08 +0100)]
* m4/jni.m4 (AC_CHECK_ENABLE_JNI): Changed the comment for the default
value.

16 years ago* src/vmcore/loader.h (classbuffer): Use stdint data types.
Christian Thalinger [Sat, 9 Feb 2008 14:41:25 +0000 (15:41 +0100)]
* src/vmcore/loader.h (classbuffer): Use stdint data types.

16 years ago* src/threads/native/threads.c (threads_sigsuspend_handler):
Christian Thalinger [Sat, 9 Feb 2008 14:26:57 +0000 (15:26 +0100)]
* src/threads/native/threads.c (threads_sigsuspend_handler):
Commented.

16 years ago* src/vmcore/options.c [HAVE_STRING_H] (string.h): Removed.
Christian Thalinger [Sat, 9 Feb 2008 14:26:05 +0000 (15:26 +0100)]
* src/vmcore/options.c [HAVE_STRING_H] (string.h): Removed.
(vmcore/system.h): Added.
(options_get): Use system_* functions.
(options_xxusage): Likewise.

16 years ago* src/native/jni.c (_Jv_JNI_NewLocalRef): Fixed compiler warning.
Christian Thalinger [Sat, 9 Feb 2008 14:24:48 +0000 (15:24 +0100)]
* src/native/jni.c (_Jv_JNI_NewLocalRef): Fixed compiler warning.
(_Jv_JNI_GetObjectField): Likewise.
(_Jv_JNI_GetStaticObjectField): Likewise.
(_Jv_JNI_GetDirectBufferAddress): Likewise.

16 years ago* src/mm/memory.c (memory_thread): Fixed compiler warning.
Christian Thalinger [Sat, 9 Feb 2008 14:23:04 +0000 (15:23 +0100)]
* src/mm/memory.c (memory_thread): Fixed compiler warning.

16 years ago* m4/ac_prog_javac.m4 (AC_PROG_JAVAC): Removed jikes and
Christian Thalinger [Sat, 9 Feb 2008 12:25:59 +0000 (13:25 +0100)]
* m4/ac_prog_javac.m4 (AC_PROG_JAVAC): Removed jikes and
-bootclasspath.

* src/lib/Makefile.am (BOOTCLASSPATH): Added.

* tests/regression/Makefile.am (BOOTCLASSPATH): Likewise.
(JAVACMD): Likewise.
(JAVACCMD): Likewise.

* tests/regression/assertion/Makefile.am: Likewise.
* tests/regression/codepatching/Makefile.am: Likewise.
* tests/regression/native/Makefile.am: Likewise.

16 years ago* configure.ac (AC_CONFIG_FILES): Removed resolving.
Christian Thalinger [Fri, 8 Feb 2008 15:19:59 +0000 (16:19 +0100)]
* configure.ac (AC_CONFIG_FILES): Removed resolving.

16 years ago* src/vm/string.c (literalstring_free): Commented out, since it's
Christian Thalinger [Fri, 8 Feb 2008 15:16:18 +0000 (16:16 +0100)]
* src/vm/string.c (literalstring_free): Commented out, since it's
currently not used.

16 years ago* configure.ac (AC_CHECK_FUNCS): Added strlen.
Christian Thalinger [Fri, 8 Feb 2008 15:04:48 +0000 (16:04 +0100)]
* configure.ac (AC_CHECK_FUNCS): Added strlen.

* src/vm/assertion.c [HAVE_STRING_H] (string.h): Removed.
(vmcore/system.h): Added.
(assertion_ea_da): Use system_* functions. Fixed crash: use
list_add_last_unsynced instead of list_add_last.

* src/vmcore/system.h (system_strdup): New function.
(system_strlen): Likewise.

16 years ago* src/vm/jit/arm/Makefile.am (libarch_la_SOURCES): Added md.h.
Christian Thalinger [Fri, 8 Feb 2008 14:34:07 +0000 (15:34 +0100)]
* src/vm/jit/arm/Makefile.am (libarch_la_SOURCES): Added md.h.

* src/vm/jit/i386/Makefile.am,
src/vm/jit/m68k/Makefile.am,
src/vm/jit/mips/Makefile.am,
src/vm/jit/powerpc/Makefile.am,
src/vm/jit/powerpc64/Makefile.am,
src/vm/jit/s390/Makefile.am,
src/vm/jit/sparc64/Makefile.am,
src/vm/jit/x86_64/Makefile.am: Likewise.

16 years ago* src/vm/jit/intrp/Makefile.am ($(BUILT_SOURCES)): Use $(SHELL) to
Christian Thalinger [Fri, 8 Feb 2008 14:33:05 +0000 (15:33 +0100)]
* src/vm/jit/intrp/Makefile.am ($(BUILT_SOURCES)): Use $(SHELL) to
call vmgenx.

16 years ago* tests/regression/native/Makefile.am (JAVAHFLAGS): Added.
Christian Thalinger [Fri, 8 Feb 2008 13:43:03 +0000 (14:43 +0100)]
* tests/regression/native/Makefile.am (JAVAHFLAGS): Added.

16 years ago* src/vm/vm.c (vm_call_method_objectarray): Fixed compiler warning.
Christian Thalinger [Fri, 8 Feb 2008 13:35:01 +0000 (14:35 +0100)]
* src/vm/vm.c (vm_call_method_objectarray): Fixed compiler warning.

16 years ago* src/threads/native/lock.c: Fixed copyright message.
Stefan Ring [Thu, 7 Feb 2008 10:23:38 +0000 (11:23 +0100)]
* src/threads/native/lock.c: Fixed copyright message.

* src/threads/native/lock.h,
src/threads/native/threads.c,
src/threads/native/threads.h,
src/threads/threads-common.c,
src/threads/threads-common.h: Likewise.

16 years ago* src/threads/native/lock.c (notify_flc_waiters): Another deadlock fix.
Stefan Ring [Thu, 7 Feb 2008 00:30:04 +0000 (01:30 +0100)]
* src/threads/native/lock.c (notify_flc_waiters): Another deadlock fix.

16 years ago* src/threads/native/lock.c (lock_monitor_wait, lock_monitor_notify):
Stefan Ring [Wed, 6 Feb 2008 21:28:09 +0000 (22:28 +0100)]
* src/threads/native/lock.c (lock_monitor_wait, lock_monitor_notify):
Bugfix for previous commit, could cause threads to hang forever.

16 years ago* src/threads/native/lock.c: Implemented Sable extension to tasuki lock.
Stefan Ring [Wed, 6 Feb 2008 17:46:34 +0000 (18:46 +0100)]
* src/threads/native/lock.c: Implemented Sable extension to tasuki lock.
* src/threads/native/threads.c: Likewise.
* src/threads/native/threads.h: Likewise.

* src/vm/global.h: Removed hdrflags.

16 years agoMerge (tasuki lock modification backout)
Stefan Ring [Wed, 6 Feb 2008 17:21:04 +0000 (18:21 +0100)]
Merge (tasuki lock modification backout)

16 years agoBacked out changeset 9c85e9af47c9
Stefan Ring [Wed, 6 Feb 2008 15:43:20 +0000 (16:43 +0100)]
Backed out changeset 9c85e9af47c9

--HG--
branch : stefan

16 years ago* src/cacaoh/dummy.c (vm/exceptions.h): Added.
Christian Thalinger [Tue, 5 Feb 2008 21:25:02 +0000 (22:25 +0100)]
* src/cacaoh/dummy.c (vm/exceptions.h): Added.
(exceptions_throw_incompatibleclasschangeerror): Fixed signature.
(exceptions_throw_verifyerror): Likewise.
(exceptions_throw_unsupportedclassversionerror): Likewise.

16 years ago* src/vm/jit/codegen-common.c (codegen_reg_of_var): Removed unused
Christian Thalinger [Tue, 5 Feb 2008 20:01:37 +0000 (21:01 +0100)]
* src/vm/jit/codegen-common.c (codegen_reg_of_var): Removed unused
conditional move code. This will not be implemented in the baseline
compiler.
* src/vm/jit/x86_64/emit.c (emit_store): Likewise.

16 years ago* tests/regression/TestAnnotations.java: Fixed copyright header.
Christian Thalinger [Tue, 5 Feb 2008 10:39:23 +0000 (11:39 +0100)]
* tests/regression/TestAnnotations.java: Fixed copyright header.

16 years ago* configure.ac (AC_CONFIG_FILES): Added tests/regression/assertion/Makefile
Gregor Kaufmann [Mon, 4 Feb 2008 17:59:52 +0000 (18:59 +0100)]
* configure.ac (AC_CONFIG_FILES): Added tests/regression/assertion/Makefile

* src/vm/vm.c (opts): Added OPT_EA_NOARG, OPT_EA_NOARG
(vm_create): Handle OPT_EA_NOARG, OPT_EA_NOARG

* tests/regression/Makefile.am (SUBDIRS): Added assertion

* tests/regression/assertion/Makefile.a: New file

* tests/regression/assertion/Test.sh: New file

* tests/regression/assertion/disabled.output: New file

* tests/regression/assertion/enabled.output: New file

* tests/regression/assertion/packagetest/testassertions.java: New file

* tests/regression/assertion/testassertions.java: New file

16 years ago* m4/annotations.m4: Build annotations support by default.
Christian Thalinger [Mon, 4 Feb 2008 16:50:22 +0000 (17:50 +0100)]
* m4/annotations.m4: Build annotations support by default.

16 years ago* src/mm/cacao-gc/gc.c (gc_collect) [!NDEBUG]: Fixed compilation.
Christian Thalinger [Mon, 4 Feb 2008 16:37:35 +0000 (17:37 +0100)]
* src/mm/cacao-gc/gc.c (gc_collect) [!NDEBUG]: Fixed compilation.

16 years ago* Merged with 9c85e9af47c9.
Christian Thalinger [Mon, 4 Feb 2008 10:41:52 +0000 (11:41 +0100)]
* Merged with 9c85e9af47c9.

16 years ago* src/threads/native/lock.c: Modified tasuki lock such that the FLC bit
Stefan Ring [Sun, 3 Feb 2008 20:28:26 +0000 (21:28 +0100)]
* src/threads/native/lock.c: Modified tasuki lock such that the FLC bit
can be placed in the lockword. Requires atomic instruction at
monitor_exit (slower!).

* src/vm/global.h: Removed useless hdrflags and FLC bit value.

--HG--
branch : stefan

16 years ago* src/vm/jit/i386/machine-instr.h (MEMORY_BARRIER_AFTER_ATOMIC): Can
Stefan Ring [Sat, 2 Feb 2008 21:35:25 +0000 (22:35 +0100)]
* src/vm/jit/i386/machine-instr.h (MEMORY_BARRIER_AFTER_ATOMIC): Can
become a real NOP.
(MEMORY_BARRIER_BEFORE_ATOMIC): Likewise.

* src/vm/jit/x86_64/machine-instr.h (MEMORY_BARRIER_AFTER_ATOMIC): Can
become a real NOP.
(MEMORY_BARRIER_BEFORE_ATOMIC): Likewise.

16 years ago* src/vm/signal.c (signal_init): Disable CrashReporter on Darwin.
Stefan Ring [Sat, 2 Feb 2008 19:01:10 +0000 (20:01 +0100)]
* src/vm/signal.c (signal_init): Disable CrashReporter on Darwin.

16 years ago* src/threads/native/lock.c (lock_monitor_enter): Adjusted memory
Stefan Ring [Fri, 1 Feb 2008 17:01:06 +0000 (18:01 +0100)]
* src/threads/native/lock.c (lock_monitor_enter): Adjusted memory
barrier.
(lock_monitor_exit): Likewise.

16 years ago* src/native/vm/sun/jvm.c (native/vm/java_lang_ClassLoader.h):
Christian Thalinger [Wed, 30 Jan 2008 16:45:11 +0000 (17:45 +0100)]
* src/native/vm/sun/jvm.c (native/vm/java_lang_ClassLoader.h):
Removed.

16 years ago* src/native/vm/java_lang_ClassLoader.c: Removed.
Christian Thalinger [Wed, 30 Jan 2008 16:43:41 +0000 (17:43 +0100)]
* src/native/vm/java_lang_ClassLoader.c: Removed.
* src/native/vm/java_lang_ClassLoader.h: Likewise.

* src/native/vm/Makefile.am (CLASSLOADER_SOURCES): Removed.
(libnativevm_la_SOURCES): Removed CLASSLOADER_SOURCES.

* src/native/jni.c [ENABLE_JAVASE]
(native/vm/java_lang_ClassLoader.h): Removed.

* src/native/vm/gnu/java_lang_VMClassLoader.c
(native/vm/java_lang_ClassLoader.h): Removed.
(defineClass): Moved implementation here.

16 years ago* src/native/vm/sun/jvm.c (JVM_DefineClassWithSource): Made data
Christian Thalinger [Wed, 30 Jan 2008 16:41:13 +0000 (17:41 +0100)]
* src/native/vm/sun/jvm.c (JVM_DefineClassWithSource): Made data
argument non-const.

16 years ago* src/vmcore/class.c (class_define): Made data argument non-const.
Christian Thalinger [Wed, 30 Jan 2008 16:27:59 +0000 (17:27 +0100)]
* src/vmcore/class.c (class_define): Made data argument non-const.
* src/vmcore/class.h: Likewise.
* src/native/jni.c (_Jv_JNI_DefineClass): Likewise.
* src/native/vm/java_lang_ClassLoader.c (defineClass): Likewise.
* src/native/vm/sun_misc_Unsafe.c (defineClass): Likewise.

16 years ago* src/vm/properties.c (properties_set): Use system_access.
Christian Thalinger [Wed, 30 Jan 2008 16:16:28 +0000 (17:16 +0100)]
* src/vm/properties.c (properties_set): Use system_access.
* src/vmcore/system.h (system_access): New function.

16 years ago* configure.ac (AC_CHECK_FUNCS): Added fclose, fread, stat.
Christian Thalinger [Wed, 30 Jan 2008 16:07:15 +0000 (17:07 +0100)]
* configure.ac (AC_CHECK_FUNCS): Added fclose, fread, stat.

* src/vmcore/suck.c (dirent.h): Removed.
(sys/stat.h): Likewise.
(vmcore/system.h): Added.
(suck_add_from_property): Use system_scandir.
(suck_start): Use system_fopen, system_stat, system_fread,
system_fclose.

* src/vmcore/system.h [HAVE_DIRENT_H] (dirent.h): Added.
[HAVE_STDIO_H] (stdio.h): Likewise.
[HAVE_SYS_STAT_H] (sys/stat.h): Likewise.
(system_fopen): New function.
(system_fclose): Likewise.
(system_fread): Likewise.
(system_scandir): Likewise.
(system_stat): Likewise.

16 years ago* src/vm/properties.c [WITH_JRE_LAYOUT] (libgen.h): Removed.
Christian Thalinger [Wed, 30 Jan 2008 15:44:43 +0000 (16:44 +0100)]
* src/vm/properties.c [WITH_JRE_LAYOUT] (libgen.h): Removed.
(vmcore/system.h): Added.
(properties_set): Use system_dirname.

* src/vmcore/system.h [WITH_JRE_LAYOUT && HAVE_LIBGEN_H] (libgen.h):
Added.
[WITH_JRE_LAYOUT] (system_dirname): New function.

16 years ago* src/native/jni.c: Pre-define java_lang_ClassLoader to prevent a
Christian Thalinger [Wed, 30 Jan 2008 15:39:46 +0000 (16:39 +0100)]
* src/native/jni.c: Pre-define java_lang_ClassLoader to prevent a
compiler warning for Sun configurations.

16 years ago* src/mm/cacao-gc/gc.c: Fixed copyright message.
Christian Thalinger [Wed, 30 Jan 2008 12:29:04 +0000 (13:29 +0100)]
* src/mm/cacao-gc/gc.c: Fixed copyright message.

* src/native/native.c,
src/native/vm/gnu/java_lang_VMRuntime.c,
src/vm/builtin.c,
src/vm/jit/intrp/codegen.c,
src/vm/jit/jit.c,
src/vm/jit/optimizing/ssa.c,
src/vm/jit/optimizing/ssa_rename.c,
src/vm/jit/patcher-common.c,
src/vm/jit/replace.c,
src/vm/jit/show.c,
src/vm/jit/trace.c,
src/vm/vm.c,
src/vmcore/class.c,
tests/regression/Makefile.am: Likewise.

16 years ago* Merged with 0da121c758b9.
Christian Thalinger [Wed, 30 Jan 2008 12:25:13 +0000 (13:25 +0100)]
* Merged with 0da121c758b9.

16 years ago* src/native/vm/sun/jvm.c (JVM_EEXIST): Defined.
Christian Thalinger [Tue, 29 Jan 2008 22:43:14 +0000 (23:43 +0100)]
* src/native/vm/sun/jvm.c (JVM_EEXIST): Defined.
(JVM_Open): Implemented correctly.

16 years ago* src/vm/properties.c (properties_set) [WITH_JRE_LAYOUT]: Set
Christian Thalinger [Tue, 29 Jan 2008 10:28:53 +0000 (11:28 +0100)]
* src/vm/properties.c (properties_set) [WITH_JRE_LAYOUT]: Set
java.home as HotSpot does, applications like Ant depend on it.

16 years ago* src/vm/jit/stacktrace.c (native/include/java_lang_Object.h): Added.
Christian Thalinger [Fri, 25 Jan 2008 12:02:05 +0000 (13:02 +0100)]
* src/vm/jit/stacktrace.c (native/include/java_lang_Object.h): Added.
[WITH_CLASSPATH_GNU] (native/include/gnu_classpath_Pointer.h):
Likewise.
(stacktrace_print_exception): Fixed compiler warning.

16 years ago* src/vm/jit/codegen-common.c (codegen_start_native_call): Fixed
Christian Thalinger [Fri, 25 Jan 2008 12:00:55 +0000 (13:00 +0100)]
* src/vm/jit/codegen-common.c (codegen_start_native_call): Fixed
compiler warning.