tbfg [Fri, 1 Dec 2006 11:38:47 +0000 (11:38 +0000)]
* src/vm/jit/powerpc64/asmpart.S (asm_vm_call_method):
Fixed a bug in argument handling when using lwz instead
of lwa zeroed out sign extension bits which lead to wrong
int->string conversion in exception handling path.
edwin [Wed, 29 Nov 2006 22:33:49 +0000 (22:33 +0000)]
* tests/regression/jasmin/test_verify_fail_merge_init_nullpointer.j:
New test.
* tests/regression/jasmin/test_verify_fail_init_nullpointer.j: Pass
null pointer without merging.
* tests/regression/jasmin/Makefile.am: Added new test.
twisti [Wed, 29 Nov 2006 20:44:10 +0000 (20:44 +0000)]
* src/vm/jit/dseg.h (jumpref, dataref, exceptionref, patchref)
(linenumberref): Moved to codegen-common.h.
* src/vm/jit/codegen-common.h: Likewise.
twisti [Wed, 29 Nov 2006 20:34:02 +0000 (20:34 +0000)]
* src/vm/jit/emit-common.c (emit_bc): Commented emit_branch call.
twisti [Wed, 29 Nov 2006 20:15:47 +0000 (20:15 +0000)]
* src/vm/jit/x86_64/emit.h (config.h): Added.
(vm/jit/codegen-common.h): Likewise.
(vm/jit/jit.h): Likewise.
twisti [Wed, 29 Nov 2006 17:08:27 +0000 (17:08 +0000)]
* src/vm/class.h [ENABLE_JAVASE] (vm/annotation.h): Added.
[ENABLE_JAVASE] (classinfo): Added runtimevisibleannotationscount,
runtimevisibleannotations.
twisti [Wed, 29 Nov 2006 17:04:14 +0000 (17:04 +0000)]
* src/vm/annotation.c: New file.
* src/vm/annotation.h: Likewise.
* src/vm/Makefile.am [ENABLE_JAVASE] (ANNOTATION_OBJ): Added.
twisti [Wed, 29 Nov 2006 17:00:02 +0000 (17:00 +0000)]
* src/vm/resolve.h (vm/field.h): Added.
twisti [Tue, 28 Nov 2006 22:36:47 +0000 (22:36 +0000)]
* src/vm/jit/emit-common.c (emit_bc): Temporary compile fix
twisti [Tue, 28 Nov 2006 22:32:22 +0000 (22:32 +0000)]
* src/vm/jit/i386/codegen.h (vm/jit/i386/emit.h): Added.
twisti [Tue, 28 Nov 2006 22:28:52 +0000 (22:28 +0000)]
* src/vm/statistics.c (count_branches_resolved)
(count_branches_unresolved): New variable.
(print_stats): Print new variables.
* src/vm/statistics.h (count_branches_resolved)
(count_branches_unresolved): Added.
twisti [Tue, 28 Nov 2006 22:25:11 +0000 (22:25 +0000)]
* src/vm/jit/emit-common.c (codegen.h): Added.
(vm/options.h): Likewise.
[ENABLE_STATISTICS] (vm/statistics.h): Likewise.
(emit_bc): New function.
(emit_br): Likewise.
* src/vm/jit/emit-common.h (emit_branch): Added.
twisti [Tue, 28 Nov 2006 22:19:16 +0000 (22:19 +0000)]
* src/vm/jit/alpha/codegen.h (BRANCH_NOPS): Defined.
* src/vm/jit/i386/codegen.h (BRANCH_NOPS, PATCHER_NOPS): Likewise.
* src/vm/jit/mips/codegen.h (BRANCH_NOPS): Likewise.
* src/vm/jit/powerpc/codegen.h (BRANCH_NOPS): Likewise.
* src/vm/jit/powerpc64/codegen.h (BRANCH_NOPS, PATCHER_CALL_SIZE)
(PATCHER_NOPS): Likewise.
* src/vm/jit/x86_64/codegen.h (BRANCH_NOPS): Likewise.
twisti [Tue, 28 Nov 2006 22:04:29 +0000 (22:04 +0000)]
* src/vm/jit/dseg.c (dseg_get_linenumber_from_pc_intern):
Short-circuit the common case.
twisti [Tue, 28 Nov 2006 21:50:26 +0000 (21:50 +0000)]
* src/native/tools/Makefile.am (GC_LIB): Removed.
twisti [Tue, 28 Nov 2006 19:58:02 +0000 (19:58 +0000)]
* src/vm/jit/emit-common.c (emit_beq, emit_bne, emit_blt, emit_bge)
(emit_bgt, emit_ble, emit_bnan): New functions.
* src/vm/jit/emit-common.h (emit_beq, emit_bne, emit_blt, emit_bge)
(emit_bgt, emit_ble, emit_bnan): Added.
* src/vm/jit/codegen-common.h (BRANCH_UNCONDITIONAL, BRANCH_EQ)
(BRANCH_NE, BRANCH_LT, BRANCH_GE, BRANCH_GT, BRANCH_LE, BRANCH_NAN):
Added.
edwin [Tue, 28 Nov 2006 19:24:33 +0000 (19:24 +0000)]
* tests/regression/jasmin/test_verify_fail_merge_different_new_objects.j:
New test.
* tests/regression/jasmin/test_verify_fail_init_nullpointer.j: Likewise.
* tests/regression/jasmin/Makefile.am: Added new tests.
edwin [Tue, 28 Nov 2006 19:24:06 +0000 (19:24 +0000)]
* src/vm/jit/verify/typeinfo.c (typeinfo_merge_error): Moved debug
print into #ifdef TYPEINFO_VERBOSE.
twisti [Tue, 28 Nov 2006 19:14:14 +0000 (19:14 +0000)]
* src/vm/jit/alpha/codegen.h (PATCHER_CALL_SIZE): Defined.
twisti [Tue, 28 Nov 2006 15:11:20 +0000 (15:11 +0000)]
* src/native/vm/java_lang_VMThrowable.c
(native/include/java_lang_VMClass.h): Removed.
(getStackTrace): Use native_class_getname.
ajordan [Tue, 28 Nov 2006 01:07:49 +0000 (01:07 +0000)]
* src/vm/jit/sparc64/asmpart.S: fixed asm_patcher_wrapper
* src/vm/jit/sparc64/patcher.c: updated some patchers and the wrapper
* src/vm/jit/sparc64/emit.c: likewise
* src/vm/jit/sparc64/codegen.h: fixed M_BRACC
* src/vm/jit/sparc64/codegen.c: added reg window workaround for arg register copying.
some patch ref updates
* src/vm/jit/sparc64/md.c: updated md_codegen_patch_branch()
twisti [Mon, 27 Nov 2006 20:05:59 +0000 (20:05 +0000)]
* src/vm/jit/powerpc/codegen.h (PATCHER_CALL_SIZE): Defined.
edwin [Mon, 27 Nov 2006 16:53:53 +0000 (16:53 +0000)]
* src/vm/jit/replace.c: Lazy patching of virtual methods. Cleanup.
* src/vm/jit/replace.h: Likewise.
edwin [Mon, 27 Nov 2006 15:37:02 +0000 (15:37 +0000)]
* src/vm/jit/replace.h (sourceframe_t): Added normalized type
of replacement point.
* src/vm/jit/replace.c (replace_normalize_type_map): Added
normalization table for replacement point types.
(replace_read_executionstate): Set normalized type of rplpoint.
(replace_find_replacement_point): Match normalized type of rplpoint.
(replace_source_frame_println): Print it.
edwin [Mon, 27 Nov 2006 15:29:40 +0000 (15:29 +0000)]
* src/vm/jit/i386/codegen.c (codegen): set marker in line number table
_after_ inlining prolog (This fixes the stacktrace for the CHECKNULL in
the prolog.)
* src/vm/jit/dseg.c (dseg_addlinenumber_inline_start): Document that
it is now called with the INLINE_BODY instruction.
edwin [Mon, 27 Nov 2006 15:24:39 +0000 (15:24 +0000)]
* src/vm/jit/i386/codegen.cn (codegen): Use the new functions for
setting replacement point addresses.
edwin [Mon, 27 Nov 2006 15:23:55 +0000 (15:23 +0000)]
* src/vm/jit/codegen-common.c (codegen_set_replacement_point_notrap):
New function.
(codegen_set_replacement_point): Likewise.
* src/vm/jit/codegen-common.h (codegendata): Added field
`replacementpoint`.
(codegen_set_replacement_point_notrap): Added prototype.
(codegen_set_replacement_point): Likewise.
* src/vm/jit/replace.h (RPLPOINT_CHECK): New macro.
(RPLPOINT_CHECK_BB): Likewise.
edwin [Mon, 27 Nov 2006 15:19:20 +0000 (15:19 +0000)]
* src/vm/jit/replace.c (replace_create_inline_start_replacement_point):
New function.
(replace_create_replacement_points): Cleaned up.
edwin [Mon, 27 Nov 2006 15:15:54 +0000 (15:15 +0000)]
* src/vm/jit/stack.c (stack_javalocals_store): New function.
* src/vm/jit/stack.h (stack_javalocals_store): Likewise.
* src/vm/jit/inline/inline.c (inline_clone_instruction): Use
stack_javalocals_store.
* src/vm/jit/replace.c (replace_create_replacement_points): Use
stack_javalocals_store. Other cleanups.
edwin [Mon, 27 Nov 2006 15:11:12 +0000 (15:11 +0000)]
* src/vm/jit/replace.c (replace_create_replacement_points): Create
non-trappable replacement point for INLINE_BODY.
* src/vm/jit/i386/codegen.c (codegen): Handle replacement point
for INLINE_BODY.
edwin [Mon, 27 Nov 2006 15:06:08 +0000 (15:06 +0000)]
* src/vm/jit/replace.h (RPLPOINT_TYPE_BODY): Added.
* src/vm/jit/replace.c: Likewise.
edwin [Mon, 27 Nov 2006 15:03:54 +0000 (15:03 +0000)]
* src/vm/jit/inline/inline.c (emit_inlining_prolog): Do not emit
CHECKNULL in prolog for <init> methods.
edwin [Mon, 27 Nov 2006 15:02:59 +0000 (15:02 +0000)]
* src/vm/jit/inline/inline.c (emit_inlining_prolog): Emit INLINE_BODY
instructions at end of prolog.
edwin [Mon, 27 Nov 2006 14:58:43 +0000 (14:58 +0000)]
* src/vm/jit/icmdtable.inc (INLINE_GOTO): Removed.
(INLINE_BODY): Added. This instruction will mark the start of the
inlined method body after the prolog.
* src/vm/jit/jit.h: Likewise.
* src/vm/jit/show.c (show_icmd): Likewise.
* src/vm/jit/allocator/simplereg.c (simplereg_allocate_temporaries):
Likewise.
* src/vm/jit/i386/codegen.c (codegen): Likewise.
* src/vm/jit/verify/typecheck-variablesbased-gen.inc: Regenerated.
edwin [Mon, 27 Nov 2006 14:48:33 +0000 (14:48 +0000)]
* src/vm/jit/i386/emit.c (emit_memabs): Removed.
(emit_alu_imm_memabs): Use emit_mem.
edwin [Mon, 27 Nov 2006 14:39:58 +0000 (14:39 +0000)]
* src/vm/jit/stack.c (stack_reanalyse_block): Removed bogus cases
for INLINE_ instructions. They cannot occur here.
(stack_analyse): Likewise.
michi [Mon, 27 Nov 2006 14:37:57 +0000 (14:37 +0000)]
* src/mm/gc-common.h: Added prototype for heap_init_objectheader.
* src/vm/builtin.c (builtin_clone): Object header gets initiated after cloning.
edwin [Mon, 27 Nov 2006 14:35:26 +0000 (14:35 +0000)]
* src/vm/jit/jit.c (jit_invalidate_code): Do not trap non-trappable
replacement points.
(jit_request_optimization): New function.
(jit_get_current_code): New function.
* src/vm/jit/jit.h (jit_request_optimization): Added prototype.
(jit_get_current_code): Likewise.
* src/vm/jit/replace.h (RPLPOINT_FLAG_NOTRAP): New flag.
* src/vm/jit/replace.c (replace_replacement_point_println): Prepared
for new flag.
edwin [Mon, 27 Nov 2006 14:27:55 +0000 (14:27 +0000)]
* src/vm/jit/jit.c (jit_invalidate_code): Do not activate RETURN
rplpoints when invalidating code (they cannot be mapped to inlined
versions of the code).
edwin [Mon, 27 Nov 2006 14:26:29 +0000 (14:26 +0000)]
* src/vm/jit/replace.c (replace_create_replacement_points): Some fixes
for inlining.
edwin [Mon, 27 Nov 2006 14:24:26 +0000 (14:24 +0000)]
* src/vm/jit/replace.c (replace_find_replacement_point): Match parent
of replacement point.
(replace_me): Keep parent of rplpoint around.
edwin [Mon, 27 Nov 2006 14:20:57 +0000 (14:20 +0000)]
* src/vm/jit/i386/emit.c (emit_memabs): New function.
(emit_alu_imm_memabs): New function.
* src/vm/jit/i386/emit.h (emit_alu_imm_memabs): Added prototype.
* src/vm/jit/i386/codegen.h (M_ISUB_IMM_MEMABS): New macro.
michi [Sat, 25 Nov 2006 16:32:52 +0000 (16:32 +0000)]
* src/mm/cacao-gc/gc.h: Added.
* src/mm/cacao-gc/gc.c: Debugging with gc_call. Added some development breaks.
Added gc_get_heap_size, gc_get_free_bytes, gc_get_total_bytes and
gc_get_max_heap_size.
twisti [Wed, 22 Nov 2006 21:19:38 +0000 (21:19 +0000)]
* src/vm/jit/x86_64/codegen.c (codegen): Use new dseg_add_* functions,
replaced codegen_addreference with codegen_add_branch_ref.
(createnativestub): Likewise.
* src/vm/jit/x86_64/emit.c (emit_patcher_stubs): Likewise.
twisti [Wed, 22 Nov 2006 20:24:55 +0000 (20:24 +0000)]
* src/vm/jit/stacktrace.c (linenumbertable_entry): Removed.
(stacktrace_add_method_intern): Removed.
(stacktrace_add_method): Call dseg_get_linenumber_from_pc.
* src/vm/jit/dseg.c (vm/jit/methodheader.h): Added.
(dseg_get_linenumber_from_pc_intern): New function.
(dseg_get_linenumber_from_pc): Likewise.
* src/vm/jit/dseg.h (linenumbertable_entry): Added.
(dseg_get_linenumber_from_pc): Likewise.
* src/vm/jit/show.c (show_method): Renamed u1ptr to pc.
(show_basicblock): Use dseg_get_linenumber_from_pc to diplay line
number in disassembly.
twisti [Wed, 22 Nov 2006 19:00:18 +0000 (19:00 +0000)]
* src/mm/gc-common.h [DISABLE_GC] (nogc_init, nogc_realloc): Removed.
edwin [Wed, 22 Nov 2006 18:22:14 +0000 (18:22 +0000)]
* src/vm/jit/x86_64/codegen.c (codegen): Do not generate code for ASTORE
storing a returnAddress, as 1) the store is dead, and 2) the dest.
variable has no valid allocation.
edwin [Wed, 22 Nov 2006 18:20:58 +0000 (18:20 +0000)]
* src/vm/jit/sparc64/codegen.c (codegen): Do not generate code for ASTORE
storing a returnAddress, as 1) the store is dead, and 2) the dest.
variable has no valid allocation.
edwin [Wed, 22 Nov 2006 18:18:09 +0000 (18:18 +0000)]
* src/vm/jit/powerpc64/codegen.c (codegen): Do not generate code for ASTORE
storing a returnAddress, as 1) the store is dead, and 2) the dest.
variable has no valid allocation.
edwin [Wed, 22 Nov 2006 18:16:15 +0000 (18:16 +0000)]
* src/vm/jit/mips/codegen.c (codegen): Do not generate code for ASTORE
storing a returnAddress, as 1) the store is dead, and 2) the dest.
variable has no valid allocation.
edwin [Wed, 22 Nov 2006 18:12:29 +0000 (18:12 +0000)]
* src/vm/jit/i386/codegen.c (codegen): Do not generate code for ASTORE
storing a returnAddress, as 1) the store is dead, and 2) the dest.
variable has no valid allocation.
edwin [Wed, 22 Nov 2006 18:09:14 +0000 (18:09 +0000)]
* src/vm/jit/powerpc/codegen.c (codegen): Do not generate code for ASTORE
storing a returnAddress, as 1) the store is dead, and 2) the dest.
variable has no valid allocation.
edwin [Wed, 22 Nov 2006 18:03:12 +0000 (18:03 +0000)]
* src/vm/jit/alpha/codegen.c (codegen): Do not generate code for ASTORE
storing a returnAddress, as 1) the store is dead, and 2) the dest.
variable has no valid allocation.
twisti [Wed, 22 Nov 2006 11:05:06 +0000 (11:05 +0000)]
* configure.ac: Added *kfreebsd*-gnu.
* src/vm/suck.c (scandir_filter) [_DIRENT_HAVE_D_NAMLEN]: Bugfix.
twisti [Wed, 22 Nov 2006 10:50:07 +0000 (10:50 +0000)]
* src/vm/jit/i386/codegen.c (codegen): Use new dseg_add_* functions.
(createnativestub): Likewise.
* src/vm/jit/i386/emit.c (emit_patcher_stubs): Likewise.
twisti [Tue, 21 Nov 2006 23:21:18 +0000 (23:21 +0000)]
* native.c (native_class_getname): New function.
* native.h (native_class_getname): Added.
* vm/java_lang_VMClass.c (getName): Use native_class_getname.
twisti [Tue, 21 Nov 2006 21:02:30 +0000 (21:02 +0000)]
* src/vm/builtin.c [DISABLE_GC] (builtin_idiv): Added.
(builtin_f2i): Likewise.
(builtin_d2i): Likewise.
* src/vm/vm.c (vm_create): Removed nogc_init call.
* src/cacaoh/cacaoh.c (main): Likewise.
* src/mm/nogc.c (nogc_realloc): Removed.
(nogc_init): Renamed to gc_init.
(gc_init): Removed.
(gc_get_total_bytes): Added.
* src/mm/memory.h [DISABLE_GC] (NEW, FREE, MNEW, MFREE, MREALLOC):
Removed.
michi [Tue, 21 Nov 2006 16:56:56 +0000 (16:56 +0000)]
* src/vm/loader.c (load_class_from_classbuffer) [ENABLE_GC_CACAO]: Fieldinfos
are no longer placed onto the heap.
* src/vm/class.c (class_free) [ENABLE_GC_CACAO]: Fieldinfos are freed.
tbfg [Mon, 20 Nov 2006 18:57:08 +0000 (18:57 +0000)]
* src/vm/jit/powerpc64/codegen.c (codegen): Replace dseg_add*
by dseg_add_* functions.
* src/vm/jit/powerpc64/emit.c: Likewise.
twisti [Mon, 20 Nov 2006 16:18:19 +0000 (16:18 +0000)]
* src/vm/jit/dseg.h (dseg_adds4, dseg_adds8, dseg_addfloat)
(dseg_adddouble, dseg_addaddress, dseg_addtarget): Removed.
* src/vm/jit/alpha/codegen.c (codegen): Removed remaining old-dseg_add
calls.
* src/vm/jit/alpha/emit.c (emit_iconst): Replaced dseg_adds4 with
dseg_add_s4.
(emit_lconst): Replaced dseg_adds8 with dseg_add_s8.
michi [Mon, 20 Nov 2006 14:18:12 +0000 (14:18 +0000)]
* src/vm/global.h: Added hdrflags to java_objectheader for exact Cacao-GC.
* src/threads/native/lock.c: Now uses hdrflags to store the FLC bit.
michi [Sun, 19 Nov 2006 18:25:45 +0000 (18:25 +0000)]
* src/mm/cacao-gc/Makefile.am: Added mark.c
* src/mm/cacao-gc/mark.c: Added
edwin [Sun, 19 Nov 2006 15:40:22 +0000 (15:40 +0000)]
* src/vm/jit/replace.c: Only recompile if necessary. Count
re-compilations.
edwin [Sun, 19 Nov 2006 15:39:34 +0000 (15:39 +0000)]
* src/vm/jit/replace.c: Added statistics code.
edwin [Sun, 19 Nov 2006 15:36:03 +0000 (15:36 +0000)]
* src/vm/jit/replace.c (replace_me): Only turn off replacement
points for self-replacement. Warn in this case.
edwin [Sun, 19 Nov 2006 15:33:28 +0000 (15:33 +0000)]
* src/vm/jit/replace.c (replace_write_executionstate): Take
synchronization slots from next frame for inline points.
edwin [Sun, 19 Nov 2006 15:28:54 +0000 (15:28 +0000)]
* src/vm/jit/replace.c: Handle and match returnAddress variables on
the java stack.
edwin [Sun, 19 Nov 2006 15:22:53 +0000 (15:22 +0000)]
* src/vm/jit/stack.c (stack_analyse): Keep TYPE_RET for variables
of returnAddress type. Do not create interfaces for this type.
Mark block variables of TYPE_RET as PREALLOC to avoid subsequent
allocation.
* src/vm/jit/icmdtable.inc (ASTORE): Added TYPE_RET (R--) variant.
(JSR): Changed destination type to TYPE_RET (R).
* src/vm/jit/verify/icmds.c (ICMD_RET): Check local for type
TYPE_RET.
* src/vm/jit/verify/typeinfo.h (TYPE_IS_RETURNADDRESS): Check type
for TYPE_RET.
* src/vm/jit/verify/typecheck-stackbased-gen.inc: Regenerated.
* src/vm/jit/verify/typecheck-variablesbased-gen.inc: Regenerated.
edwin [Sun, 19 Nov 2006 15:10:02 +0000 (15:10 +0000)]
* src/vm/jit/jit.c (jit_invalidate_code): Activate replacement points
in reverse order. This avoid creating invalid code when rplpoints
within a block overlap each other. It is not a complete solution for
overlapping replacement points, however.
edwin [Sun, 19 Nov 2006 15:08:45 +0000 (15:08 +0000)]
* src/vm/jit/inline/inline.c (translate_javalocals): Adapted to
returnAddress variables in javalocals.
(inline_clone_instruction): Likewise.
edwin [Sun, 19 Nov 2006 15:04:27 +0000 (15:04 +0000)]
* src/vm/jit/stack.c (stack_mark_reached): Fix: Do not compare basic
block addresses. Compare numbers instead.
(stack_mark_reached_from_outvars): Likewise.
edwin [Sun, 19 Nov 2006 15:03:11 +0000 (15:03 +0000)]
* src/vm/jit/jit.h (INS_FLAG_CLASS): Comment that this flag is also
used for PUTFIELDCONST and PUTSTATICCONST.
* src/vm/jit/verify/icmds.c (ICMD_PUTFIELDCONST, ICMD_PUTSTATICCONST):
Honor the INS_FLAG_CLASS flag and set the right type.
* src/vm/jit/verify/typecheck-stackbased-gen.inc: Regenerated.
* src/vm/jit/verify/typecheck-variablesbased-gen.inc: Regenerated.
edwin [Sun, 19 Nov 2006 14:56:32 +0000 (14:56 +0000)]
* src/vm/jit/stack.c (stack_analyse): Show state after last ICMD in
block.
(stack_verbose_show_block): Use show_javalocals_array.
(stack_verbose_show_state): Likewise. Accept iptr == NULL.
edwin [Sun, 19 Nov 2006 14:51:08 +0000 (14:51 +0000)]
* src/vm/jit/replace.c (replace_source_frame_println): Fixed printing
of source stack.
edwin [Sun, 19 Nov 2006 14:50:08 +0000 (14:50 +0000)]
* src/vm/jit/allocator/simplereg.c (simplereg_allocate_temporaries):
Do not clear vv.regoff for ICMD_JSR (we need vv.retaddr later).
twisti [Sat, 18 Nov 2006 22:16:32 +0000 (22:16 +0000)]
* src/vm/properties.c (properties_add): Use unsynced functions of
list.
(properties_get): Likewise.
twisti [Fri, 17 Nov 2006 15:47:28 +0000 (15:47 +0000)]
* src/vm/properties.c (properties_add): Replace entry if it already
exists.
twisti [Thu, 16 Nov 2006 22:14:10 +0000 (22:14 +0000)]
* src/vm/builtin.c (native/native.h)
(native/include/java_lang_Cloneable.h)
(native/include/java_lang_Object.h)
(native/include/java_lang_VMObject.h): Removed.
(builtin_clone_array): Renamed to builtin_clone, reimplemented.
* src/vm/builtin.h (builtin_clone_array): Renamed to builtin_clone.
(BUILTIN_clone): Defined.
* src/vm/loader.c (load_newly_created_array): Use BUILTIN_clone.
* src/native/vm/java_lang_VMObject.c (clone): Removed implementation
and call builtin_clone.
twisti [Thu, 16 Nov 2006 19:45:15 +0000 (19:45 +0000)]
* src/vm/class.h (classinfo): Typedef added.
* src/vm/descriptor.h (typedesc): Likewise.
(methoddesc): Likewise.
* src/vm/field.h (fieldinfo): Likewise.
* src/vm/method.h (methodinfo): Likewise.
* src/vm/references.h (config.h, vm/types.h, vm/class.h)
(vm/descriptor.h, vm/field.h, vm/method.h): Likewise.
(classinfo, methodinfo, fieldinfo, typedesc, methoddesc): Removed.
(constant_classref, classref_or_classinfo, parseddesc): Moved.
twisti [Thu, 16 Nov 2006 15:56:44 +0000 (15:56 +0000)]
* src/vm/vm.c (vm_createjvm): New function.
* src/vm/vm.h (vm_createjvm): Added.
* src/cacao/cacao.c (main): Resolve and call vm_createjvm instead of
JNI_CreateJavaVM.
* src/native/jni.c (jni_init_localref_table): Made non-static.
(JNI_CreateJavaVM): Moved implementation into vm_createjvm.
* src/native/jni.h (jni_init_localref_table): Added.
edwin [Thu, 16 Nov 2006 00:02:00 +0000 (00:02 +0000)]
* src/vm/jit/stack.c (stack_analyse): Fix: Reset deadcode when
re-analysing a block.
edwin [Wed, 15 Nov 2006 23:45:52 +0000 (23:45 +0000)]
* src/vm/jit/verify/generate.pl: Prepared for LOAD instructions with
multiple variants (will be needed for ASTORE).
edwin [Wed, 15 Nov 2006 23:44:01 +0000 (23:44 +0000)]
* src/vm/jit/allocator/simplereg.c (simplereg_allocate_temporaries):
Ignore TYPE_RET interface variables. (Preparation.)
* src/vm/jit/show.c (show_allocation): Prepared for TYPE_RET variables.
(show_variable_intern): Likewise.
* src/vm/jit/verify/typecheck.c (STORE_LOCAL): Made the macro safer.
(STORE_LOCAL_2_WORD): Likewise.
* src/vm/jit/verify/typeinfo.c (typeinfo_print_type): Prepared for
TYPE_RET variables.
* src/vm/jit/replace.c (replace_source_frame_println): Prepared for
void stackslots.
edwin [Wed, 15 Nov 2006 23:37:14 +0000 (23:37 +0000)]
* src/vm/jit/jit.c (jit_recompile): Set verbosecall flag.
edwin [Wed, 15 Nov 2006 23:36:36 +0000 (23:36 +0000)]
* src/vm/jit/replace.c (replace_create_replacement_points): Fix: Only
put a replacement point at a back branch target if the block does not
contain any other replacement point.
(replace_read_executionstate): Better debugging helpers.
(replace_me): Likewise.
* src/vm/jit/replace.h (sourceframe_t): Added a field for debugging.
edwin [Wed, 15 Nov 2006 23:33:48 +0000 (23:33 +0000)]
* src/vm/jit/stack.c (stack_reanalyse_block): Encode returnAddresses
in the javalocals array.
(stack_analyse): Likewise.
* src/vm/jit/replace.c (replace_create_replacement_point): Store
returnAddresses in replacement points.
(replace_create_replacement_points): Encode returnAddresses in
javalocals.
(replace_read_executionstate): Ignore returnAddresses.
(replace_write_executionstate): Likewise.
(replace_find_replacement_point): Match returnAddresses.
edwin [Wed, 15 Nov 2006 23:30:16 +0000 (23:30 +0000)]
* src/vm/jit/show.h (show_javalocals_array): New function.
* src/vm/jit/show.c (show_javalocals_array): New function.
(show_icmd): Prepared for showing returnAddresses.
* src/vm/jit/replace.c (replace_replacement_point_println): Prepared
for showing constant returnAddresses.
* src/vm/jit/replace.h (rplalloc): Made type unsigned, so it will be
able to hold TYPE_RET (8).
* src/vm/jit/jit.h (s2_operand_t): Added field `retaddrnr` that will
be used by ASTORE with returnAddresses.
edwin [Wed, 15 Nov 2006 23:24:46 +0000 (23:24 +0000)]
* src/vm/jit/inline/inline.c (inline_inline_intern): Removed some
unused code.
edwin [Wed, 15 Nov 2006 23:23:59 +0000 (23:23 +0000)]
* src/vm/jit/i386/codegen.c (codegen): Fix: Put RETURN replacement
points before the emit_load. This code needs cleaning up.
edwin [Wed, 15 Nov 2006 23:21:26 +0000 (23:21 +0000)]
* src/vm/jit/replace.c: Partial implementation of synchronization
slot translation. Translating synchronized INLINE <-> CALL needs more
work.
edwin [Wed, 15 Nov 2006 23:19:07 +0000 (23:19 +0000)]
* src/vm/jit/replace.c (replace_find_replacement_poin): Fix: Compare
both id and method when searching a replacement point.
(replace_executionstate_println): Prettier printing.
* src/vm/jit/replace.h (replace_pop_activation_record): Removed
prototype.
edwin [Wed, 15 Nov 2006 23:17:07 +0000 (23:17 +0000)]
* src/vm/jit/inline/inline.c (inline_instruction): New function.
Factored code out of other functions generation instructions.
edwin [Wed, 15 Nov 2006 23:15:13 +0000 (23:15 +0000)]
* src/vm/jit/jit.h (insinfo_inline): Added field `paramcount`.
* src/vm/jit/inline/inline.c (inline_generate_sync_builtin): New
function. Generate explicit MONITORENTER/EXIT instructions.
(emit_inlining_prolog): Moved INLINE_START to the beginning of the
prolog. Explicit synchronization.
(emit_inlining_epilog): Explicit synchronization.
(rewrite_method): Use epilog_instructioncount.
(inline_analyse_callee): Explicit synchronization.
* src/vm/jit/i386/codegen.c (ICMD_INLINE_START): Removed implicit
synchronization.
(ICMD_INLINE_END): Likewise.
* src/vm/jit/replace.c (replace_create_replacement_point): Handle
parameters for top frames.
(replace_create_replacement_points): Likewise.
(replace_read_executionstate): Likewise.
(replace_write_executionstate): Likewise.
(replace_me): Likewise.
edwin [Wed, 15 Nov 2006 23:08:21 +0000 (23:08 +0000)]
* src/vm/jit/replace.h (RPLALLOC_STACK, RPLALLOC_PARAM, RPLALLOC_SYNC):
New constants.
* src/vm/jit/replace.c (replace_push_activation_record): Fix: Decrement
SP _before_ writing the return address.
(replace_me): More logging.
(replace_replacement_point_println): More logging.
(replace_executionstate_println): Prettier printing.
edwin [Wed, 15 Nov 2006 23:02:21 +0000 (23:02 +0000)]
* src/vm/jit/code.h (codeinfo): Added field `invalid`. (Should become
a flag, later.)
* src/vm/jit/jit.c (jit_recompile): Fixed for first compilation. Do not
refuse to recompile.
edwin [Wed, 15 Nov 2006 22:59:31 +0000 (22:59 +0000)]
* src/vm/jit/inline/inline.c (inline_inline_intern): Do not inline
abstract methods (need to search for single implementation).
edwin [Wed, 15 Nov 2006 22:47:31 +0000 (22:47 +0000)]
* src/vm/jit/replace.c (replace_me): Small cleanup.
edwin [Wed, 15 Nov 2006 22:47:03 +0000 (22:47 +0000)]
* src/vm/jit/inline/inline.c (create_body_block): Do not translate
javalocals for dead code.
(inline_inline_intern): Fixed flag check.
edwin [Wed, 15 Nov 2006 22:46:10 +0000 (22:46 +0000)]
* src/vm/method.c (method_printflags): Print MONOMORPHIC and
IMPLEMENTED flags.
twisti [Wed, 15 Nov 2006 18:26:40 +0000 (18:26 +0000)]
* src/vm/properties.c (properties_init) [ENABLE_JAVASE]: Allocate the
utsname structure on the heap.
projects / cacao.git / log