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.
edwin [Thu, 13 Apr 2006 17:23:12 +0000 (17:23 +0000)]
* src/vm/rt-timing.c: Added timing of linker stages.
* src/vm/rt-timing.h: Likewise.
* src/vm/linker.c: Likewise.
edwin [Thu, 13 Apr 2006 16:58:05 +0000 (16:58 +0000)]
* src/vm/rt-timing.h (RT_TIMING_TIME_DIFF): Added.
* src/vm/jit/jit.c (jit_compile_intern): Use RT_TIMING_TIME_DIFF.
* src/vm/linker.c (link_class): Use rt-timing for measuring link time.
* src/cacaoh/Makefile.am (cacaoh_LDFLAGS): Link with librt for
ENABLE_RT_TIMING.
edwin [Thu, 13 Apr 2006 16:48:01 +0000 (16:48 +0000)]
* src/vm/rt-timing.c (rt_timing_stat): Added field `totalindex`.
(rt_timing_stat_defs): Likewise.
(rt_timing_diff): Renamed to rt_timing_time_diff.
(rt_timing_print_time_stats): Use `totalindex` to calculate percentage.
* src/vm/rt-timing.h (RT_TIMING_LINK_TOTAL): Added.
(rt_timing_diff): Renamed to rt_timing_time_diff.
twisti [Thu, 13 Apr 2006 14:09:24 +0000 (14:09 +0000)]
* src/vm/jit/alpha/emit.c: New file.
* src/vm/jit/alpha/emit.h: Likewise.
twisti [Thu, 13 Apr 2006 13:10:06 +0000 (13:10 +0000)]
* src/vm/jit/codegen-common.h (codegendata): Changed mcodeend to
u1*. Define mcodeptr to u4* for non-i386/x86_64 architectures.
twisti [Thu, 13 Apr 2006 09:32:09 +0000 (09:32 +0000)]
* src/vm/jit/x86_64/codegen.c (codegen): Use argument registers
directly in exception stubs, instead of temporary ones. This reduces
code-size about 150kB for -all.
twisti [Thu, 13 Apr 2006 09:19:58 +0000 (09:19 +0000)]
* src/vm/jit/x86_64/emitfuncs.c (x86_64_emit_ishift): Bugfixes found
by javver.
(x86_64_emit_lshift): Likewise.
edwin [Wed, 12 Apr 2006 22:20:49 +0000 (22:20 +0000)]
* src/vm/rt-timing.c: Added file.
* src/vm/rt-timing.h: Likewise.
* src/vm/jit/jit.c: Moved real-time timing stuff to rt-timing.[ch]
* src/vm/jit/jit.h: Likewise.
* src/vm/vm.c (vm_exit_handler): Call rt_timing_print_time_stats.
* src/vm/Makefile.am (rt-timing.c, rt-timing.h): Added.
edwin [Wed, 12 Apr 2006 22:16:59 +0000 (22:16 +0000)]
* src/vm/jit/allocator/simplereg.c (allocate_scratch_registers): Fixed
compiler warning.
edwin [Wed, 12 Apr 2006 20:06:23 +0000 (20:06 +0000)]
* src/vm/jit/parse.c (parse): New unresolved reference scheme: Data structures
for unresolved fields/methods are only created if really needed. Otherwise
a lazy resolving is done on-the-fly. This reduced compile time by over 10% for
SpecJVM98 and eclipse.
* src/vm/resolve.c (resolve_subtype_check): Added.
(resolve_lazy_subtype_checks): Likewise.
(resolve_and_check_subtype_set): Use resolve_subtype_check. Return
resolve_result_t instead of bool. Removed `checked` argument.
(resolve_class): Use resolve_subtype_check.
(resolve_field_verifier_checks): Added.
(resolve_field_lazy): Added.
(resolve_field): Use resolve_field_verifier_checks.
(resolve_method_invokespecial_lookup): Added.
(resolve_method_verifier_checks): Added.
(resolve_method_lazy): Added.
(resolve_method): Use resolve_method_invokespecial_lookup and
resolve_method_verifier_checks.
(constrain_unresolved_method): Adapted to new unresolved reference scheme.
(constrain_unresolved_field): Likewise.
(unresolved_field_debug_dump): Likewise.
(unresolved_method_debug_dump): Likewise.
* src/vm/jit/patcher.h (intrp_patcher_get_putstatic_clinit): Added.
* src/vm/jit/intrp/intrp.h (vm_Cell2afi): Added.
(vm_afi2Cell): Likewise.
(printarg_afi): Added.
(vim boilerplate): Added.
(Changes): Added my name.
* src/vm/jit/intrp/patcher.c (intrp_patcher_get_putstatic_clinit): Added.
* src/vm/jit/intrp/disass.c (printarg_afi): Added.
(Changes): Added my name.
(vim boilerplate): Added.
* src/vm/jit/intrp/java.vmg (GETSTATIC_CELL, GETSTATIC_INT, GETSTATIC_FLOAT)
(GETSTATIC_LONG, PUTSTATIC_CELL, PUTSTATIC_INT, PUTSTATIC_FLOAT)
(PUTSTATIC_LONG, GETFIELD_CELL, GETFIELD_INT, GETFIELD_FLOAT)
(GETFIELD_LONG, PUTFIELD_CELL, PUTFIELD_INT, PUTFIELD_FLOAT)
(PUTFIELD_LONG): Now take a fieldinfo instead of an unresolved_field.
(INVOKEVIRTUAL, INVOKESTATIC, INVOKESPECIAL, INVOKEINTERFACE): Now take
a methodinfo instead of an unresolved_method.
(PATCHER_GETSTATIC_CLINIT_INT, PATCHER_GETSTATIC_CLINIT_FLOAT)
(PATCHER_GETSTATIC_CLINIT_LONG, PATCHER_GETSTATIC_CLINIT_CELL): Added.
(PATCHER_PUTSTATIC_CLINIT_INT, PATCHER_PUTSTATIC_CLINIT_FLOAT)
(PATCHER_PUTSTATIC_CLINIT_LONG, PATCHER_PUTSTATIC_CLINIT_CELL): Added.
* src/vm/jit/allocator/simplereg.c (allocate_scratch_registers):
Use INSTRUCTION_GET_METHODDESC to get method descriptor.
* src/vm/jit/stack.c (stack_analyse): Ported to new unresolved reference
scheme.
(stack_show_icmd): Likewise.
* src/vm/jit/verify/typecheck.c (verify_invocation): Ported to new unresolved
reference scheme.
(verify_basic_block): Likewise.
* src/vm/jit/powerpc/codegen.c (codegen): Ported to new unresolved reference
scheme.
* src/vm/jit/alpha/codegen.c (codegen): Ported to new unresolved reference
scheme.
* src/vm/jit/mips/codegen.c (codegen): Ported to new unresolved reference
scheme.
* src/vm/jit/i386/codegen.c (codegen): Ported to new unresolved reference
scheme.
* src/vm/jit/x86_64/codegen.c (codegen): Ported to new unresolved reference
scheme.
* src/vm/jit/intrp/codegen.c (codegen): Ported to new unresolved reference
scheme.
(Changes): Added my name.
* src/vm/jit/intrp/codegen.h (vim boilerplate): Added.
edwin [Wed, 12 Apr 2006 18:07:05 +0000 (18:07 +0000)]
* src/vm/resolve.h (resolve_result_t): Added.
(resolve_method_lazy): Added prototype.
(resolve_field_lazy): Added prototype.
(resolve_and_check_subtype_set): Removed prototype. This function is
becoming static.
edwin [Wed, 12 Apr 2006 17:51:10 +0000 (17:51 +0000)]
* src/vm/class.c (class_showconstantpool): Use the new functions
method_methodref_print and field_fieldref_print.
* src/vm/loader.c (load_constantpool): Use p.index in constant_FMIref.
(load_class_from_classbuffer): Likewise.
* src/vm/jit/stack.c (stack_show_icmd): Use p.index in constant_FMIref.
* src/vm/jit/verify/typecheck.c (verify_invocation): Use p.index in constant_FMIref.
* src/vm/resolve.c (resolve_field, resolve_method, constrain_unresolved_field)
(unresolved_field_debug_dump, unresolved_method_debug_dump):
Use p.index in constant_FMIref.
* src/vm/method.c, src/vm/method.h (method_methodref_print): Added.
(method_methodref_println): Likewise.
* src/vm/field.c, src/vm/field.h (field_fieldref_print): Added.
(field_fieldref_println): Likewise.
* src/vm/references.h (constant_FMIref): Changed field `classref` into a
union that is used for caching of already resolved fields/methods.
(IS_FMIREF_RESOLVED): Added.
(METHODREF_CLASSNAME): Added.
(FIELDREF_CLASSNAME): Added.
* src/vm/jit/jit.h (INSTRUCTION_IS_RESOLVED): Added. This is a preparation
for the lazy resolving rewrite.
(INSTRUCTION_IS_UNRESOLVED): Likewise.
(INSTRUCTION_GET_FIELDREF): Likewise.
(INSTRUCTION_GET_METHODREF): Likewise.
(INSTRUCTION_GET_FIELDDESC): Likewise.
(INSTRUCTION_GET_METHODDESC): Likewise.
(INSTRUCTION_UNRESOLVED_METHOD): Likewise.
(INSTRUCTION_UNRESOLVED_FIELD): Likewise.
(INSTRUCTION_RESOLVED_FMIREF): Likewise.
(INSTRUCTION_RESOLVED_FIELDINFO): Likewise.
(INSTRUCTION_RESOLVED_METHODINFO): Likewise.
* src/vm/jit/intrp/disass.c (printarg_auf): Use METHODREF_CLASSNAME.
twisti [Wed, 12 Apr 2006 11:51:28 +0000 (11:51 +0000)]
* src/vm/jit/alpha/codegen.c (codegen): Use directly argument
registers in exception stubs, instead of temporary ones. This reduces
code-size about 200kB for -all.
twisti [Wed, 12 Apr 2006 09:49:18 +0000 (09:49 +0000)]
* src/vm/jit/powerpc/codegen.c (codegen): Fixed displacement overflow
problem when restoring LR. We can't use r0 here.
twisti [Wed, 12 Apr 2006 09:30:52 +0000 (09:30 +0000)]
* NEWS: Line-number fix added.
edwin [Wed, 12 Apr 2006 09:20:59 +0000 (09:20 +0000)]
* src/vm/jit/parse.c (parse): Skip line number entries that span over zero
bytecode instructions.
edwin [Wed, 12 Apr 2006 08:52:14 +0000 (08:52 +0000)]
* src/vm/method.h (methodinfo): Forward declaration moved to refereneces.h.
* src/vm/field.h (fieldinfo): Forward declaration moved to refereneces.h.
* src/vm/references.h (methodinfo, fieldinfo): Added forward references.
edwin [Wed, 12 Apr 2006 08:34:59 +0000 (08:34 +0000)]
* src/vm/class.c (class_showconstanti): Removed.
(class_showconstantpool): Documented.
(class_showmethods): Documented.
(vim boilerplate): Added.
(Changes): Finally added my name.
twisti [Tue, 11 Apr 2006 13:13:23 +0000 (13:13 +0000)]
* src/vm/jit/x86_64/codegen.c (codegen): Changed signature to use
jitdata. Renamed reg_of_var by codegen_reg_of_var.
* src/vm/jit/x86_64/codegen.h (M_COPY): Likewise.
twisti [Tue, 11 Apr 2006 10:54:23 +0000 (10:54 +0000)]
* tests/regression/clinitexception.2output: Updated.
* tests/regression/native/checkjni.output: Likewise.
* tests/regression/extest.2output: Likewise.
twisti [Tue, 11 Apr 2006 10:20:18 +0000 (10:20 +0000)]
* src/vm/builtin.c (builtin_throw_exception): Changed return type and
return NULL. This is less error-prone in asm_vm_call_method.
* src/vm/builtin.h: Likewise.
* src/vm/jit/alpha/asmpart.S (asm_vm_call_method_exception_handler):
Don't set v0 to NULL. This is now done in builtin_throw_exception.
* 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.
twisti [Tue, 11 Apr 2006 10:04:43 +0000 (10:04 +0000)]
* src/vm/jit/ifconv/ifconv.c (ifconv_static): Keep compiler happy.
edwin [Tue, 11 Apr 2006 09:00:36 +0000 (09:00 +0000)]
* src/vm/jit/stack.c (stack_print_stack): Only use `regs` if
ENABLE_DISASSEMBLER is defined.
(stack_show_method): Likewise.
* src/vm/jit/replace.c (replace_executionstate_println): Likewise.
edwin [Tue, 11 Apr 2006 05:10:55 +0000 (05:10 +0000)]
* src/vm/jit/intrp/asmpart.c (intrp_asm_handle_exception): Do not trace
exception when NDEBUG.
* src/vm/jit/intrp/dynamic-super.c (disassemble_prim): Only enable for
ENABLE_DISASSEMBLER.
(dynamic_super_init): Only call disassemble_prim for ENABLE_DISASSEMBLER.
* src/vm/jit/intrp/java.vmg: Disable builtin_displaymethodstop and
builtin_trace_args for NDEBUG.
twisti [Thu, 6 Apr 2006 12:54:07 +0000 (12:54 +0000)]
* src/vm/jit/mips: Added TAGS.
* src/vm/jit/mips/irix: Likewise.
* src/vm/jit/mips/irix/.cvsignore: Likewise.
* src/vm/jit/mips/.cvsignore: Likewise.
twisti [Thu, 6 Apr 2006 12:51:53 +0000 (12:51 +0000)]
* src/vm/jit/mips/codegen.c (codegen): Changed signature to use
jitdata. Renamed reg_of_var by codegen_reg_of_var.
(createcompilerstub): Replaced docacheflush by md_cacheflush.
* src/vm/jit/mips/codegen.h (M_COPY): Likewise.
* src/vm/jit/mips/md.c (sys/mman.h): Removed.
(docacheflush): Likewise.
edwin [Thu, 6 Apr 2006 00:33:47 +0000 (00:33 +0000)]
* configure.ac: Added host type `armv5l`.
edwin [Wed, 5 Apr 2006 20:31:38 +0000 (20:31 +0000)]
* src/vm/jit/parse.h, src/vm/jit/parse.c (OP1LOAD):
Split into OP1LOAD_ONEWORD and OP1LOAD_TWOWORD. Index is only checked if
ENABLE_VERIFIER.
(OP1STORE): Split into OP1STORE_ONEWORD and OP1STORE_TWOWORD. Index is
only checked if ENABLE_VERIFIER.
edwin [Wed, 5 Apr 2006 19:58:18 +0000 (19:58 +0000)]
* src/vm/jit/parse.c (parse): Cleaned up and reordered an if.
edwin [Wed, 5 Apr 2006 19:44:46 +0000 (19:44 +0000)]
* src/vm/jit/parse.c (parse): Remove the `if (!iswide)` check for each opcode
by making JAVA_WIDE continue directly to the label fetch_opcode. (This also
removed a part of the iswide check at the end of the loop.)
edwin [Wed, 5 Apr 2006 18:48:56 +0000 (18:48 +0000)]
* src/vm/jit/alpha/codegen.c (codegen, createnativestub): Remove
opt_verbosecall code for NDEBUG builds.
edwin [Wed, 5 Apr 2006 18:13:18 +0000 (18:13 +0000)]
* src/vm/jit/parse.c (parse): Only do verifier checks if ENABLE_VERIFIER.
Cleaned up an obsolete printf.
edwin [Wed, 5 Apr 2006 12:56:43 +0000 (12:56 +0000)]
* configure.ac (ENABLE_RT_TIMING): Added.
* src/vm/jit/jit.c (ENABLE_RT_TIMING): Added code for real-time timing
of compiler passes.
* src/vm/jit/jit.h (jit_print_time_stats): Added.
* src/vm/vm.c (vm_exit_handler): Call jit_print_time_stats.
edwin [Wed, 5 Apr 2006 11:32:52 +0000 (11:32 +0000)]
* src/vm/jit/inline/inline.c (create_block): Use BASICBLOCK_INIT.
twisti [Wed, 5 Apr 2006 10:02:14 +0000 (10:02 +0000)]
* src/vm/jit/alpha/asmpart.S (asm_vm_call_method): Removed !NDEBUG as
builtin_throw_exception actually posts the thrown exception to the VM
system.
* src/vm/jit/powerpc/asmpart.S: Likewise.
* src/vm/jit/mips/asmpart.S: Likewise.
* src/vm/jit/x86_64/asmpart.S: Likewise.
edwin [Wed, 5 Apr 2006 09:57:55 +0000 (09:57 +0000)]
* src/vm/jit/jit.h (instruction): Removed `method` field.
(insinfo_inline): Added.
(basicblock): Added `method` field.
* src/vm/jit/dseg.c (dseg_addlinenumber_inline_start)
(dseg_addlinenumber_inline_end): Use new insinfo_inline struct.
* src/vm/jit/verify/typecheck.c (verify_basic_block): Removed unused
variable `myclass`.
* src/vm/jit/inline/inline.c (emit_inlining_prolog, emit_inlining_epilog):
Use insinfo_inline struct.
(inline_write_exception_handlers): Removed `method` field.
* src/vm/jit/i386/codegen.c (codegen): Use insinfo_inline struct.
* src/vm/jit/parse.h (several macros): Removed `method` field from
instruction.
* src/vm/jit/stack.c (stack_show_icmd): Adapted to new insinfo_inline struct.
projects / cacao.git / log