cacao.git
17 years ago* src/native/jni.c (jni_attach_current_thread): New help function.
twisti [Thu, 5 Oct 2006 17:28:13 +0000 (17:28 +0000)]
* src/native/jni.c (jni_attach_current_thread): New help function.
(_Jv_JNI_AttachCurrentThread): Use helper function.
(_Jv_JNI_AttachCurrentThreadAsDaemon): Likewise.
(_Jv_JNI_DetachCurrentThread): Implemented.

* src/threads/native/threads.c (method_thread_init)
(method_threadgroup_add_: Made static.
(threads_init): Code rearranged.
(threads_startup_thread): Removed thread detach code and call
threads_detach_thread.
(threads_detach_thread): New function.

* src/threads/native/threads.h (threads_detach_thread): Added.

17 years ago* src/vm/utf8.c (utf_removeThread, utf_java_lang_Thread__V): Added.
twisti [Thu, 5 Oct 2006 17:23:48 +0000 (17:23 +0000)]
* src/vm/utf8.c (utf_removeThread, utf_java_lang_Thread__V): Added.
(utf8_init): Initialize new strings.
* src/vm/utf8.h (utf_removeThread, utf_java_lang_Thread__V): Added.

17 years ago* src/vm/vm.c (vm_create): Turn off the verifier for -Xint.
edwin [Thu, 5 Oct 2006 16:28:37 +0000 (16:28 +0000)]
* src/vm/vm.c (vm_create): Turn off the verifier for -Xint.

17 years ago* src/vm/jit/intrp/asmpart.c (intrp_asm_handle_exception): Style fix.
edwin [Thu, 5 Oct 2006 16:18:10 +0000 (16:18 +0000)]
* src/vm/jit/intrp/asmpart.c (intrp_asm_handle_exception): Style fix.

17 years ago* src/vm/jit/intrp/codegen.c (codegen): Save synchronized object in
edwin [Thu, 5 Oct 2006 16:12:16 +0000 (16:12 +0000)]
* src/vm/jit/intrp/codegen.c (codegen): Save synchronized object in
a special stackslot and use it for monitorexit.

* src/vm/jit/intrp/asmpart.c (intrp_asm_handle_exception): When
unwinding a synchronized method, exit the monitor.

17 years ago* src/vm/jit/intrp/codegen.c (codegen): Reserve an extra stackslot in
edwin [Thu, 5 Oct 2006 15:43:38 +0000 (15:43 +0000)]
* src/vm/jit/intrp/codegen.c (codegen): Reserve an extra stackslot in
synchronized methods.
(intrp_createcompilerstub): Likewise.
(intrp_createnativestub): Use stackframesize for clarity.

17 years ago* src/vm/jit/intrp/codegen.c (codegen): Separate stackframesize from
edwin [Thu, 5 Oct 2006 15:33:42 +0000 (15:33 +0000)]
* src/vm/jit/intrp/codegen.c (codegen): Separate stackframesize from
the number of local variables.
(intrp_createcompilerstub): Likewise.

* src/vm/jit/intrp/engine.c (MAXLOCALS): Changed to FRAMESIZE.

* src/vm/jit/intrp/java.vmg (INVOKEVIRTUAL): Use FRAMESIZE.
(INVOKESTATIC): Likewise.
(INVOKESPECIAL): Likewise.
(INVOKEINTERFACE): Likewise.

17 years ago* src/native/jni.c (jni_init_localref_table): New function.
twisti [Thu, 5 Oct 2006 14:13:06 +0000 (14:13 +0000)]
* src/native/jni.c (jni_init_localref_table): New function.
(AttachCurrentThread): Implemented.
(JNI_CreateJavaVM): Use jni_init_localref_table.

* src/threads/native/threads.c (method_thread_init)
(method_threadgroup_add): New global variables.
(threads_init): Store methods resolved in global variables.
(threads_attach_current_thread): New function.

* src/threads/native/threads.h (MIN_PRIORITY, NORM_PRIORITY)
(MAX_PRIORITY): Defined.
(threads_attach_current_thread): New function.

17 years ago* src/vm/jit/intrp/java.vmg (TRACECALL): Implemented for 32-bit
edwin [Thu, 5 Oct 2006 12:23:23 +0000 (12:23 +0000)]
* src/vm/jit/intrp/java.vmg (TRACECALL): Implemented for 32-bit
architectures.

17 years ago* src/vm/jit/intrp/codegen.c (codegen): Fix off-by-one error in len
edwin [Thu, 5 Oct 2006 10:50:39 +0000 (10:50 +0000)]
* src/vm/jit/intrp/codegen.c (codegen): Fix off-by-one error in len
tests of optimizations.

17 years ago* src/vm/jit/show.c (show_icmd): Show constant operand of IFxx, and
edwin [Thu, 5 Oct 2006 10:41:28 +0000 (10:41 +0000)]
* src/vm/jit/show.c (show_icmd): Show constant operand of IFxx, and
IF_Lxx.

17 years ago* src/vm/jit/show.c (show_basicblock): Fixed deadcode check.
edwin [Thu, 5 Oct 2006 10:39:09 +0000 (10:39 +0000)]
* src/vm/jit/show.c (show_basicblock): Fixed deadcode check.

* src/vm/jit/intrp/asmpart.c (intrp_asm_handle_exception): Clear
global_sp.

17 years ago* src/vm/jit/powerpc/emit.c (emit_verbosecall_enter): Darwin build
twisti [Thu, 5 Oct 2006 09:04:12 +0000 (09:04 +0000)]
* src/vm/jit/powerpc/emit.c (emit_verbosecall_enter): Darwin build
fixes.

17 years ago* src/vm/jit/intrp/asmpart.c (intrp_asm_handle_exception): Fixed for
edwin [Thu, 5 Oct 2006 00:21:12 +0000 (00:21 +0000)]
* src/vm/jit/intrp/asmpart.c (intrp_asm_handle_exception): Fixed for
catch-all handlers.

17 years ago* src/vm/jit/show.c (show_method): Adapted to interpreter.
edwin [Thu, 5 Oct 2006 00:06:23 +0000 (00:06 +0000)]
* src/vm/jit/show.c (show_method): Adapted to interpreter.
(show_basicblock): Likewise.

* src/vm/jit/intrp/disass.c (intrp_disassinstr): Write disassembly to
stdout.
(intrp_disassemble): Likewise.

17 years ago* tests/regression/jctest.java: Also test division/remainder with
edwin [Wed, 4 Oct 2006 23:08:33 +0000 (23:08 +0000)]
* tests/regression/jctest.java: Also test division/remainder with
constant divisor 1.

* tests/regression/jctest.output: Updated test output.

17 years ago* src/vm/jit/intrp/codegen.c (codegen): Don't ?DIVPOW2 with value 1.
edwin [Wed, 4 Oct 2006 23:05:15 +0000 (23:05 +0000)]
* src/vm/jit/intrp/codegen.c (codegen): Don't ?DIVPOW2 with value 1.
The optimization produces the wrong result in this case.

17 years ago* src/vm/jit/intrp/codegen.c (codegen): Implemented IDIVPOW2 and
edwin [Wed, 4 Oct 2006 22:53:51 +0000 (22:53 +0000)]
* src/vm/jit/intrp/codegen.c (codegen): Implemented IDIVPOW2 and
LDIVPOW2 optimizations.

17 years ago* src/vm/jit/intrp/codegen.c (codegen): Implemented IREMPOW2 and
edwin [Wed, 4 Oct 2006 22:39:44 +0000 (22:39 +0000)]
* src/vm/jit/intrp/codegen.c (codegen): Implemented IREMPOW2 and
LREMPOW2 optimizations.

17 years ago* src/vm/jit/intrp/codegen.c (codegen): Implement optimization of comparisons.
edwin [Wed, 4 Oct 2006 22:12:02 +0000 (22:12 +0000)]
* src/vm/jit/intrp/codegen.c (codegen): Implement optimization of comparisons.

17 years ago* src/vm/jit/allocator/simplereg.c (reg_free_temp_func): Fixed indices
edwin [Wed, 4 Oct 2006 20:44:03 +0000 (20:44 +0000)]
* src/vm/jit/allocator/simplereg.c (reg_free_temp_func): Fixed indices
into regcopycount array.
(allocate_scratch_registers): Likewise.

17 years ago* src/vm/jit/intrp/codegen.c (codegen): #if 0-ed optimized ICMDs that
edwin [Wed, 4 Oct 2006 20:02:37 +0000 (20:02 +0000)]
* src/vm/jit/intrp/codegen.c (codegen): #if 0-ed optimized ICMDs that
are currently not used. In order to use these instructions, we could
either add the optimization checks directly to codegen.c, or introduce
a special pass between parse and intrp_codegen which replaces the
instructions.

17 years ago* src/vm/jit/intrp/codegen.c (codegen): Removed unoptimized *CONST
edwin [Wed, 4 Oct 2006 19:47:01 +0000 (19:47 +0000)]
* src/vm/jit/intrp/codegen.c (codegen): Removed unoptimized *CONST
instructions. Since stack_analyse is no longer performed before the
interpreter codegen, these instructions cannot occur.

17 years ago* src/vm/jit/stack.c: Removed interpreter-specific code.
edwin [Wed, 4 Oct 2006 19:38:28 +0000 (19:38 +0000)]
* src/vm/jit/stack.c: Removed interpreter-specific code.

17 years ago* src/threads/native/lock.c (lock_monitor_exit): Check for NULL object.
edwin [Wed, 4 Oct 2006 18:44:28 +0000 (18:44 +0000)]
* src/threads/native/lock.c (lock_monitor_exit): Check for NULL object.
There is no guarantee that MONITORENTER/EXITs are properly nested, so
we cannot rely on the check in lock_monitor_enter here.

17 years ago* tests/regression/jasmin/test_nullpointerexception_monitorexit.j:
edwin [Wed, 4 Oct 2006 18:39:49 +0000 (18:39 +0000)]
* tests/regression/jasmin/test_nullpointerexception_monitorexit.j:
Fixed test case, so it passes if the exception is thrown.

17 years ago* tests/regression/jasmin/test_nullpointerexception_monitorexit.j:
edwin [Wed, 4 Oct 2006 18:35:37 +0000 (18:35 +0000)]
* tests/regression/jasmin/test_nullpointerexception_monitorexit.j:
New test.

* tests/regression/jasmin/Makefile.am: Added
test_nullpointerexception_monitorexit.j.

17 years ago* tests/regression/jasmin/Makefile.am: Properly quote variables.
edwin [Wed, 4 Oct 2006 18:25:52 +0000 (18:25 +0000)]
* tests/regression/jasmin/Makefile.am: Properly quote variables.

17 years ago* src/vm/jit/intrp/engine.c (THROW_CLASSCASTEXCEPTION): Really throw a
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.

17 years ago* src/vm/jit/intrp/java.vmg (LOOKUPSWITCH): No point in using >= 0 on
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.

17 years ago* src/vm/jit/intrp/codegen.c (nativecall): Store return valud of
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.

17 years ago* src/vm/jit/intrp/codegen.c (codegen): Convert JavaPCs to block indices.
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.

17 years ago* src/vm/jit/intrp/md.c (intrp_md_init): Set vm_out to stderr.
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.

17 years ago* src/vm/jit/intrp/dynamic-super.c (superreuse_insert): Use
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.

17 years ago* src/vm/jit/intrp/codegen.c (codegen): Restored ICMD_RET to really
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.

17 years ago* src/vm/jit/intrp/java.vmg (builtin_monitorenter): Changed to
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.

17 years ago* src/vm/jit/intrp/codegen.c: Made it compile again.
edwin [Wed, 4 Oct 2006 13:40:54 +0000 (13:40 +0000)]
* src/vm/jit/intrp/codegen.c: Made it compile again.

17 years ago* src/vm/jit/intrp/codegen.c: New instruction format fixes.
twisti [Wed, 4 Oct 2006 13:35:25 +0000 (13:35 +0000)]
* src/vm/jit/intrp/codegen.c: New instruction format fixes.

17 years ago* configure.ac (AC_CONFIG_FILES): Removed src/scripts/rmic and
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 \.

17 years ago* src/scripts/rmic.in: Removed.
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.

17 years ago* configure.ac (--with-jre-layout): Added.
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.

17 years ago* src/vm/jit/jit.h (jitdata): Renamed c_debug_nr to c_block_nr. (Still
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.

17 years ago* src/vm/jit/powerpc/codegen.c: Removed new_ prefix from variable and
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.

17 years ago* src/vm/resolve.c: Removed new_ prefix from function names.
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.

17 years ago* src/vm/jit/allocator/simplereg.c: Warning fixed.
edwin [Tue, 3 Oct 2006 20:27:47 +0000 (20:27 +0000)]
* src/vm/jit/allocator/simplereg.c: Warning fixed.

17 years ago* src/vm/jit/i386/codegen.c (codegen): Use varindex as in other
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.

17 years ago* src/vm/jit/stack.c (new_stack_analyse): Removed obsolete stack depth
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.

17 years ago* src/vm/jit/powerpc64/codegen.c (codegen): Unified IINC and
edwin [Tue, 3 Oct 2006 19:11:19 +0000 (19:11 +0000)]
* src/vm/jit/powerpc64/codegen.c (codegen): Unified IINC and
IADDCONST.

17 years ago* src/vm/jit/powerpc/codegen.c (codegen): Unify 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.

17 years ago* src/vm/jit/allocator/simplereg.c (reg_make_statistics): Bugfix.
edwin [Tue, 3 Oct 2006 18:34:40 +0000 (18:34 +0000)]
* src/vm/jit/allocator/simplereg.c (reg_make_statistics): Bugfix.

17 years ago* src/native/vm/gnu_classpath_VMSystemProperties.c (preInit): We don't
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.

17 years ago* src/vm/jit/allocator/simplereg.c (reg_make_statistics): Make it
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.

17 years ago* tests/regression/jasmin/test_iinc.j: New test.
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

17 years agoMerged r5640 from trunk:
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

17 years ago* src/vm/jit/powerpc/codegen.c: Implemented ICMD_JSR like ICMD_GOTO.
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

17 years agoMerged r5636, r5637, and r5638 from trunk:
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

17 years ago* src/vm/jit/alpha/md-abi.c (md_return_alloc): Activated return value stackslot regis...
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

17 years ago* src/vm/jit/powerpc/netbsd/md-abi.c: Blindly ported to
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

17 years ago* src/vm/jit/powerpc/codegen.c: Changed OUTVAR to INOUT.
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

17 years ago* src/vm/jit/alpha/codegen.h: Removed M_COPY.
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

17 years ago* src/vm/jit/powerpc/codegen.c (codegen): Unified LOAD/STORE and
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

17 years ago* src/vm/jit/powerpc/linux/md-abi.c (md_param_alloc): Cleaned up
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

17 years agoMerged r5626 from trunk:
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

17 years agoMerged r5624 from trunk:
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

17 years ago* src/vm/jit/alpha/codegen.c (codegen): Unified MOVE/COPY with
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

17 years ago* tests/regression/jasmin/runtest: Made it a bash script, so it works
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

17 years ago* tests/regression/jasmin/runtest: Do not use grep -o.
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

17 years ago* src/vm/jit/mips/emit.c (emit_copy): Fixed arguments to
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

17 years ago* src/vm/jit/powerpc64/codegen.c: Ported to 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

17 years agoMerged r5616 from trunk:
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

17 years ago* src/vm/jit/mips/codegen.c: Ported to 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

17 years ago* src/vm/jit/powerpc/codegen.c (codegen): Cleaned up 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

17 years ago* src/vm/jit/i386/codegen.c (codegen): Cleaned up 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

17 years ago* src/vm/jit/x86_64/codegen.c (codegen): Cleaned up 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

17 years ago* src/vm/jit/alpha/codegen.c (codegen): Cleaned up 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

17 years ago* tests/regression/jasmin/runtest: Use default JASMIN_JAR, if given.
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

17 years ago* src/vm/jit/codegen-common.c (codegen_reg_of_var): Fixed typo in
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

17 years ago* src/vm/jit/verify/typeinfo.c (typevector_store_retaddr): Do not
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

17 years ago* src/vm/jit/verify/typecheck.c (typecheck): Added debug print of
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

17 years ago* src/vm/vm.c (vm_compile_all): Only use if !defined(NDEBUG).
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

17 years ago* src/vm/jit/verify/typeinfo.h: Disabled TYPECHECK_VERBOSE.
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

17 years ago* src/vm/jit/jit.c (jit_compile_intern): Removed commented out
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

17 years ago* src/vm/jit/allocator/simplereg.c (reg_new_temp): Simplified.
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

17 years ago* src/vm/jit/powerpc/linux/md-abi.c: Use VAR and VAROP macros.
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

17 years ago* src/vm/jit/i386/codegen.c (codegen): Use VAR and VAROP macros.
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

17 years agoMerged r5591 from trunk:
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

17 years agoMerged r5589 and r5590 from trunk:
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

17 years ago* src/vm/jit/alpha/codegen.c (codegen): Changed to use the macros VAR and VAROP.
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

17 years ago* src/vm/jit/x86_64/codegen.c (codegen): Changed to use the macros VAR and VAROP.
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

17 years ago* src/vm/jit/allocator/simplereg.c (reg_free_temp_func): Handle
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

17 years agoMerged r5540 from trunk:
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

17 years agoMerged r5573, r5574, r5577, r5578, and r5579 from trunk.
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

17 years ago* src/vm/jit/powerpc64: Merged changes from r5403 to r5548 from trunk.
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

17 years agoMerged r5547 from trunk:
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

17 years agoMerged r5543 from trunk:
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

17 years agoMerged r5541 from trunk:
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

17 years agoMerged r5540 and r5542 from trunk:
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

17 years agoMerged r5539 from trunk:
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

17 years agoMerged r5538 from trunk:
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

17 years agoMerged r5537 from trunk:
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