edwin [Mon, 2 Oct 2006 00:08:20 +0000 (00:08 +0000)]
* tests/regression/jasmin/runtest: Made it a bash script, so it works
on crappy fp98.
--HG--
branch : unified_variables
edwin [Mon, 2 Oct 2006 00:06:09 +0000 (00:06 +0000)]
* tests/regression/jasmin/runtest: Do not use grep -o.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 23:51:23 +0000 (23:51 +0000)]
* src/vm/jit/mips/emit.c (emit_copy): Fixed arguments to
codegen_reg_of_var.
* src/vm/jit/powerpc64/emit.c (emit_copy): Likewise.
* src/vm/jit/mips/codegen.c (codegen): Define varindex.
* src/vm/jit/powerpc64/codegen.c (codegen): Likewise. Fixed arguments
to codegen_reg_of_var. Replaced codegen_reg_of_var with
codegen_reg_of_dst.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 23:37:04 +0000 (23:37 +0000)]
* src/vm/jit/powerpc64/codegen.c: Ported to unified_variables.
* src/vm/jit/powerpc64/codegen.h: Likewise.
* src/vm/jit/powerpc64/emit.c: Likewise.
* src/vm/jit/powerpc64/linux/md-abi.c: Likewise.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 23:00:39 +0000 (23:00 +0000)]
Merged r5616 from trunk:
* src/native/jni.c: Prefix all JNI functions with _Jv_JNI_, as gcj
does. This should prevent any linking problems.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 22:55:11 +0000 (22:55 +0000)]
* src/vm/jit/mips/codegen.c: Ported to unified_variables.
* src/vm/jit/mips/codegen.h: Likewise.
* src/vm/jit/mips/emit.c: Likewise.
* src/vm/jit/mips/md-abi.c: Likewise.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 20:52:48 +0000 (20:52 +0000)]
* src/vm/jit/powerpc/codegen.c (codegen): Cleaned up unified_variables
changes.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 20:49:49 +0000 (20:49 +0000)]
* src/vm/jit/i386/codegen.c (codegen): Cleaned up unified_variables
changes.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 20:42:31 +0000 (20:42 +0000)]
* src/vm/jit/x86_64/codegen.c (codegen): Cleaned up unified_variables
changes.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 20:37:33 +0000 (20:37 +0000)]
* src/vm/jit/alpha/codegen.c (codegen): Cleaned up unified_variables
changes.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 20:08:21 +0000 (20:08 +0000)]
* tests/regression/jasmin/runtest: Use default JASMIN_JAR, if given.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 18:01:26 +0000 (18:01 +0000)]
* src/vm/jit/codegen-common.c (codegen_reg_of_var): Fixed typo in
ARM code.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 15:44:13 +0000 (15:44 +0000)]
* src/vm/jit/verify/typeinfo.c (typevector_store_retaddr): Do not
invalidate the variable at index i-1.
(typevector_store_twoword): Removed.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 15:25:21 +0000 (15:25 +0000)]
* src/vm/jit/verify/typecheck.c (typecheck): Added debug print of
the reverse local map.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 14:43:18 +0000 (14:43 +0000)]
* src/vm/vm.c (vm_compile_all): Only use if !defined(NDEBUG).
(vm_compile_method): Likewise.
--HG--
branch : unified_variables
edwin [Sun, 1 Oct 2006 14:37:17 +0000 (14:37 +0000)]
* src/vm/jit/verify/typeinfo.h: Disabled TYPECHECK_VERBOSE.
--HG--
branch : unified_variables
edwin [Sat, 30 Sep 2006 23:28:27 +0000 (23:28 +0000)]
* src/vm/jit/jit.c (jit_compile_intern): Removed commented out
debugging code.
--HG--
branch : unified_variables
edwin [Sat, 30 Sep 2006 23:12:05 +0000 (23:12 +0000)]
* src/vm/jit/allocator/simplereg.c (reg_new_temp): Simplified.
(reg_free_temp): Formatted.
--HG--
branch : unified_variables
edwin [Sat, 30 Sep 2006 23:06:36 +0000 (23:06 +0000)]
* src/vm/jit/powerpc/linux/md-abi.c: Use VAR and VAROP macros.
* src/vm/jit/powerpc/darwin/md-abi.c: Likewise.
* src/vm/jit/alpha/codegen.c: Likewise.
* src/vm/jit/alpha/codegen.h: Likewise.
* src/vm/jit/alpha/md-abi.c: Likewise.
* src/vm/jit/show.c: Likewise.
* src/vm/jit/verify/typecheck.c: Likewise.
* src/vm/jit/allocator/simplereg.c: Likewise.
* src/vm/jit/i386/codegen.h: Likewise.
* src/vm/jit/parse.c: Likewise.
* src/vm/jit/x86_64/emit.c: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.
* src/vm/jit/x86_64/codegen.h: Likewise.
* src/vm/jit/x86_64/md-abi.c: Likewise.
* src/vm/jit/codegen-common.c: Likewise.
--HG--
branch : unified_variables
edwin [Sat, 30 Sep 2006 22:45:13 +0000 (22:45 +0000)]
* src/vm/jit/i386/codegen.c (codegen): Use VAR and VAROP macros.
(codegen_insert_phi_moves): Likewise.
--HG--
branch : unified_variables
edwin [Sat, 30 Sep 2006 22:24:28 +0000 (22:24 +0000)]
Merged r5591 from trunk:
* src/native/jni.c (GetVersion): Prefixed with _Jv_, we should do that
with all JNI functions.
--HG--
branch : unified_variables
edwin [Sat, 30 Sep 2006 22:22:52 +0000 (22:22 +0000)]
Merged r5589 and r5590 from trunk:
* configure.ac: Fixed CFLAGS for cygwin.
* src/threads/native/threads.c: Inserted asserts for cygwin.
* src/vm/jit/i386/cygwin/Makefile.am: See below.
* src/vm/jit/i386/cygwin/md-asm.h: Added.
* src/vm/jit/i386/cygwin/md-os.c: Inserted asserts.
* src/vm/jit/i386/cygwin/ucontext.c: Added 3rd party file.
* src/vm/jit/i386/cygwin/ucontext.h: Added 3rd party file.
* src/cacao/.cvsignore, src/cacaoh/.cvsignore,
src/vm/jit/tools/.cvsignore: Added ignores for cygwin and
modified properties accordingly.
--HG--
branch : unified_variables
christian [Sat, 30 Sep 2006 11:04:41 +0000 (11:04 +0000)]
* src/vm/jit/alpha/codegen.c (codegen): Changed to use the macros VAR and VAROP.
--HG--
branch : unified_variables
christian [Sat, 30 Sep 2006 10:16:48 +0000 (10:16 +0000)]
* src/vm/jit/x86_64/codegen.c (codegen): Changed to use the macros VAR and VAROP.
--HG--
branch : unified_variables
edwin [Fri, 29 Sep 2006 14:02:39 +0000 (14:02 +0000)]
* src/vm/jit/allocator/simplereg.c (reg_free_temp_func): Handle
packed registers.
(new_allocate_scratch_registers): Likewise.
--HG--
branch : unified_variables
edwin [Fri, 29 Sep 2006 13:33:22 +0000 (13:33 +0000)]
Merged r5540 from trunk:
* configure.ac: Cygwin OS dir added.
* src\lib\Makefile.am: Now checks for "zip.exe" as well
* src\vm\jit\i386\Makefile.am: Added Cygwin OS dir.
* src\vm\jit\i386\cygwin\Makefile.am: Added.
* src\vm\jit\i386\cygwin\md-os.c: Added. Only contains
dummy signal handlers.
* src\vm\builtin.c: Undefine Bias for Cygwin because
Windows uses this define.
* src\vm\signal.c: No signal handlers for Cygwin.
--HG--
branch : unified_variables
edwin [Fri, 29 Sep 2006 12:46:15 +0000 (12:46 +0000)]
Merged r5573, r5574, r5577, r5578, and r5579 from trunk.
* src/cacao/cacao.c (vm/vm.h): Added.
* src/cacao/Makefile.am [!ENABLE_LIBJVM] (CACAO_LIB): Link libjvm.la.
* src/vm/jit/powerpc/darwin/md-asm.h (md_codegen_get_pv_from_pc):
Added stub define.
* src/vm/jit/powerpc/asmpart.S (L_md_codegen_get_pv_from_pc$stub):
Added.
* src/cacaoh/cacaoh.c (cacaoh_options_prepare): Set nOptions, this was
deleted accidentally.
* src/vm/vm.c (vm_create): Added installation of exit handler.
(vm_run): New function.
(vm_get_mainclass_from_jar): Likewise.
(vm_compile_all): Likewise.
(vm_compile_method): Likewise.
* src/vm/vm.h (vm_run): New function.
* src/vm/options.c (options_prepare): Removed.
* src/vm/options.h (options_prepare): Likewise.
* src/cacao/cacao.c (getmainclassnamefromjar): Removed.
(main): Moved most stuff to vm-functions and load libjvm with dlopen
and resolve symbols for ENABLE_LIBJVM.
(cacao_options_prepare): New function.
* src/cacao/Makefile.am (CACAO_LIBS): New variable.
(cacao_LDADD): Use CACAO_LIBS.
* src/native/native.c (native_init): Set mainhandle to libjvm for
ENABLE_LIBJVM.
* src/cacaoh/cacaoh.c (cacaoh_prepare_options): New function.
* src/native/jni.c (JNI_CreateJavaVM): Renamed jvm to vm.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 22:33:48 +0000 (22:33 +0000)]
* src/vm/jit/powerpc64: Merged changes from r5403 to r5548 from trunk.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 20:38:28 +0000 (20:38 +0000)]
Merged r5547 from trunk:
* src/native/jni.c (FindClass): Removed architecture #ifdef's.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 20:33:05 +0000 (20:33 +0000)]
Merged r5543 from trunk:
* src/vm/jit/sparc64/codegen.c: Completed port to new instruction format.
* src/vm/jit/sparc64/md-abi.h: Likewise.
* src/vm/jit/sparc64/emit.c: Likewise.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 20:31:33 +0000 (20:31 +0000)]
Merged r5541 from trunk:
* src/vm/jit/powerpc/emit.c (vm/jit/emit.h): Renamed to
vm/jit/emit-common.h.
(emit_load_s1, emit_load_s2, emit_load_s3, emit_load_s1_low)
(emit_load_s2_low, emit_load_s3_low, emit_load_s1_high)
(emit_load_s2_high, emit_load_s3_high) (emit_store_dst): Removed.
* src/vm/jit/powerpc/codegen.c (vm/jit/emit.h): Renamed to
vm/jit/emit-common.h.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 20:29:44 +0000 (20:29 +0000)]
Merged r5540 and r5542 from trunk:
* configure.ac: Cygwin OS dir added.
* src\lib\Makefile.am: Now checks for "zip.exe" as well
* src\vm\jit\i386\Makefile.am: Added Cygwin OS dir.
* src\vm\jit\i386\cygwin\Makefile.am: Added.
* src\vm\jit\i386\cygwin\md-os.c: Added. Only contains
dummy signal handlers.
* src\vm\builtin.c: Undefine Bias for Cygwin because
Windows uses this define.
* src\vm\signal.c: No signal handlers for Cygwin.
* src/vm/jit/i386/cygwin/.cvsignore: New file.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 20:23:30 +0000 (20:23 +0000)]
Merged r5539 from trunk:
* src/vm/jit/mips/emit.c (emit_exception_stubs): Don't use
SIZEOF_VOID_P for getting return address, this is wrong on MIPS32.
* src/vm/jit/mips/codegen.c (createnativestub): Likewise.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 20:20:18 +0000 (20:20 +0000)]
Merged r5538 from trunk:
* src/native/native.c (native_insert_char): New function.
(native_resolve_function): Use native_insert_char function to fill
name buffer.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 20:19:07 +0000 (20:19 +0000)]
Merged r5537 from trunk:
* src/vm/jit/mips/codegen.c (codegen): Make fieldinfo,
unresolved_field local variables, better code for ICMD_PUTFIELD.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 20:18:10 +0000 (20:18 +0000)]
Merged r5536 from trunk:
* src/vm/jit/mips/emit.c (vm/jit/emit.h): Renamed to
vm/jit/emit-common.h.
(emit_load_s1, emit_load_s2, emit_load_s3, emit_store_dst): Removed.
* src/vm/jit/mips/codegen.c (vm/jit/emit.h): Renamed to
vm/jit/emit-common.h.
(codegen): Some updates to field instructions.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 20:17:03 +0000 (20:17 +0000)]
Merged r5535 from trunk:
* src/vm/jit/mips/codegen.c (codegen): Moved ICMD_IREMPOW2 and
ICMD_LREMPOW2.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 20:16:07 +0000 (20:16 +0000)]
Merged r5534 from trunk:
* src/vm/jit/alpha/emit.c (vm/jit/emit.h): Renamed to
vm/jit/emit-common.h.
(emit_load_s1, emit_load_s2, emit_load_s3, emit_store_dst): Removed.
* src/vm/jit/alpha/codegen.c (vm/jit/emit.h): Renamed to
vm/jit/emit-common.h.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 20:13:20 +0000 (20:13 +0000)]
Merged r5531 and r5532, ported to unified_variables:
* src/vm/jit/i386/md-emit.h: Renamed to src/vm/jit/i386/emit.h.
* src/vm/jit/i386/emit.c (vm/jit/i386/md-emit.h): Renamed to
vm/jit/i386/emit.h.
(vm/jit/emit.h): Renamed to vm/jit/emit-common.h.
(emit_load_s1, emit_load_s2, emit_load_s3, emit_load_s1_low)
(emit_load_s2_low, emit_load_s1_high, emit_load_s2_high)
(emit_store_dst): Removed.
* src/vm/jit/i386/codegen.c (vm/jit/i386/md-emit.h): Renamed to
vm/jit/i386/emit.h.
(vm/jit/emit.h): Renamed to vm/jit/emit-common.h.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 19:53:05 +0000 (19:53 +0000)]
Merged r5530 from trunk:
* src/vm/jit/emit.h: Renamed to src/vm/jit/emit-common.h.
* src/vm/jit/emit-common.c: New file.
* src/vm/jit/Makefile.am (noinst_HEADERS): Removed emit.h.
(libjit_la_SOURCES): Added emit-common.[ch].
* src/vm/jit/x86_64/emit.c (emit_load_s1, emit_load_s2, emit_load_s3)
(emit_store_dst): Removed.
* src/vm/jit/x86_64/codegen.c: Changed include names.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 19:46:28 +0000 (19:46 +0000)]
Merged r5529 from trunk:
* src/vm/jit/x86_64/md-emit.h: Renamed to src/vm/jit/x86_64/emit.h.
--HG--
branch : unified_variables
rename : src/vm/jit/x86_64/md-emit.h => src/vm/jit/x86_64/emit.h
edwin [Thu, 28 Sep 2006 19:36:16 +0000 (19:36 +0000)]
Merged r5527 from trunk:
* src/native/include/.cvsignore: Added sun_misc_Unsafe.h.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 19:33:24 +0000 (19:33 +0000)]
Merged r5526 from trunk:
* src/native/vm/sun_misc_Unsafe.c: New file:
* src/native/vm/Makefile.am (libnativevm_la_SOURCES): Added
sun_misc_Unsafe.c.
* src/native/include/Makefile.am (GEN_HEADER_FILES): Added
sun_misc_Unsafe.h.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 19:31:27 +0000 (19:31 +0000)]
Merged r5525 from trunk:
* tests/regression/clinitexception.2output: Updated to GNU Classpath
0.92.
* tests/regression/extest.2output: Likewise.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 19:30:03 +0000 (19:30 +0000)]
Merged r5509 from trunk:
* src/vm/jit/show.c (new_show_basicblock): Print predecessors only for
stage >= SHOW_CFG.
* src/vm/jit/show.h (SHOW_CFG): Defined.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 19:24:16 +0000 (19:24 +0000)]
Merged r5506 from trunk:
* src/native/jni.c (GetDirectBufferAddress): Check if address is NULL.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 19:22:33 +0000 (19:22 +0000)]
Merged r5502 from trunk, with additional fixes:
* src/vm/jit/jit.c (jit_compile_intern): Moved cfg_build call after
stack_analyse, because of JSR elimination.
* src/vm/jit/cfg.c (cfg_build): Updated to be run after stack_analyse.
Fixes:
* src/vm/jit/cfg.c (cfg_build): Skip NOPs at the end of the block.
Handle JSR and RET correctly. Use bptr->next in the default case
of falling into the following block.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 18:45:10 +0000 (18:45 +0000)]
Merged r5489 from trunk:
* configure.ac (INTRP_CFLAGS): Moved a bit.
* src/vm/jit/intrp/Makefile.am (CFLAGS): Don't define.
(AM_CFLAGS): Define as INTRP_CFLAGS, that seems to be the correct way.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 18:42:45 +0000 (18:42 +0000)]
* src/vm/jit/sparc64/codegen.c (codegen): Replaced catchtype.cls
with catchtype.any to reflect that it can be a classref or a
classinfo. (Also see r5488.)
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 18:35:13 +0000 (18:35 +0000)]
Merged r5476 from trunk:
Merged sparc64 changes from trunk.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 18:31:47 +0000 (18:31 +0000)]
Merged r5462 from trunk:
* src/vm/jit/parse.c (new_parse): Added a ICMD_NOP at the end of each
basic block, if we have reorder enabled.
--HG--
branch : unified_variables
edwin [Thu, 28 Sep 2006 17:02:56 +0000 (17:02 +0000)]
* src/vm/jit/reg.h (registerdata): New fields regcopycount,
memcopycount, and memcopycountsize.
* src/vm/jit/allocator/simplereg.c (reg_init_temp): Take jitdata
argument, initialize copy counts.
(reg_free_temp): Simplified a bit.
(reg_free_temp_func): Check if freeing a copy.
(reg_alloc_dup): New function.
(new_allocate_scratch_registers): Implemented DUP coalescing using a
copy count for each register/memory regoff.
--HG--
branch : unified_variables
edwin [Tue, 19 Sep 2006 09:41:53 +0000 (09:41 +0000)]
* tests/regression/jasmin/runtest: Display only the basename of tests.
* tests/regression/jasmin/Makefile.am: Use $(srcdir) to locate the
runtest script.
--HG--
branch : unified_variables
edwin [Fri, 15 Sep 2006 20:18:01 +0000 (20:18 +0000)]
* src/vm/jit/stack.c (new_stack_analyse): Set stackslot SAVEDVAR for
MULTIANEWARRAY.
--HG--
branch : unified_variables
christian [Fri, 15 Sep 2006 17:19:16 +0000 (17:19 +0000)]
src/vm/jit/allocator/simplereg.c (reg_free_temp_func): New var structures also for SUPPORT_COMBINE_INTEGER_REGISTERS.
--HG--
branch : unified_variables
christian [Fri, 15 Sep 2006 17:05:58 +0000 (17:05 +0000)]
* src/vm/jit/ppc/emit.c (emit_load): Changed to new variable
structure (varinfo * instead of stackptr) and the use of Macros
IS_INMEMORY and VAROP.
(emit_store): Likewise.
(emit_copy): Likewise.
(emit_load_high): Likewise.
(emit_load_low): Likewise.
(emit_load_s1): Likewise.
(emit_load_s1_low): Likewise.
(emit_load_s1_high): Likewise.
(emit_load_s2): Likewise.
(emit_load_s2_low): Likewise.
(emit_load_s2_high): Likewise.
(emit_load_s3): Likewise.
(emit_load_s3_low): Likewise.
(emit_load_s3_high): Likewise.
(emit_store_dst): Likewise.
* src/vm/jit/ppc/codegen.c (codegen): Changed to new variable
structure (varinfo * instead of stackptr, adapting of Argument
handling, no interface copying anymore at BB Boundaries ) and the use
of Macros IS_INMEMORY, VAR and VAROP. ICMD_xSTORE and ICMD_xLOAD use now
emit_copy. ICMD_DUPx and ICMD_SWAP were replaced by ICMD_MOVE and ICMD_COPY. Invars are now regarded for EXH and JSR
Blocks. Changed ICMD_RET handling like with i386.
* src/vm/jit/ppc/codegen.h (M_COPY): Changed to new variable
structure.
* src/vm/jit/ppc/linux/md-abi.c (md_return_alloc): Changed to new
variable structure.
* src/vm/jit/ppc/darwin/md-abi.c (md_return_alloc): Changed to new
variable structure.
--HG--
branch : unified_variables
edwin [Fri, 15 Sep 2006 16:55:46 +0000 (16:55 +0000)]
* tests/regression/jasmin/Makefile.am: Added new test.
* tests/regression/jasmin/test_dup_x2_interface_slots.j: New test.
* tests/regression/jasmin/test_dup_x1_interface_slots.j: Changed
second loop to also use DUP_X1.
--HG--
branch : unified_variables
edwin [Fri, 15 Sep 2006 16:44:37 +0000 (16:44 +0000)]
* src/vm/jit/stack.c (MOVE_TO_TEMP): New macro.
(new_stack_analyse): Use MOVE_TO_TEMP to save sources for all
DUP*, SWAP instructions where it is necessary.
* src/vm/jit/parse.c (new_parse): Reserve additional NOPs for
DUP* instructions.
--HG--
branch : unified_variables
edwin [Fri, 15 Sep 2006 16:39:34 +0000 (16:39 +0000)]
* tests/regression/jasmin/test_dup_x1_interface_slots.j: New test.
* tests/regression/jasmin/test_dup2_x1.j: Added dup2_x1 with
interface slots.
* tests/regression/jasmin/Makefile.am: Added new test.
--HG--
branch : unified_variables
christian [Fri, 15 Sep 2006 16:31:47 +0000 (16:31 +0000)]
* src/vm/jit/alpha/emit.c (emit_load): Changed to new variable
structure (varinfo * instead of stackptr) and the use of Macro
IS_INMEMORY.
(emit_store): Likewise.
(emit_copy): Likewise.
(emit_load_s1): Likewise and reuse emit_load.
(emit_load_s2): Likewise and reuse emit_load.
(emit_load_s3): Likewise and reuse emit_load.
(emit_store_dst): Likewise and reuse emit_store.
* src/vm/jit/alpha/codegen.c (codegen): Changed to new variable
structure (varinfo * instead of stackptr, adapting of Argument
handling, no interface copying anymore at BB Boundaries ) and the use
of Macro IS_INMEMORY. ICMD_xSTORE and ICMD_xLOAD use now
emit_copy. ICMD_DUPx and ICMD_SWAP were replaced by ICMD_MOVE and ICMD_COPY. Invars are now regarded
for EXH and JSR Blocks. Changed ICMD_RET handling like with i386.
* src/vm/jit/alpha/codegen.h (M_COPY): Changed to new variable
structure.
* src/vm/jit/alpha/md-abi.c (md_return_alloc): Changed to new
variable structure.
--HG--
branch : unified_variables
edwin [Fri, 15 Sep 2006 15:52:02 +0000 (15:52 +0000)]
* src/vm/jit/stack.c (new_stack_analyse): Add a third move at the
beginning of a swap operation to save the src1 operand, unless it
is in a temporary variable.
* src/vm/jit/parse.c (new_parse): Reserve three ICMDs for SWAP.
--HG--
branch : unified_variables
edwin [Fri, 15 Sep 2006 15:44:26 +0000 (15:44 +0000)]
* tests/regression/jasmin/Makefile.am: Added/renamed tests.
--HG--
branch : unified_variables
edwin [Fri, 15 Sep 2006 14:43:22 +0000 (14:43 +0000)]
* src/vm/jit/verify/typecheck.c: Cleanup and documentation.
--HG--
branch : unified_variables
edwin [Fri, 15 Sep 2006 14:18:19 +0000 (14:18 +0000)]
* src/vm/jit/verify/typecheck.c (typestate_reach): Removed check
against uninitialized object on stack/in locals during backward
branch. It is unnecessary, and not done by the RI. Reference:
Alessandro Coglio
Improving the official specification of Java bytecode verification
Proceedings of the 3rd ECOOP Workshop on Formal Techniques for
Java Programs
June 2001
citeseer.ist.psu.edu/article/coglio03improving.html
(verify_basic_block): Removed check against uninitialized object in
locals within try block. See above.
* tests/regression/jasmin/
test_verify_fail_backward_with_new_in_local.j: Renamed.
* tests/regression/jasmin/test_verify_fail_new_in_local_within_try.j:
Renamed.
* tests/regression/jasmin/
test_verify_unspecced_ok_backward_with_new_on_stack.j: New test.
* tests/regression/jasmin/
test_verify_fail_backward_with_new_on_stack.j: Fixed.
--HG--
branch : unified_variables
rename : tests/regression/jasmin/test_verify_fail_backward_with_new_in_local.j => tests/regression/jasmin/test_verify_unspecced_ok_backward_with_new_in_local.j
edwin [Fri, 15 Sep 2006 13:08:41 +0000 (13:08 +0000)]
* tests/regression/jasmin/runtest: Use [ \t] instead of \s in the
regex for sed, as this seems to be more portable.
--HG--
branch : unified_variables
edwin [Fri, 15 Sep 2006 13:03:22 +0000 (13:03 +0000)]
* src/vm/jit/verify/typecheck.c (typecheck_reset_flags): Mark unreached
blocks as BBDELETED. The only case in which this can happen to a block
that was considered reachable by the stack analysis, is in the case of
an exception handler which only covers blocks that have no PEIs.
--HG--
branch : unified_variables
edwin [Fri, 15 Sep 2006 12:51:12 +0000 (12:51 +0000)]
* src/vm/resolve.c (new_resolve_field_lazy): Check jd->flags instead
of opt_verify.
(new_resolve_method_lazy): Likewise.
--HG--
branch : unified_variables
christian [Fri, 15 Sep 2006 12:48:24 +0000 (12:48 +0000)]
* src/vm/jit/stack.c (new_stack_analyse): Stackslot flags have to be set for SAVEDVARs, too.
--HG--
branch : unified_variables
edwin [Fri, 15 Sep 2006 11:02:50 +0000 (11:02 +0000)]
* src/vm/jit/verify/typecheck.c (verify_basic_block): Fix check for
active exception handlers. We may not compare pointers here, as the
blocks are not allocated with rising memory addresses. Use the
block numbers to compare ranges.
--HG--
branch : unified_variables
christian [Fri, 15 Sep 2006 09:19:11 +0000 (09:19 +0000)]
* src/vm/jit/x86_64/emit.c (emit_load): Changed to new variable
structure (varinfo * instead of stackptr) and the use of Macro
IS_INMEMORY.
(emit_store): Likewise.
(emit_copy): Likewise.
(emit_ishift): Likewise.
(emit_lshift): Likewise.
(emit_load_s1): Likewise and reuse emit_load.
(emit_load_s2): Likewise and reuse emit_load.
(emit_load_s3): Likewise and reuse emit_load.
(emit_store_dst): Likewise and reuse emit_store.
* src/vm/jit/x86_64/md-emit.h: Adapded prototypes.
* src/vm/jit/x86_64/codegen.c (codegen): Changed to new variable
structure (varinfo * instead of stackptr, adapting of Argument
handling, no interface copying anymore at BB Boundaries ) and the use
of Macro IS_INMEMORY. ICMD_xSTORE and ICMD_xLOAD use now
emit_copy. Invars are now regarded for EXH and JSR Blocks.
* src/vm/jit/x86_64/codegen.h (M_COPY): Changed to new variable
structure.
* src/vm/jit/x86_64/md-abi.c (md_return_alloc): Changed to new
variable structure.
* src/vm/jit/stack.c (new_stack_analyse): Only try to preallocate
return stackslots, if they hold a TEMPVAR. Some preparation for SSA.
* src/vm/jit/jit.c (jit_compile_intern): Had to disable
replace_create_replacement_points(jd).
* src/vm/jit/show.c (new_show_icmd): Show s1 of [FIDL]RETURN like for
ARETURN.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 22:51:12 +0000 (22:51 +0000)]
* configure.ac: Generate tests/regression/jasmin/Makefile.
* tests/regression/Makefile.am: Added subdir jasmin.
* tests/regression/jasmin/Makefile.am: New file.
* tests/regression/jasmin/runtest: Check if jasmin .jar is available.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 22:49:37 +0000 (22:49 +0000)]
* src/vm/jit/verify/typecheck.c (verify_basic_block): Change
destination variable of GETFIELD/GETSTATIC after all checks have been
performed, so there is no problem if destination == source.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 21:29:31 +0000 (21:29 +0000)]
* tests/regression/jasmin/test_verify_fail_retaddr_as_object.j:
New test.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 21:23:47 +0000 (21:23 +0000)]
* tests/regression/jasmin/test_verify_fail_backward_with_new_in_local.j:
New test.
* tests/regression/jasmin/test_verify_fail_new_in_local_within_try.j:
Likewise.
* tests/regression/jasmin/test_verify_fail_double_local_index.j:
Likewise.
* tests/regression/jasmin/test_verify_fail_backward_with_new_on_stack.j:
Likewise.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 20:55:04 +0000 (20:55 +0000)]
* tests/regression/jasmin/test_verify_fail_long_local.j:
Added comment.
* tests/regression/jasmin/test_verify_fail_double_overwritten.j:
New test.
* tests/regression/jasmin/test_verify_fail_invoke_basic_type.j:
New test.
* tests/regression/jasmin/test_verify_fail_long_overwritten.j:
New test.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 20:36:33 +0000 (20:36 +0000)]
* src/vm/jit/verify/typecheck.c (typecheck_invalidate_locals):
New function.
(verify_basic_block): Invalidate locals that share space with the
stored local.
(typecheck): Build reverse map of locals.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 18:56:49 +0000 (18:56 +0000)]
* src/vm/jit/reg.h (varinfo): Added typeinfo member.
* src/vm/jit/verify/typecheck.c: Ported to unified_variables.
* src/vm/jit/verify/typeinfo.h: Likewise.
* src/vm/jit/verify/typeinfo.c: Likewise.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 18:55:03 +0000 (18:55 +0000)]
* src/vm/resolve.c (resolve_class_from_name): RESOLVE_VERBOSE changes.
(resolve_classref_or_classinfo): Likewise.
(resolve_class_from_typedesc): Likewise.
(resolve_and_check_subtype_set): Likewise.
(new_create_unresolved_field): Likewise.
(new_create_unresolved_method): Likewise.
(new_resolve_field_verifier_checks): Ported to unified_variables.
(new_resolve_field_lazy): Likewise.
(new_resolve_method_verifier_checks): Likewise.
(new_resolve_method_lazy): Likewise.
(new_constrain_unresolved_field): Likewise.
(unresolved_subtype_set_from_typeinfo): Take classname directly,
instead of the constant_classref *.
(create_unresolved_class): Pass classname to
unresolved_subtype_set_from_typeinfo.
(new_constrain_unresolved_method): Ported to unified_variables.
Pass classname to unresolved_subtype_set_from_typeinfo. (This should
fix a bug when fieldref->p.classref was invalid.)
(new_constrain_unresolved_method): Ported to unified_variables.
Pass classname to unresolved_subtype_set_from_typeinfo.
* src/vm/resolve.h (jit/reg.h): Include this before typeinfo.h
(new_resolve_method_lazy): Added jd parameter.
(new_resolve_field_lazy): Likewise.
(new_constrain_unresolved_field): Likewise.
(new_constrain_unresolved_method): Likewise.
* src/vm/jit/parse.c (new_parse): Pass jd to resolve functions.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 18:45:20 +0000 (18:45 +0000)]
* src/vm/jit/show.c (new_show_method): Only show allocation of locals
if stage is at least SHOW_REGS.
(new_show_icmd): Show class for CHECKCAST.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 18:44:10 +0000 (18:44 +0000)]
* src/vm/jit/stack.c (stack_create_invars): Add extra locals needed
by the verifier.
(stack_create_invars_from_outvars): Likewise.
(new_stack_analyse): Create inlocals for first block. Allow ASTORE of
returnAddress values.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 18:40:21 +0000 (18:40 +0000)]
* src/vm/jit/parse.c (new_parse): Commented calculation of varcount
and added added extra variables that will be needed by the verifier.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 18:36:20 +0000 (18:36 +0000)]
* src/vm/global.h (VERIFIER_EXTRA_LOCALS): New constant.
(VERIFIER_EXTRA_VARS): Likewise.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 18:20:28 +0000 (18:20 +0000)]
* src/vm/class.c (class_classref_or_classinfo_print): New function.
(class_classref_or_classinfo_println): Likewise.
* src/vm/class.h (class_classref_or_classinfo_print): New function.
(class_classref_or_classinfo_println): Likewise.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 18:16:06 +0000 (18:16 +0000)]
* src/vm/jit/jit.h (VAROP): New macro for accessing variable operands.
(VAR): New macro for getting a variable from a varindex.
--HG--
branch : unified_variables
edwin [Thu, 14 Sep 2006 16:46:47 +0000 (16:46 +0000)]
* tests/regression/jasmin/test_verify_fail_load_wrong_type.j:
New test.
* tests/regression/jasmin/
test_verify_fail_load_wrong_type_within_block.j: New test.
* tests/regression/jasmin/test_verify_fail_local_index.j: New test.
* tests/regression/jasmin/test_verify_fail_long_local_index.j:
New test.
* tests/regression/jasmin/test_verify_fail_long_local.j: New test.
* tests/regression/jasmin/test_verify_fail_split_local.j: New test.
* tests/regression/jasmin/test_verify_ok_overwrite_local_type.j:
New test.
* tests/regression/jasmin/test_verify_ok_untyped_local.j: New test.
--HG--
branch : unified_variables
edwin [Wed, 13 Sep 2006 00:21:40 +0000 (00:21 +0000)]
* src/vm/jit/powerpc/codegen.c (codegen): Replaced catchtype.cls with
catchtype.any to reflect that it can be a classref or a classinfo.
* src/vm/jit/alpha/codegen.c (codegen): Likewise.
* src/vm/jit/mips/codegen.c (codegen): Likewise.
* src/vm/jit/i386/codegen.c (codegen): Likewise.
* src/vm/jit/powerpc64/codegen.c (codegen): Likewise.
* src/vm/jit/intrp/codegen.c (codegen): Likewise.
* src/vm/jit/x86_64/codegen.c (codegen): Likewise.
* src/vm/jit/intrp/asmpart.c (intrp_asm_handle_exception): Added XXX
comment warning that classrefs must be resolved here.
--HG--
branch : unified_variables
edwin [Wed, 13 Sep 2006 00:03:45 +0000 (00:03 +0000)]
* src/vm/jit/i386/codegen.c (codegen): Use emit_copy for LOAD/STORE
instructions. We should also combine this with ICMD_COPY/MOVE, but
I was not sure how to deal with the M_COPY macro.
--HG--
branch : unified_variables
edwin [Tue, 12 Sep 2006 23:35:48 +0000 (23:35 +0000)]
* tests/regression/jasmin/test_swap_locals.j: New test.
--HG--
branch : unified_variables
edwin [Tue, 12 Sep 2006 23:31:49 +0000 (23:31 +0000)]
* tests/regression/jasmin/test_swap_interface_slots.j: New test.
--HG--
branch : unified_variables
edwin [Tue, 12 Sep 2006 23:18:58 +0000 (23:18 +0000)]
* tests/regression/jasmin/test_many_monitors.j: New test. (This test
case used to fail with old-instruction-format cacao.)
--HG--
branch : unified_variables
christian [Tue, 12 Sep 2006 22:32:07 +0000 (22:32 +0000)]
* src/vm/jit/i386/codegen.c (codegen): Corrected handling of taking
arguments out of stack frame. Some changes to adapt SSA to unified
variables.
--HG--
branch : unified_variables
edwin [Tue, 12 Sep 2006 21:34:03 +0000 (21:34 +0000)]
* src/vm/jit/parse.c (parse_check_instructions): Renamed to
parse_realloc_instructions to reflect what it really does. Fixed so
it adds at least as many instructions as required by the check.
* src/vm/jit/parse.h (INSTRUCTIONS_CHECK): Use
parse_realloc_instructions.
(MARK_BASICBLOCK): Cleaned up backslashes.
--HG--
branch : unified_variables
edwin [Tue, 12 Sep 2006 21:23:56 +0000 (21:23 +0000)]
* src/vm/jit/stack.c (new_stack_analyse): Fixed test for existing
coalescing for *STORE.
Properly use the return value of stack_mark_reached when analysing
a block for the first time.
* tests/regression/jasmin/test_simple_load_store.j: Added a test
that just does ILOAD 1, ISTORE 1.
--HG--
branch : unified_variables
edwin [Tue, 12 Sep 2006 00:21:01 +0000 (00:21 +0000)]
* tests/regression/jasmin/test_verify_ok_jsr_handler_in_sub.j:
Renamed to test_verify_fail_jsr_handler_in_sub.j, as it fails on the
reference implementation.
* tests/regression/jasmin/test_verify_ok_jsr_exceptions.j: Renamed to
test_verify_fail_jsr_exceptions.j, likewise.
* tests/regression/jasmin/test_verify_fail_ret_uninit_var.j,
tests/regression/jasmin/test_verify_fail_aload_retaddress.j,
tests/regression/jasmin/test_verify_fail_ret_bad_type.j: Made
expected error match both CACAO's message and the reference
implementation's message.
--HG--
branch : unified_variables
rename : tests/regression/jasmin/test_verify_ok_jsr_exceptions.j => tests/regression/jasmin/test_verify_fail_jsr_exceptions.j
rename : tests/regression/jasmin/test_verify_ok_jsr_handler_in_sub.j => tests/regression/jasmin/test_verify_fail_jsr_handler_in_sub.j
edwin [Mon, 11 Sep 2006 23:32:45 +0000 (23:32 +0000)]
* src/vm/jit/stack.c (stack_reanalyse_block): Removed unused
variable.
--HG--
branch : unified_variables
edwin [Mon, 11 Sep 2006 23:24:46 +0000 (23:24 +0000)]
* src/vm/jit/stack.c: Added JSR elimination by block specialization.
* src/vm/jit/i386/codegen.c (codegen): Treat ICMD_RET as a GOTO.
--HG--
branch : unified_variables
edwin [Mon, 11 Sep 2006 23:17:48 +0000 (23:17 +0000)]
* tests/regression/jasmin/runtest: Add --color option.
--HG--
branch : unified_variables
edwin [Mon, 11 Sep 2006 22:17:57 +0000 (22:17 +0000)]
* tests/regression/jasmin/test_verify_ok_jsr_handler_in_sub2.j: Added
a second call of the subroutine, so cacao has to clone the exception
handler.
--HG--
branch : unified_variables
edwin [Mon, 11 Sep 2006 14:59:52 +0000 (14:59 +0000)]
* tests/regression/jasmin/test_verify_ok_jsr_handler_in_sub.j:
New test.
* tests/regression/jasmin/test_verify_ok_jsr_exceptions.j: Likewise.
* tests/regression/jasmin/test_verify_ok_jsr_through_variable.j:
Likewise.
* tests/regression/jasmin/test_verify_ok_jsr_handler_in_sub2.j:
Likewise.
* tests/regression/jasmin/test_verify_ok_jsr_swap.j: Likewise.
--HG--
branch : unified_variables
edwin [Mon, 11 Sep 2006 14:57:42 +0000 (14:57 +0000)]
* tests/regression/jasmin/test_dup2.j: Fix stackdepth.
* tests/regression/jasmin/test_load_store_conflict.j: Likewise.
--HG--
branch : unified_variables
projects / cacao.git / log