edwin [Wed, 4 Oct 2006 18:23:19 +0000 (18:23 +0000)]
* src/vm/jit/intrp/engine.c (THROW_CLASSCASTEXCEPTION): Really throw a
ClassCastException, not a NullPointerException.
* src/vm/jit/intrp/asmpart.c (intrp_asm_handle_exception): Set
global_sp, in case the resolving of the catchtype involves the
execution of Java code.
* src/vm/jit/intrp/java.vmg (MONITORENTER): Check for exception.
(MONITOREXIT): Likewise.
edwin [Wed, 4 Oct 2006 16:42:41 +0000 (16:42 +0000)]
* src/vm/jit/intrp/java.vmg (LOOKUPSWITCH): No point in using >= 0 on
an unsigned variable.
edwin [Wed, 4 Oct 2006 16:01:53 +0000 (16:01 +0000)]
* src/vm/jit/intrp/codegen.c (nativecall): Store return valud of
codegen_finish_native_call in *exceptionptr.
* src/vm/jit/intrp/asmpart.c (intrp_asm_handle_exception): Resolve
unresolved catchtype references.
edwin [Wed, 4 Oct 2006 15:14:19 +0000 (15:14 +0000)]
* src/vm/jit/intrp/codegen.c (codegen): Convert JavaPCs to block indices.
Do not check for BBREACHED (not set by parse).
(gen_branch): Convert JavaPCs to block indices.
* src/vm/jit/intrp/java.vmg (RET): restored.
* src/vm/jit/jit.c (jit_compile_intern): Do not perform stack_analyse and
dependent passes for intrp.
twisti [Wed, 4 Oct 2006 15:04:52 +0000 (15:04 +0000)]
* src/vm/jit/intrp/md.c (intrp_md_init): Set vm_out to stderr.
* src/vm/jit/intrp/engine.c (THROW_CLASSCASTEXCEPTION): Added.
(engine): Handle ClassCastExceptions with argument.
* src/vm/jit/intrp/asmpart.c (intrp_asm_handle_exception): Indent.
* src/vm/jit/intrp/dynamic-super.c: Use LOCK_MONITOR_{ENTER,EXIT}
macros.
* src/vm/jit/intrp/patcher.c (intrp_patcher_invokestatic_special):
Write back method pointer. I wonder how this ever worked before.
(intrp_patcher_invokevirtual): Likewise.
(intrp_patcher_invokeinterface): Likewise.
* src/vm/jit/intrp/java.vmg (RET): Removed.
(TABLESWITCH): Changed reading direction of cases. Don't know if that
works: NOT TESTED!
(CHECKCAST): Use THROW_CLASSCASTEXCEPTION.
(ARRAYCHECKCAST): Likewise.
(MONITORENTER): Likewise.
(MONITOREXIT): Likewise.
edwin [Wed, 4 Oct 2006 14:50:21 +0000 (14:50 +0000)]
* src/vm/jit/intrp/dynamic-super.c (superreuse_insert): Use
lock_monitor_ functions.
(patchersuper_rewrite): Likewise.
(hashtable_patchersupers_insert): Likewise.
edwin [Wed, 4 Oct 2006 14:31:01 +0000 (14:31 +0000)]
* src/vm/jit/intrp/codegen.c (codegen): Restored ICMD_RET to really
perform a RET (JSR elimination will not be performed for intrp.)
Removed a comment that does not apply any more.
edwin [Wed, 4 Oct 2006 14:20:36 +0000 (14:20 +0000)]
* src/vm/jit/intrp/java.vmg (builtin_monitorenter): Changed to
lock_monitor_enter.
(builtin_monitorexit): Changed to lock_monitor_exit.
edwin [Wed, 4 Oct 2006 13:40:54 +0000 (13:40 +0000)]
* src/vm/jit/intrp/codegen.c: Made it compile again.
twisti [Wed, 4 Oct 2006 13:35:25 +0000 (13:35 +0000)]
* src/vm/jit/intrp/codegen.c: New instruction format fixes.
twisti [Wed, 4 Oct 2006 12:09:26 +0000 (12:09 +0000)]
* configure.ac (AC_CONFIG_FILES): Removed src/scripts/rmic and
src/scripts/rmiregistry.
* src/scripts/Makefile.am (bin_SCRIPTS): Removed trailing \.
twisti [Wed, 4 Oct 2006 10:37:09 +0000 (10:37 +0000)]
* src/scripts/rmic.in: Removed.
* src/scripts/rmiregistry.in: Likewise.
* src/scripts/Makefile.am (bin_SCRIPTS) Removed rmi.in and
rmiregistry.in.
* src/scripts/.cvsignore: Likewise.
* src/scripts/java.in: Don't call cacao with an absolute path, this
would break WITH_JRE_LAYOUT. I think we can expect cacao to be in the
PATH.
twisti [Wed, 4 Oct 2006 10:10:01 +0000 (10:10 +0000)]
* configure.ac (--with-jre-layout): Added.
* src/vm/global.h (CLASSPATH_LIBRARY_PATH): Removed.
* src/vm/vm.c [WITH_JRE_LAYOUT] (libgen.h, unistd.h): Added.
(cacao_prefix, cacao_libjvm, classpath_libdir): New global variables.
(version): Print gnu.classpath.boot.library.path instead of
java.library.path as this is the interesting one.
(vm_create): Added WITH_JRE_LAYOUT stuff.
* src/vm/vm.h (stackbottom): Removed.
(cacao_prefix, cacao_libjvm, classpath_libdir): Added.
* src/cacao/cacao.c [WITH_JRE_LAYOUT] (errno.h, libgen.h, unistd.h):
Added.
(main): Added WITH_JRE_LAYOUT stuff.
* src/native/vm/gnu_classpath_VMSystemProperties.c (vm/vm.h): Added.
(preInit): Set env_java_home to cacao_prefix and
gnu.classpath.boot.library.path to classpath_libdir.
* src/native/native.c (native_init): Use cacao_libjvm in lt_dlopenext
call.
edwin [Tue, 3 Oct 2006 21:19:05 +0000 (21:19 +0000)]
* src/vm/jit/jit.h (jitdata): Renamed c_debug_nr to c_block_nr. (Still
not a good name. Should probably be removed entirely.)
Added comments.
* src/vm/method.h (c_debug_nr): Renamed to c_block_nr.
* src/vm/jit/stack.c: Likewise.
* src/vm/jit/loop/analyze.c: Likewise.
* src/vm/jit/inline/inline.c: Likewise.
* src/vm/jit/parse.c: Likewise.
edwin [Tue, 3 Oct 2006 20:57:15 +0000 (20:57 +0000)]
* src/vm/jit/powerpc/codegen.c: Removed new_ prefix from variable and
field names.
* src/vm/jit/cfg.c: Likewise.
* src/vm/jit/sparc64/codegen.c: Likewise.
* src/vm/jit/reorder.c: Likewise.
* src/vm/jit/ifconv/ifconv.c: Likewise.
* src/vm/jit/alpha/codegen.c: Likewise.
* src/vm/jit/stack.c: Likewise.
* src/vm/jit/stack.h: Likewise.
* src/vm/jit/show.c: Likewise.
* src/vm/jit/verify/typecheck.c: Likewise.
* src/vm/jit/mips/codegen.c: Likewise.
* src/vm/jit/allocator/simplereg.c: Likewise.
* src/vm/jit/i386/codegen.c: Likewise.
* src/vm/jit/powerpc64/codegen.c: Likewise.
* src/vm/jit/parse.c: Likewise.
* src/vm/jit/replace.c: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.
* src/vm/jit/parse.h: Likewise.
* src/vm/jit/jit.c: Likewise.
* src/vm/jit/jit.h: Likewise.
edwin [Tue, 3 Oct 2006 20:44:46 +0000 (20:44 +0000)]
* src/vm/resolve.c: Removed new_ prefix from function names.
* src/vm/resolve.h: Likewise.
* src/vm/jit/stack.c: Likewise.
* src/vm/jit/stack.h: Likewise.
* src/vm/jit/show.c: Likewise.
* src/vm/jit/verify/typecheck.c: Likewise.
* src/vm/jit/show.h: Likewise.
* src/vm/jit/allocator/simplereg.c: Likewise.
* src/vm/jit/allocator/simplereg.h: Likewise.
* src/vm/jit/parse.c: Likewise.
* src/vm/jit/parse.h: Likewise.
* src/vm/jit/jit.c: Likewise.
edwin [Tue, 3 Oct 2006 20:27:47 +0000 (20:27 +0000)]
* src/vm/jit/allocator/simplereg.c: Warning fixed.
edwin [Tue, 3 Oct 2006 20:26:10 +0000 (20:26 +0000)]
* src/vm/jit/i386/codegen.c (codegen): Use varindex as in other
codegens.
edwin [Tue, 3 Oct 2006 20:22:28 +0000 (20:22 +0000)]
* src/vm/jit/stack.c (new_stack_analyse): Removed obsolete stack depth
checking code.
* src/vm/jit/stack.h (CHECK_STACK_DEPTH): Removed macro.
edwin [Tue, 3 Oct 2006 19:11:19 +0000 (19:11 +0000)]
* src/vm/jit/powerpc64/codegen.c (codegen): Unified IINC and
IADDCONST.
edwin [Tue, 3 Oct 2006 18:50:52 +0000 (18:50 +0000)]
* src/vm/jit/powerpc/codegen.c (codegen): Unify IINC and IADDCONST.
edwin [Tue, 3 Oct 2006 18:34:40 +0000 (18:34 +0000)]
* src/vm/jit/allocator/simplereg.c (reg_make_statistics): Bugfix.
twisti [Tue, 3 Oct 2006 18:21:55 +0000 (18:21 +0000)]
* src/native/vm/gnu_classpath_VMSystemProperties.c (preInit): We don't
need to strcpy the library variables. Don't know where this code came
from.
edwin [Tue, 3 Oct 2006 18:09:26 +0000 (18:09 +0000)]
* src/vm/jit/allocator/simplereg.c (reg_make_statistics): Make it
compile again.
edwin [Tue, 3 Oct 2006 17:24:02 +0000 (17:24 +0000)]
* tests/regression/jasmin/test_iinc.j: New test.
* tests/regression/jasmin/Makefile.am: Added test_iinc.j
--HG--
branch : unified_variables
edwin [Tue, 3 Oct 2006 16:42:34 +0000 (16:42 +0000)]
Merged r5640 from trunk:
* src/vm/jit/x86_64/Makefile.am (libarch_la_SOURCES): Renamed
md-emit.h to emit.h.
--HG--
branch : unified_variables
edwin [Tue, 3 Oct 2006 16:32:15 +0000 (16:32 +0000)]
* src/vm/jit/powerpc/codegen.c: Implemented ICMD_JSR like ICMD_GOTO.
* src/vm/jit/powerpc64/codegen.c: Likewise.
* src/vm/jit/alpha/codegen.c: Implemented ICMD_JSR like ICMD_GOTO.
Unified ICMD_IINC and ICMD_IADDCONST.
* src/vm/jit/mips/codegen.c: Likewise.
* src/vm/jit/i386/codegen.c: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.
--HG--
branch : unified_variables
edwin [Mon, 2 Oct 2006 19:24:56 +0000 (19:24 +0000)]
Merged r5636, r5637, and r5638 from trunk:
* src/native/tools/gennativetable.c: Made it work again.
* tests/regression/jasmin/.cvsignore: New file.
* src/vm/jit/powerpc/codegen.c (codegen): #if 0 replacement point
code.
* src/vm/jit/powerpc/emit.c [!NDEBUG] (emit_verbosecall_enter)
(emit_verbosecall_exit): #ifdef'ed.
--HG--
branch : unified_variables
christian [Mon, 2 Oct 2006 16:36:54 +0000 (16:36 +0000)]
* src/vm/jit/alpha/md-abi.c (md_return_alloc): Activated return value stackslot registers precolouring again.
--HG--
branch : unified_variables
edwin [Mon, 2 Oct 2006 14:18:04 +0000 (14:18 +0000)]
* src/vm/jit/powerpc/netbsd/md-abi.c: Blindly ported to
unified_variables.
* src/vm/jit/powerpc/linux/md-abi.c: Cleaned up.
* src/vm/jit/powerpc/darwin/md-abi.c: Likewise.
* src/vm/jit/alpha/md-abi.c: Likewise.
* src/vm/jit/mips/md-abi.c: Likewise.
* src/vm/jit/powerpc64/linux/md-abi.c: Likewise.
* src/vm/jit/x86_64/md-abi.c: Likewise.
--HG--
branch : unified_variables
edwin [Mon, 2 Oct 2006 13:59:13 +0000 (13:59 +0000)]
* src/vm/jit/powerpc/codegen.c: Changed OUTVAR to INOUT.
* src/vm/jit/alpha/codegen.c: Likewise.
* src/vm/jit/stack.c: Likewise.
* src/vm/jit/show.c: Likewise.
* src/vm/jit/mips/codegen.c: Likewise.
* src/vm/jit/allocator/simplereg.c: Likewise.
* src/vm/jit/i386/codegen.c: Likewise.
* src/vm/jit/powerpc64/codegen.c: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.
* src/vm/jit/jit.h: Likewise.
--HG--
branch : unified_variables
edwin [Mon, 2 Oct 2006 13:43:15 +0000 (13:43 +0000)]
* src/vm/jit/alpha/codegen.h: Removed M_COPY.
* src/vm/jit/mips/codegen.h: Likewise.
* src/vm/jit/i386/codegen.h: Likewise.
* src/vm/jit/powerpc64/codegen.h: Likewise.
* src/vm/jit/x86_64/codegen.h: Likewise.
* src/vm/jit/powerpc/codegen.c: Unified ICMD_RET with ICMD_GOTO.
* src/vm/jit/alpha/codegen.c: Likewise.
* src/vm/jit/mips/codegen.c: Likewise.
* src/vm/jit/i386/codegen.c: Likewise.
* src/vm/jit/powerpc64/codegen.c: Likewise.
* src/vm/jit/intrp/codegen.c: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.
--HG--
branch : unified_variables
edwin [Mon, 2 Oct 2006 13:26:39 +0000 (13:26 +0000)]
* src/vm/jit/powerpc/codegen.c (codegen): Unified LOAD/STORE and
COPY/MOVE instructions.
* src/vm/jit/powerpc/codegen.h (M_COPY): Removed.
--HG--
branch : unified_variables
edwin [Mon, 2 Oct 2006 13:16:20 +0000 (13:16 +0000)]
* src/vm/jit/powerpc/linux/md-abi.c (md_param_alloc): Cleaned up
comments.
* src/vm/jit/powerpc/darwin/md-abi.c (md_param_alloc): Likewise.
* src/vm/jit/powerpc/codegen.c (codegen): Removed obsolete call to
codegen_reg_of_var.
* 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/x86_64/codegen.c (codegen): Likewise.
* src/vm/jit/codegen-common.c (codegen_reg_of_var): Cleaned up.
(codegen_reg_of_dst): Implemented using inline codegen_reg_of_var.
--HG--
branch : unified_variables
edwin [Mon, 2 Oct 2006 12:10:45 +0000 (12:10 +0000)]
Merged r5626 from trunk:
* src/vm/jit/replace.c (replace_create_replacement_points): Return true.
--HG--
branch : unified_variables
edwin [Mon, 2 Oct 2006 11:55:57 +0000 (11:55 +0000)]
Merged r5624 from trunk:
* src/vm/jit/mips/asmpart.S (asm_vm_call_method): Remove argument
stack frame in normal path.
--HG--
branch : unified_variables
edwin [Mon, 2 Oct 2006 00:32:38 +0000 (00:32 +0000)]
* src/vm/jit/alpha/codegen.c (codegen): Unified MOVE/COPY with
LOAD/STORE instructions.
--HG--
branch : unified_variables
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
projects / cacao.git / log