edwin [Wed, 3 May 2006 22:46:39 +0000 (22:46 +0000)]
* src/threads/native/threads.c (setPriority): Renamed to
threads_set_thread_priority.
(removeFromWaiters): Renamed to threads_remove_waiter.
(timespec_less): Renamed to threads_timespec_earlier.
(timeIsEarlier): Renamed to threads_current_time_is_earlier_than.
(waitWithTimeout): Renamed to threads_wait_with_timeout. Removed unused
argument `lr`.
(thread_sleep): There is no need to create a lock record for
calling threads_wait_with_timeout, as that does not use the
lock record anyway (formerly waitWithTimeout).
(various function): Lots of documentation and cleanup.
twisti [Tue, 2 May 2006 16:16:04 +0000 (16:16 +0000)]
* src/vm/jit/stack.c (stack_analyse): Check for val.a == NULL on
SUPPORT_CONST_STORE_ZERO_ONLY architectures for ICMD_PUTSTATIC and
ICMD_PUTFIELD.
edwin [Mon, 1 May 2006 23:14:42 +0000 (23:14 +0000)]
* src/threads/native/threads.c: Cleanup and documentation.
edwin [Mon, 1 May 2006 21:40:38 +0000 (21:40 +0000)]
* src/threads/native/threads.h (threads_sem_init): New function.
(threads_sem_post): New function.
* src/threads/native/threads.c (threads_sem_init): New function.
(threads_sem_wait): Added assertion.
(threads_sem_post): New function.
(various function): Use threads_sem_init and threads_sem_post.
* src/native/jvmti/cacaodbg.c (getworkingdatalock): Use threads_sem_post.
(cacaodbgfork): Use threads_sem_init.
* src/native/jvmti/cacaodbgserver.c (contchild, waitloop).
Use threads_sem_post.
edwin [Mon, 1 May 2006 12:40:18 +0000 (12:40 +0000)]
* src/threads/native/threads.c (threads_sem_wait): New function.
This function performs a non-interruptible sem_wait. This fixes
segfaults and deadlocks that resulted from sem_wait calls returning
prematurely.
(cast_stopworld): Use threads_sem_wait.
(threads_startup_thread): Likewise.
(threads_start_thread): Likewise.
(queueOnLockRecord): Likewise.
* src/threads/native/threads.h (threads_sem_wait): New function.
* src/native/jvmti/cacaodbg.c (msgqsendevent): Use threads_sem_wait
instead of sem_wait.
* src/native/jvmti/cacaodbgserver.c (contchild, waitloop): Use
threads_sem_wait instead of sem_wait.
twisti [Sun, 30 Apr 2006 17:18:02 +0000 (17:18 +0000)]
* configure.ac (AC_CONFIG_FILES): Added src/scripts/jarsigner.
* src/scripts/Makefile.am (bin_SCRIPTS): Added jarsigner.
* src/scripts/.cvsignore: Likewise.
* src/scripts/jarsigner.in: New file.
edwin [Sun, 30 Apr 2006 16:17:44 +0000 (16:17 +0000)]
* src/vm/resolve.c (resolve_method_verifier_checks)
(constrain_unresolved_method): Use ICMD_ACONST_CLASSREF_OR_CLASSINFO.
* src/vm/jit/powerpc/codegen.c, src/vm/jit/alpha/codegen.c,
src/vm/jit/mips/codegen.c, src/vm/jit/i386/codegen.c,
src/vm/jit/intrp/codegen.c, src/vm/jit/x86_64/codegen.c
(codegen): Changes for new ACONST format.
* src/vm/jit/stack.c (stack_analyse): Changes for new ACONST format.
* src/vm/jit/verify/typecheck.c (verify_invocation): Use the new macros.
(verify_builtin, verify_multianewarray, verify_basic_block): Changes for
new ACONST format.
* src/vm/jit/verify/typeinfo.h (TYPEINFO_INIT_JAVA_LANG_CLASS): Take
a classref_or_classinfo as argument.
* src/vm/jit/verify/typeinfo.c (typeinfo_init_class): Typo fixed.
(typeinfo_print): Changes for new ACONST format.
* src/vm/jit/inline/inline.c (inline_write_exception_handlers):
Changes for new ACONST format.
* src/vm/jit/parse.c (parse): Changes for new ACONST format.
* src/vm/jit/parse.h (LOADCONST_A_CLASS): Removed.
(LOADCONST_A_BUILTIN): Changes for new ACONST format.
* src/vm/jit/jit.h (INSTRUCTION_IS_RESOLVED, INSTRUCTION_IS_UNRESOLVED):
Only check least significant bit of target (provisory flag).
(ICMD_ACONST_IS_CLASS, ICMD_ACONST_CLASSREF_OR_CLASSINFO)
(ICMD_ACONST_RESOLVED_CLASSINFO, ICMD_ACONST_UNRESOLVED_CLASSREF): New macros.
edwin [Sun, 30 Apr 2006 15:58:53 +0000 (15:58 +0000)]
* src/vm/jit/loop/tracing.c (tracing): Adapted to new format of INVOKE
instructions.
* src/vm/jit/allocator/lsra.c (lsra_scan_registers_canditates)
(_test_lifetimes): Likewise.
edwin [Fri, 28 Apr 2006 12:25:27 +0000 (12:25 +0000)]
* src/vm/jit/parse.c (parse): Added a comment.
twisti [Fri, 28 Apr 2006 12:24:40 +0000 (12:24 +0000)]
* src/vm/jit/stack.c (stack_analyse): We need to split AASTORECONST
and PUT{STATIC,FIELD}CONST as they can store different values. I hope
the checks are correct now (until we get our new instruction
format). Edwin: Hint! Hint! Hint!
(stack_show_icmd): Again a smaller change.
twisti [Fri, 28 Apr 2006 11:50:06 +0000 (11:50 +0000)]
* src/vm/jit/stack.c (stack_analyse): Check for
{AASTORE,PUTSTATIC,PUTFIELD}CONST if the instruction is resolved. We
don't have a patcher for that case.
(stack_show_icmd): Smaller change.
twisti [Fri, 28 Apr 2006 11:37:33 +0000 (11:37 +0000)]
* tests/regression/codepatching/test.java: Added new test.
* tests/regression/codepatching/Makefile.am: Files updated.
* tests/regression/codepatching/putfieldconstIF.java,
tests/regression/codepatching/putfieldconstJDL.java: Removed.
* tests/regression/codepatching/putstaticconstJ.java,
tests/regression/codepatching/putstaticconstL.java,
tests/regression/codepatching/putfieldconstD.java,
tests/regression/codepatching/putfieldconstF.java,
tests/regression/codepatching/putstaticconstC.java,
tests/regression/codepatching/putfieldconstJ.java,
tests/regression/codepatching/putfieldconstL.java,
tests/regression/codepatching/putstaticconstI.java,
tests/regression/codepatching/putfieldconstC.java,
tests/regression/codepatching/putstaticconstD.java,
tests/regression/codepatching/putfieldconstI.java,
tests/regression/codepatching/putstaticconstF.java: New file.
edwin [Fri, 28 Apr 2006 11:24:39 +0000 (11:24 +0000)]
* src/vm/resolve.c (resolve_method_lazy): Turn INVOKEVIRTUAL into
INVOKESPECIAL for monomorphic calls.
edwin [Fri, 28 Apr 2006 00:46:39 +0000 (00:46 +0000)]
* src/vm/jit/intrp/asmpart.c (intrp_asm_vm_call_method_int): Fix build
errors. TWISTI, please review these changes.
edwin [Fri, 28 Apr 2006 00:31:10 +0000 (00:31 +0000)]
* regression/codepatching/test.java: Added test for AASTORECONST
with unresolved class constant. Currently exposes a bug when test.java is
compiled with -target 1.5.
* regression/codepatching/aastoreconstClass.java: New file.
twisti [Thu, 27 Apr 2006 23:03:37 +0000 (23:03 +0000)]
* src/vm/jit/stacktrace.h (STACKFRAMEINFO): Added parenthesis.
* src/vm/global.h (java_objectheader): Changed type of monitorPtr to
monitorLockRecord.
* src/vm/vm.h (vm_arg): Added union.
* src/vm/vm.c (vm_vmargs_from_valist): Use union of vm_arg's data.
* src/native/jni.c (_Jv_jni_vmargs_from_objectarray): Likewise.
* src/threads/native/threads.h (nativethread): Changed type of
_stackframeinfo to stackframeinfo*.
* src/threads/native/threads.c (monitorEnter): Cast compare_and_swap
return value correctly.
twisti [Thu, 27 Apr 2006 12:33:20 +0000 (12:33 +0000)]
* src/vm/jit/x86_64/emit.c: Changed x86_64 function prefix to
emit. And some other stuff too.
* src/vm/jit/x86_64/md-emit.h: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.
* src/vm/jit/x86_64/codegen.h: Likewise.
twisti [Thu, 27 Apr 2006 11:05:03 +0000 (11:05 +0000)]
* src/native/vm/VMSystemProperties.c (preInit): Append "/jre" to
java.home property, as all JDKs and JREs do that. Fixed a problem with
jonas testsuite. General cleanup.
twisti [Thu, 27 Apr 2006 10:32:27 +0000 (10:32 +0000)]
* src/vm/jit/powerpc/darwin/md-asm.h (jit_asm_compile): Renamed from
jit_compile.
* src/vm/jit/powerpc/asmpart.S: Likewise.
edwin [Wed, 26 Apr 2006 15:44:07 +0000 (15:44 +0000)]
* src/vm/jit/stacktrace.c (stacktrace_getClassContext): Reverted the
hack that removes the first entry if this function is called by
java.lang.SecurityManager. This (undocumented) hack probably was done
to solve a problem that no longer exists.
twisti [Wed, 26 Apr 2006 14:09:15 +0000 (14:09 +0000)]
* src/vm/jit/i386/Makefile.am (libarch_la_SOURCES): Removed
emitfuncs.c, emitfuncs.h and added emit.c, md-emit.h.
* src/vm/jit/i386/emit.c (emit_load_s1): New method.
(emit_load_s2): Likewise.
(emit_load_s3): Likewise.
(emit_store): Likewise.
(emit_copy): Likewise.
* src/vm/jit/i386/codegen.c (codegen): Use emit_load/store functions
instead of macros.
* src/vm/jit/i386/codegen.h (M_LNGMOVE): Added.
(M_LNGMEMMOVE): Removed.
(var_to_reg_int): Removed.
(var_to_reg_lng): Likewise.
(var_to_reg_flt): Likewise.
(store_reg_to_var_int): Likewise.
(store_reg_to_var_lng): Likewise.
(store_reg_to_var_flt): Likewise.
(M_FLD): Added.
(M_DLD): Likewise.
(M_FLD32): Likewise.
(M_DLD32): Likewise.
(M_FST): Likewise.
(M_DST): Likewise.
twisti [Wed, 26 Apr 2006 11:02:51 +0000 (11:02 +0000)]
* src/vm/jit/i386/md-emit.h: Moved from src/vm/jit/i386/emitfuncs.h.
--HG--
rename : src/vm/jit/i386/emitfuncs.h => src/vm/jit/i386/md-emit.h
twisti [Wed, 26 Apr 2006 11:02:20 +0000 (11:02 +0000)]
* src/vm/jit/i386/emit.c: Moved from src/vm/jit/i386/emitfuncs.c.
--HG--
rename : src/vm/jit/i386/emitfuncs.c => src/vm/jit/i386/emit.c
twisti [Wed, 26 Apr 2006 09:02:39 +0000 (09:02 +0000)]
* configure.ac (AC_CONFIG_FILES): Added src/scripts/rmic.
* src/scripts/Makefile.am (bin_SCRIPTS): Added rmic.
* src/scripts/java.in: Use ${1+"$@"} instead of $@.
* src/scripts/rmiregistry.in: Likewise.
* src/scripts/rmic.in: Updated to new rmic location.
twisti [Wed, 26 Apr 2006 08:57:01 +0000 (08:57 +0000)]
* m4/ac_prog_javac.m4: Default to ecj.
* src/lib/Makefile.am: If JAVAC is ecj, use the -1.5 flag. This
produces much faster code regarding class$ (e.g. jonas startup time).
edwin [Tue, 25 Apr 2006 18:02:15 +0000 (18:02 +0000)]
* src/vm/jit/disass-common.c (disass_printf): Avoid compiler warning.
* src/vm/jit/profile/profile.c (profile_printstats): Avoid compiler warnings.
edwin [Tue, 25 Apr 2006 17:57:56 +0000 (17:57 +0000)]
* src/vm/jit/i386/disass.c (disassinstr): Avoid compiler warning.
edwin [Tue, 25 Apr 2006 17:53:54 +0000 (17:53 +0000)]
* src/vm/jit/stack.c (stack_show_icmd): Removed unused variable `um`.
edwin [Tue, 25 Apr 2006 17:48:18 +0000 (17:48 +0000)]
* src/vm/loader.c (load_method): Simplify initialization of methodinfo by
clearing it explicitely in load_class_from_classbuffer, instead of zeroing
individual fields here.
(load_class_from_classbuffer): MZERO methodinfo array.
(load_newly_created_array): Initialize `params` to NULL for the clone method.
edwin [Tue, 25 Apr 2006 17:45:02 +0000 (17:45 +0000)]
* src/mm/memory.h (MZERO): Added macro MZERO for convenient memory cleaning.
edwin [Tue, 25 Apr 2006 17:42:08 +0000 (17:42 +0000)]
* src/native/vm/VMSystemProperties.c
(Java_gnu_classpath_VMSystemProperties_preInit): Use strcpy instead of
strcat, since there is nothing to concat to and we may want to lift the
assertion that MSET clears memory.
edwin [Tue, 25 Apr 2006 15:46:06 +0000 (15:46 +0000)]
* src/vm/jit/i386/md.c (md_get_method_patch_address): Avoid compiler warning.
edwin [Tue, 25 Apr 2006 15:31:17 +0000 (15:31 +0000)]
* src/cacao/cacao.c (main): Avoid warning about unused label.
Cleaned up whitespace.
edwin [Tue, 25 Apr 2006 15:26:55 +0000 (15:26 +0000)]
* src/vm/exceptions.c (exceptions_throw_verifyerror_for_stack): Avoid
compiler warning.
edwin [Tue, 25 Apr 2006 12:35:15 +0000 (12:35 +0000)]
* src/vm/jit/verify/typecheck.c (typecheckverbose): Renamed to
opt_typecheckverbose.
* src/vm/jit/verify/typeinfo.h: Likewise.
* src/vm/vm.c (OPT_VERBOSETC): Only define if both ENABLE_VERIFIER
and TYPECHECK_VERBOSE are defined.
(typecheckverbose): Renamed to opt_typecheckverbose.
edwin [Tue, 25 Apr 2006 12:25:43 +0000 (12:25 +0000)]
* src/vm/options.h, src/vm/options.c (getloadingtime): Renamed to
opt_getloadingtime. Only defined for ENABLE_STATISTICS.
(getcompilingtime): Renamed to opt_getcompilingtime.
Only defined for ENABLE_STATISTICS.
* src/vm/loader.c (getloadingtime, getcompilingtime): Renamed.
* src/vm/jit/jit.c: Likewise.
* src/vm/linker.c: Likewise.
* src/native/vm/VMClassLoader.c: Likewise.
* src/vm/vm.c (OPT_TIME): Only defined for ENABLE_STATISTICS.
* configure.ac (--enable-statistics): Now statistics are disabled by
default.
edwin [Tue, 25 Apr 2006 12:00:58 +0000 (12:00 +0000)]
* src/vm/options.h (opt_verify): Only declare for ENABLE_VERIFIER.
(opt_liberalutf): Removed.
* src/vm/options.c (opt_verify): Only declare for ENABLE_VERIFIER.
(opt_liberalutf): Removed.
* src/vm/jit/inline/inline.c (test_inlining): Only verify if ENABLE_VERIFIER.
* src/vm/jit/parse.c (parse): Only check opt_verify if ENABLE_VERIFIER.
* src/vm/global.h (ENABLE_VERIFIER): Removed. This is now defined in
config.h.
* src/vm/vm.c (OPT_NOVERIFY): Only define this option if ENABLE_VERIFIER.
(OPT_LIBERALUTF): Removed.
* configure.ac (--disable-verifier): Added configure option.
* src/vm/jit/stacktrace.c (stacktrace_getStack): Gather a wider range
for the cycle count statistics.
edwin [Tue, 25 Apr 2006 10:36:43 +0000 (10:36 +0000)]
* src/vm/cycles-stats.h (CYCLES_STATS_COUNT_OVER): Added.
edwin [Mon, 24 Apr 2006 18:28:43 +0000 (18:28 +0000)]
* src/vm/cycles-stats.c: Cleaned up whitespace.
edwin [Mon, 24 Apr 2006 18:22:37 +0000 (18:22 +0000)]
* src/vm/cycles-stats.c (cycles_stats_print_percentile): Also perform
measurement overhead compensation for cumulated cycle counts.
edwin [Mon, 24 Apr 2006 17:16:45 +0000 (17:16 +0000)]
* src/vm/global.h (ACC_CLASS_REFLECT_MASK): Added.
(ACC_CLASS_HAS_POINTERS): Likewise.
(vim boilerplate): Added.
* src/vm/loader.c (load_field): Set ACC_CLASS_HAS_POINTERS flag.
* src/vm/linker.c (link_class_intern): OR ACC_CLASS_HAS_POINTERS flag.
* src/vm/builtin.c (builtin_new): Use ACC_CLASS_HAS_POINTERS to determine
which kind of memory to allocate.
* src/native/vm/VMClass.c (Java_java_lang_VMClass_getModifiers): Mask
reported access flags with ACC_CLASS_REFLECT_MASK.
twisti [Mon, 24 Apr 2006 16:24:49 +0000 (16:24 +0000)]
* src/vm/jit/x86_64/emit.c (x86_64_emit_ifcc): Changed signature of
codegen_addreference.
(x86_64_emit_if_lcc): Likewise.
(x86_64_emit_if_icmpcc): Likewise.
(x86_64_emit_if_lcmpcc): Likewise.
twisti [Mon, 24 Apr 2006 16:10:59 +0000 (16:10 +0000)]
* src/vm/jit/i386/codegen.c (codegen): Don't initialize mcode
variables. New dseg_addlinenumber signature fix.
(createnativestub): Don't initialize mcode variables.
twisti [Mon, 24 Apr 2006 16:06:16 +0000 (16:06 +0000)]
* src/vm/jit/codegen-common.c (codegen_increase): Changed signature.
(codegen_addreference): Likewise.
(codegen_add_exception_ref): Likewise.
(codegen_add_arithmeticexception_ref): Likewise.
(codegen_add_arrayindexoutofboundsexception_ref): Likewise.
(codegen_add_arraystoreexception_ref): Likewise.
(codegen_add_classcastexception_ref): Likewise.
(codegen_add_nullpointerexception_ref): Likewise.
(codegen_add_fillinstacktrace_ref): Likewise.
(codegen_addpatchref): Likewise.
(codegen_finish): Likewise.
* src/vm/jit/codegen-common.h: Likewise.
* src/vm/jit/dseg.c (dseg_increase): Made static.
(dseg_adds4): Use dseg_increase.
(dseg_adds8): Likewise.
(dseg_addfloat): Likewise.
(dseg_adddouble): Likewise.
(dseg_adds4_increase): Removed.
(dseg_adds8_increase): Likewise.
(dseg_addfloat_increase): Likewise.
(dseg_adddouble_increase): Likewise.
(dseg_addlinenumber): Changed signature.
(dseg_addlinenumber_inline_start): Likewise.
(dseg_adddata): Likewise.
* src/vm/jit/dseg.h: Likewise.
* src/vm/jit/alpha/emit.c (vm/jit/alpha/emit.h): Removed.
(vm/jit/emit.h): Added.
(emit_lconst): New method.
* src/vm/jit/alpha/Makefile.am (libarch_la_SOURCES): Added emit.c
* src/vm/jit/alpha/codegen.c (vm/jit/emit.h): Added.
(codegen): Use cd->mcodeptr instead of mcodeptr, and emit_load/store
functions instead of macros. Saves over 50kB object code size. Use new
signatures of codegen-common and dseg functions.
* src/vm/jit/alpha/codegen.h (var_to_reg_int): Removed.
(var_to_reg_flt): Likewise.
(store_reg_to_var_int): Likewise.
(store_reg_to_var_flt): Likewise.
* src/vm/jit/i386/codegen.c: Use new signatures of codegen-common and
dseg functions.
* src/vm/jit/i386/codegen.h: Likewise.
* src/vm/jit/intrp/codegen.c: Likewise.
* src/vm/jit/intrp/codegen.h: Likewise.
* src/vm/jit/mips/codegen.c: Likewise.
* src/vm/jit/mips/codegen.h: Likewise.
* src/vm/jit/powerpc/codegen.c: Likewise.
* src/vm/jit/powerpc/codegen.h: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.
* src/vm/jit/x86_64/codegen.h: Likewise.
edwin [Mon, 24 Apr 2006 15:43:36 +0000 (15:43 +0000)]
* src/vm/jit/stacktrace.c (stacktrace_create): Do not free dump memory here,
this is now done in the parent functions. Also removed the copy to gc memory.
(stacktrace_fillInStackTrace): Copy stacktrace to gc memory.
Free dump memory.
(stacktrace_getClassContext): Free dump memory.
(stacktrace_getCurrentClass): Likewise.
(stacktrace_getStack): Likewise.
(stacktrace_dump_trace): Likewise.
edwin [Mon, 24 Apr 2006 11:40:05 +0000 (11:40 +0000)]
* src/vm/jit/stacktrace.c (stacktrace_fillInStackTrace)
(stacktrace_getClassContext, stacktrace_getCurrentClass)
(stacktrace_getStack): Added cycle count statistics.
(stacktrace_print_cycles_stats): Added.
* src/vm/jit/stacktrace.h (stacktrace_print_cycles_stats): Added.
* src/vm/vm.c (vm_exit_handler): Call stacktrace_print_cycles_stats.
edwin [Mon, 24 Apr 2006 11:36:19 +0000 (11:36 +0000)]
* src/vm/cycles-stats.h (CYCLES_STATS_END_WITH_OVERHEAD): Fix arguments of
empty macro definition.
edwin [Mon, 24 Apr 2006 11:27:43 +0000 (11:27 +0000)]
* src/vm/cycles-stats.h (CYCLES_STATS_DECLARE_AND_START)
(CYCLES_STATS_DECLARE_AND_START_WITH_OVERHEAD)
(CYCLES_STATS_END, CYCLES_STATS_END_WITH_OVERHEAD): Added convenience
macros.
* src/vm/cycles-stats.c (cycles_stats_print): Fixed divide-by-zero. Minor
output changes.
twisti [Mon, 24 Apr 2006 10:08:07 +0000 (10:08 +0000)]
* src/vm/jit/mips/md.c (md_get_method_patch_address): Renamed from
md_assembler_get_patch_address.
* src/vm/jit/mips/asmpart.S (asm_call_jit_compiler): Renamed
md_assembler_get_patch_address to md_get_method_patch_address.
twisti [Mon, 24 Apr 2006 10:00:13 +0000 (10:00 +0000)]
* src/vm/jit/powerpc/md.c (md_get_method_patch_address): New method.
* src/vm/jit/powerpc/asmpart.S (asm_call_jit_compiler): Use new
jit_asm_compile method. This fixes the ecj bugs seens with some mauve
tests and eclipse.
twisti [Mon, 24 Apr 2006 09:58:04 +0000 (09:58 +0000)]
* src/vm/jit/powerpc/codegen.c (codegen): Replaced those ugly
M_TINTMOVE macros. Use M_LLD macros where possible.
* src/vm/jit/powerpc/codegen.h (M_LNGMOVE): Check for equal registers.
(M_TINTMOVE): Removed.
edwin [Mon, 24 Apr 2006 00:19:06 +0000 (00:19 +0000)]
* src/vm/jit/i386/asmpart.S (asm_get_cycle_count): Omit the stackframe.
This saves a couple of cycles of measurement overhead.
twisti [Sun, 23 Apr 2006 23:03:50 +0000 (23:03 +0000)]
* src/vm/jit/alpha/md.c (md_get_method_patch_address): Renamed from
md_assembler_get_patch_address.
* src/vm/jit/alpha/asmpart.S (asm_call_jit_compiler): Renamed
md_assembler_get_patch_address to md_get_method_patch_address.
edwin [Sun, 23 Apr 2006 19:18:38 +0000 (19:18 +0000)]
* src/vm/cycles-stats.c (cycles_stats_print_percentile): Better extrapolation.
* src/vm/cycles-stats.h (CYCLES_STATS_DECLARE, CYCLES_STATS_COUNT)
(CYCLES_STATS_PRINT, CYCLES_STATS_PRINT_OVERHEAD): Added total cycles counter.
edwin [Sun, 23 Apr 2006 19:16:54 +0000 (19:16 +0000)]
* src/vm/builtin.c (builtin_new): Renamed rt-timing identifier.
(builtin_newarray): Added rt-timing.
* src/vm/rt-timing.h: Added rt-timing for builtin_newarray.
* src/vm/rt-timing.c: Likewise.
edwin [Sun, 23 Apr 2006 16:11:41 +0000 (16:11 +0000)]
* src/vm/builtin.c (builtin_print_cycles_stats): Use
CYCLES_STATS_PRINT_OVERHEAD.
* src/vm/cycles-stats.h (CYCLES_STATS_PRINT_OVERHEAD): Added.
* src/vm/cycles-stats.c (cycles_stats_print_percentile): Added.
(cycles_stats_print): Added `overhead` argument and automatic
measurement overhead compensation.
edwin [Sun, 23 Apr 2006 15:39:51 +0000 (15:39 +0000)]
* src/vm/builtin.c (builtin_new): Added rt-timing.
(builtin_print_cycles_stats): Removed unused variable.
(builtin_monitorenter): Removed rt-timing.
(builtin_monitorexit): Likewise.
* src/vm/rt-timing.c: rt-timing for buitin_new.
* src/vm/rt-timing.h: Likewise.
edwin [Sun, 23 Apr 2006 15:31:48 +0000 (15:31 +0000)]
* src/vm/cycles-stats.c (cycles_stats_get_cpu_MHz): Better error handling.
edwin [Sun, 23 Apr 2006 15:24:10 +0000 (15:24 +0000)]
* src/vm/builtin.c (builtin_new): Gather cycle count statistics.
(CYCLES_STATS_DECLARE): Moved declarations to beginning of file.
* src/vm/cycles-stats.c (cycles_stats_get_cpu_MHz): Added function for
automatic CPU frequency detection via /proc/cpuinfo.
(cycles_stats_print): Calculate estimated CPU times.
edwin [Sat, 22 Apr 2006 09:35:43 +0000 (09:35 +0000)]
* src/vm/cycles-stats.c (cycles_stats_print): Made count, floor, and ceiling
of type u8. This should avoid overflow problems.
* src/vm/cycles-stats.h (cycles_stats_print): Made count an u8.
edwin [Fri, 21 Apr 2006 21:36:54 +0000 (21:36 +0000)]
* src/vm/cycles-stats.c: New file. Better cycle count statistics.
* src/vm/cycles-stats.h (CYCLES_STATS_PRINT): This is now a wrapper for
cycles_stats_print.
* src/vm/Makefile.am (cycles-stats.c): Added to sources.
edwin [Fri, 21 Apr 2006 14:32:03 +0000 (14:32 +0000)]
* src/vm/jit/stacktrace.c (stacktrace_inline_fillStackTrace): Assert that
there is an exception before dereferencing it.
(stacktrace_create): Document that this function may return NULL.
(stacktrace_getClassContext): Check return value of stacktrace_create.
(stacktrace_getCurrentClass): Likewise.
(stacktrace_getStack): Likewise. Document that this function may return NULL.
edwin [Fri, 21 Apr 2006 13:08:00 +0000 (13:08 +0000)]
* src/vm/jit/stacktrace.c (stacktrace_getClassContext): Document that return
value may be NULL (in case of an exception).
* src/native/vm/VMStackWalker.c
(Java_gnu_classpath_VMStackWalker_getCallingClass): Check return value of
stacktrace_getClassContext.
(Java_gnu_classpath_VMStackWalker_getCallingClassLoader): Likewise.
* src/native/vm/Field.c (cacao_get_field_address): Check return value of
stacktrace_getClassContext.
* src/native/vm/Method.c (Java_java_lang_reflect_Method_invokeNative):
Check return value of stacktrace_getClassContext.
twisti [Fri, 21 Apr 2006 11:07:43 +0000 (11:07 +0000)]
* src/vm/jit/i386/md.c (md_get_method_patch_address): New method.
(md_icacheflush): Added.
(md_dcacheflush): Likewise.
twisti [Fri, 21 Apr 2006 10:54:24 +0000 (10:54 +0000)]
* src/vm/jit/jit.c (jit_asm_compile): New method.
* src/vm/jit/jit.h (jit_asm_compile): Added.
(md_get_method_patch_address): Likewise.
* src/vm/jit/x86_64/asmpart.S (asm_vm_call_method): Store
asm_call_jit_compiler on stack as for the other architectures.
(asm_call_jit_compiler): Use new jit_asm_compile.
* src/vm/jit/x86_64/codegen.c (codegen): Use REG_ITMP3 for calling
methods. This is required for asm_vm_call_method to work.
* src/vm/jit/x86_64/md.c (md_get_method_patch_address): New method.
(md_icacheflush): Added.
(md_dcacheflush): Added.
* src/vm/jit/x86_64/md-asm.h (mptr): Defined.
twisti [Fri, 21 Apr 2006 10:45:14 +0000 (10:45 +0000)]
* src/vm/jit/stacktrace.c (stacktrace_add_method_intern): Reformatted
comments.
edwin [Fri, 21 Apr 2006 00:00:22 +0000 (00:00 +0000)]
* src/vm/linker.c (link_class_intern): Impose loading constraints on the
more general types of the overwritten method, instead of on the over-
writing method. Don't impose loading constraints when "overwriting" the
instance initializaton method <init>, as it is not called virtually.
edwin [Thu, 20 Apr 2006 22:28:57 +0000 (22:28 +0000)]
* src/vm/classcache.c (classcache_add_constraint): Also constrain the
return type of the given method.
edwin [Thu, 20 Apr 2006 21:47:41 +0000 (21:47 +0000)]
* src/vm/linker.c (linker_addinterface): Add loading constraints when an
interface method is overwritten.
(link_class_intern): Check new return value of linker_addinterface.
edwin [Thu, 20 Apr 2006 20:40:59 +0000 (20:40 +0000)]
* src/vm/linker.c (link_class_intern): Only record loading constraints
for ENABLE_VERIFIER.
edwin [Thu, 20 Apr 2006 20:38:07 +0000 (20:38 +0000)]
* src/vm/classcache.c (classcache_add_constraints_for_params): Added.
(classcache_add_constraint): Only define for ENABLE_VERIFIER.
* src/vm/classcache.h (classcache_add_constraints_for_params): Added.
(classcache_add_constraint): Only define for ENABLE_VERIFIER.
* src/vm/linker.c (link_class_intern): When overwriting a method,
record loading constraints for the parameter types, as required
by the spec.
edwin [Thu, 20 Apr 2006 19:18:43 +0000 (19:18 +0000)]
* src/mm/memory.c (Changes): Added my name.
(vim boilerplate): Added.
edwin [Thu, 20 Apr 2006 18:59:41 +0000 (18:59 +0000)]
* src/mm/memory.c: Added comments and some cleanup.
edwin [Thu, 20 Apr 2006 18:04:18 +0000 (18:04 +0000)]
* configure.ac (ENABLE_LOOP): Changed default to "no".
* src/vm/options.h (opt_loops): Only define for ENABLE_LOOP.
* src/vm/options.c (opt_loops): Only define for ENABLE_LOOP.
* src/vm/vm.c (-oloop, -i): Only recognize these options if
enabled with ENABLE_LOOP/ENABLE_INLINING.
* src/vm/jit/allocator/lsra.c (opt_loops): Only use for ENABLE_LOOP.
twisti [Thu, 20 Apr 2006 10:55:11 +0000 (10:55 +0000)]
* src/vm/jit/x86_64/codegen.h (M_ALD32): Added.
twisti [Thu, 20 Apr 2006 10:42:01 +0000 (10:42 +0000)]
* src/vm/jit/x86_64/md-abi.h (REG_METHODPTR): Added.
twisti [Thu, 20 Apr 2006 08:45:03 +0000 (08:45 +0000)]
* src/lib/vm/reference/java/lang/VMClassLoader.java: Updated to GNU
Classpath version.
edwin [Wed, 19 Apr 2006 01:05:18 +0000 (01:05 +0000)]
* src/vm/builtin.c (builtin_print_cycles_stats): Added.
(builtin_monitorenter): Gather cycle count statistics.
(builtin_monitorexit): Likewise.
* src/vm/builtin.h (builtin_print_cycles_stats): Added.
* src/vm/jit/i386/asmpart.S (asm_get_cycle_count): Added.
* src/vm/jit/asmpart.h (asm_get_cycle_count): Added.
* src/vm/vm.c (vm_exit_handler): Call builtin_print_cycles_stats.
* src/vm/cycles-stats.h: New file.
* src/vm/Makefile.am (CYCLES_STATS_SOURCE): Added.
* src/cacaoh/headers.c (asm_get_cycle_count): Dummy implementation added.
* configure.ac (--enable-cycles-stats): Added configure option.
twisti [Tue, 18 Apr 2006 21:16:36 +0000 (21:16 +0000)]
* src/vm/jit/x86_64/emitfuncs.c: Moved to emit.c.
* src/vm/jit/x86_64/emitfuncs.h: Moved to md-emit.h
* src/vm/jit/x86_64/codegen.c (vm/jit/x86_64/emitfuncs.h): Removed.
(vm/jit/x86_64/md-emit.h): Added.
* src/vm/jit/x86_64/Makefile.am (libarch_la_SOURCES): Added emit.c and
md-emit.h, removed emitfuncs.c and emitfuncs.h.
--HG--
rename : src/vm/jit/x86_64/emitfuncs.c => src/vm/jit/x86_64/emit.c
rename : src/vm/jit/x86_64/emitfuncs.h => src/vm/jit/x86_64/md-emit.h
twisti [Tue, 18 Apr 2006 20:36:40 +0000 (20:36 +0000)]
* src/vm/jit/jit.h (IS_ADR_TYPE): Changed to use ==.
(IS_INT_TYPE): Added.
(IS_LNG_TYPE): Likewise.
twisti [Tue, 18 Apr 2006 20:34:52 +0000 (20:34 +0000)]
* src/vm/jit/x86_64/codegen.c (vm/jit/emit.h): Added.
(codegen): Use emit_load/store functions instead of macors. Saves over
25kB object code size.
* src/vm/jit/x86_64/codegen.h (ALIGNCODENOP): Added.
(var_to_reg_int): Removed.
(var_to_reg_flt): Likewise.
(store_reg_to_var_int): Likewise.
(store_reg_to_var_flt): Likewise.
(M_INEG, M_LNEG, M_INEG_MEMBASE, M_LNEG_MEMBASE): Added.
(M_CMOVEQ_MEMBASE, M_CMOVNE_MEMBASE, M_CMOVLT_MEMBASE)
(M_CMOVLE_MEMBASE, M_CMOVGE_MEMBASE, M_CMOVGT_MEMBASE): Likewise.
* src/vm/jit/x86_64/emitfuncs.c (emit_load_s1): Added.
(emit_load_s2): Likewise.
(emit_load_s3): Likewise.
(emit_store): Likewise.
(emit_copy): Likewise.
(emit_cmovxx): Likewise.
* src/vm/jit/x86_64/emitfuncs.h (emit_cmovxx): Added.
twisti [Tue, 18 Apr 2006 20:20:13 +0000 (20:20 +0000)]
* src/vm/jit/x86_64/md-abi.h (REG_IFTMP): Defined.
edwin [Tue, 18 Apr 2006 20:17:07 +0000 (20:17 +0000)]
* src/vm/jit/stack.c (stack_show_icmd): Updated to use the correct macros for
(un)resolved methods. Minor output format changes.
* src/vm/field.c (field_print): Print the class name.
twisti [Tue, 18 Apr 2006 20:10:23 +0000 (20:10 +0000)]
* src/vm/jit/alpha/Makefile.am (DISASS_SOURCES): Added.
* src/vm/jit/mips/Makefile.am: Likewise.
twisti [Tue, 18 Apr 2006 15:55:45 +0000 (15:55 +0000)]
* configure.ac (intl): Check on NetBSD too.
twisti [Tue, 18 Apr 2006 15:40:25 +0000 (15:40 +0000)]
* configure.ac: Fixed typos.
twisti [Tue, 18 Apr 2006 13:36:15 +0000 (13:36 +0000)]
* src/vm/jit/mips/codegen.h (M_FLTMOVE): Removed.
(M_TFLTMOVE): Likewise.
(M_TFLD): Likewise.
(M_TFST): Likewise.
(M_CCFLTMOVE): Likewise.
(M_CCFLD): Likewise.
(M_CCFST): Likewise.
* src/vm/jit/mips/codegen.c (codegen): Use float and double
explicitely.
* src/vm/jit/mips/emit.c: Likewise.
edwin [Mon, 17 Apr 2006 15:49:06 +0000 (15:49 +0000)]
* src/vm/jit/intrp/codegen.c (intrp_codegen): Cast mcodeptr to u1*.
This should fix intrp on archs with u4* mcodeptr.
edwin [Mon, 17 Apr 2006 15:20:45 +0000 (15:20 +0000)]
* src/vm/builtin.c (builtin_monitorenter, builtin_monitorexit): Added rt-timing.
* src/vm/rt-timing.c, src/vm/rt-timing.h: rt-timing for locks.
twisti [Mon, 17 Apr 2006 11:47:03 +0000 (11:47 +0000)]
* src/vm/jit/codegen-common.h (codegendata): Define lastmcodeptr on
all architectures. I think it does not matter.
edwin [Fri, 14 Apr 2006 23:50:27 +0000 (23:50 +0000)]
* src/vm/jit/codegen-common.h: Typo fix.
edwin [Fri, 14 Apr 2006 23:48:26 +0000 (23:48 +0000)]
* src/vm/jit/parse.c (parse): Removed unused variable `mi`.
edwin [Fri, 14 Apr 2006 23:46:38 +0000 (23:46 +0000)]
* src/vm/rt-timing.c: include stdlib.h to fix warning.
twisti [Fri, 14 Apr 2006 12:40:49 +0000 (12:40 +0000)]
* src/vm/jit/mips/emit.c: New file.
* src/vm/jit/mips/Makefile.am (libarch_la_SOURCES): Added emit.c
* src/vm/jit/mips/codegen.c (vm/jit/emit.h): Added.
(codegen): Use cd->mcodeptr instead of mcodeptr, and emit_load/store
functions instead of macors. Saves over 50kB object code size.
* src/vm/jit/mips/codegen.h (var_to_reg_int): Removed.
(var_to_reg_flt): Likewise.
(store_reg_to_var_int): Likewise.
(store_reg_to_var_flt): Likewise.
twisti [Fri, 14 Apr 2006 11:57:04 +0000 (11:57 +0000)]
* src/vm/jit/codegen-common.c (codegen_setup): Fixed compiler
warnings, set lastmcodeptr.
(codegen_increase): Fixed compiler warnings.
(codegen_finish): Likewise.
(codegen_createnativestub): Likewise.
twisti [Fri, 14 Apr 2006 11:28:33 +0000 (11:28 +0000)]
* src/vm/jit/alpha/emit.h: Removed. There's now a common one in
src/vm/jit/.
twisti [Fri, 14 Apr 2006 11:20:38 +0000 (11:20 +0000)]
* src/vm/jit/emit.h: New file.
* src/vm/jit/Makefile.am (noinst_HEADERS): Added emit.h.
* src/vm/jit/powerpc/emit.c: New file.
* src/vm/jit/powerpc/Makefile.am (libarch_la_SOURCES): Added emit.c.
* src/vm/jit/powerpc/codegen.c (vm/jit/emit.h): Added.
(codegen): Use cd->mcodeptr instead of mcodeptr, and emit_load/store
functions instead of macors. Saves over 100kB object code size.
* src/vm/jit/powerpc/codegen.h (var_to_reg_int): Removed.
(var_to_reg_lng): Likewise.
(var_to_reg_lng_low): Likewise.
(var_to_reg_lng_high): Likewise.
(var_to_reg_flt): Likewise.
(var_to_reg_dbl): Likewise.
(store_reg_to_var_int): Likewise.
(store_reg_to_var_lng): Likewise.
(store_reg_to_var_adr): Likewise.
(store_reg_to_var_flt): Likewise.
(store_reg_to_var_dbl): Likewise.
(M_LLD_INTERN): Added.
(M_LLD): Likewise.
(M_LST_INTERN): Likewise.
(M_LST): Likewise.
edwin [Thu, 13 Apr 2006 20:45:16 +0000 (20:45 +0000)]
* src/vm/loader.c (load_class_from_classloader): Detailed rt-timing.
(load_class_bootstrap): Likewise.
* src/vm/rt-timing.c: Added rt-timing for loading from classloaders.
* src/vm/rt-timing.h: Likewise.
edwin [Thu, 13 Apr 2006 18:21:11 +0000 (18:21 +0000)]
* src/vm/loader.c (load_class_from_classbuffer): Separate timing for
descriptor_pool_new.
* src/vm/rt-timing.c: Likewise.
* src/vm/rt-timing.h: Likewise.
edwin [Thu, 13 Apr 2006 18:00:33 +0000 (18:00 +0000)]
* src/vm/loader.c (load_class_from_classbuffer): Added real-time loading time
measurements.
* src/vm/rt-timing.c: Likewise.
* src/vm/rt-timing.h: Likewise.
projects / cacao.git / log