Merged revisions 7501-7598 via svnmerge from
svn+ssh://michi@c1.complang.tuwien.ac.at/ahome/cacao/svn/cacao/trunk
........
r7503 | twisti | 2007-03-12 11:11:33 +0100 (Mon, 12 Mar 2007) | 11 lines
* src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.c
(vm/vm.h): Added.
(open): Call vm_abort.
* src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.c
(unistd.h): Added.
(readByte): New function.
(writeBuf): Likewise.
(available0): Likewise.
(close0): Likewise.
........
r7504 | twisti | 2007-03-12 14:17:07 +0100 (Mon, 12 Mar 2007) | 2 lines
* src/vm/jit/arm/md.c (vm/jit/codegen-common.h): Added.
........
r7505 | twisti | 2007-03-12 14:34:37 +0100 (Mon, 12 Mar 2007) | 8 lines
* src/vm/jit/codegen.c (codegen): Change the operand direction of some
macros. Started to implement long-compares differently.
* src/vm/jit/codegen.h (M_AND, M_ORR, M_EOR, M_AND_IMM, M_MOVEQ)
(M_MOVVS_IMM, M_MOVNE_IMM, M_MOVLT_IMM, M_MOVLS_IMM): Changed operand
direction.
(M_ORR_S, M_CMPEQ, M_CMPLE): New macro.
........
r7510 | michi | 2007-03-13 14:19:07 +0100 (Tue, 13 Mar 2007) | 2 lines
* src/vm/jit/arm/linux/Makefile.am: Fixed include path to care about builddir.
........
r7511 | michi | 2007-03-13 17:32:56 +0100 (Tue, 13 Mar 2007) | 6 lines
* src/vm/jit/arm/codegen.c (codegen): Long branches are implemented
differently now.
* src/vm/jit/arm/codegen.h (M_COMPARE): Easier macros without overjumps.
(M_MOVEQ_IMM, M_MOVGT_IMM, M_ADDHI_IMM, M_SUBLO_IMM, M_CMPEQ_IMM): New macro.
........
r7513 | twisti | 2007-03-13 21:31:23 +0100 (Tue, 13 Mar 2007) | 2 lines
* src/vm/jit/i386/codegen.c (codegen): Fixed compiler warning.
........
r7514 | twisti | 2007-03-13 21:31:51 +0100 (Tue, 13 Mar 2007) | 5 lines
* src/vm/jit/i386/emit.c (emit_load): Use switch-case instead of
if-else contruct.
(emit_store): Likewise.
(emit_copy): Likewise.
........
r7516 | michi | 2007-03-14 13:00:07 +0100 (Wed, 14 Mar 2007) | 2 lines
* src/mm/nogc.c: Fixed includes and exceptions.
........
r7518 | michi | 2007-03-14 17:44:05 +0100 (Wed, 14 Mar 2007) | 3 lines
* src/vm/jit/arm/emit.c (emit_verbosecall_enter): Fixed bug with inmemory
arguments, which caused some crashes with verbose-calls.
........
r7519 | michi | 2007-03-14 18:31:05 +0100 (Wed, 14 Mar 2007) | 3 lines
* src/vm/jit/arm/codegen.c (codegen): All the long compares have a different
implementation now.
........
r7520 | twisti | 2007-03-14 22:16:04 +0100 (Wed, 14 Mar 2007) | 2 lines
* src/vm/jit/alpha/md.c (vm/jit/codegen-common.h): Added temporarily.
........
r7521 | twisti | 2007-03-14 22:18:00 +0100 (Wed, 14 Mar 2007) | 5 lines
* src/vm/jit/alpha/emit.c (emit_load): Use switch-case instead of
if-else contruct.
(emit_store): Likewise.
(emit_copy): Likewise.
........
r7522 | twisti | 2007-03-14 22:54:49 +0100 (Wed, 14 Mar 2007) | 7 lines
* src/vmcore/statistics.c (size_string): Added.
(statistics_print_memory_usage): Likewise.
* src/vmcore/statistics.h (size_string): Likewise.
* src/vm/string.c (vmcore/statistics.h): Added.
(literalstring_u2): Added statistics.
........
r7524 | pm | 2007-03-15 08:07:51 +0100 (Thu, 15 Mar 2007) | 7 lines
* src/vm/jit/s390/codegen.c,
src/vm/jit/s390/codegen.h: Changed a lot.
* src/vm/jit/s390/tests,
src/vm/jit/s390/tests/tests.java.pp,
src/vm/jit/s390/tests/Makefile: Added opcode tests in java.
........
r7525 | pm | 2007-03-15 09:23:19 +0100 (Thu, 15 Mar 2007) | 2 lines
* src/vm/jit/s390/tests/tests.java.pp: added INT2CHAR test testing negative values.
........
r7526 | twisti | 2007-03-15 10:28:56 +0100 (Thu, 15 Mar 2007) | 3 lines
* src/native/jni.c (_Jv_jni_invokeNative): Release memory in exception
case.
........
r7534 | pm | 2007-03-17 00:00:18 +0100 (Sat, 17 Mar 2007) | 11 lines
* src/vm/exceptions.c (exceptions_handle_exception): 31 bit address comparison for S390. These address comparison macros need to be moved to some header.
* src/vm/jit/s390/emit.c,
src/vm/jit/s390/md.c,
src/vm/jit/s390/codegen.c,
src/vm/jit/s390/codegen.h,
src/vm/jit/s390/arch.h,
src/vm/jit/s390/patcher.c,
src/vm/jit/s390/md-abi.c,
src/vm/jit/s390/tests/tests.java.pp,
src/vm/jit/s390/tests/Makefile: Changed a lot.
........
r7535 | twisti | 2007-03-17 13:57:32 +0100 (Sat, 17 Mar 2007) | 2 lines
* src/vm/builtin.c (builtin_isanysubclass): Cleanup and comments.
........
r7536 | twisti | 2007-03-17 14:10:04 +0100 (Sat, 17 Mar 2007) | 2 lines
* src/native/vm/gnu/java_lang_reflect_Method.c (vm/resolve.h): Added.
........
r7537 | twisti | 2007-03-17 14:11:11 +0100 (Sat, 17 Mar 2007) | 3 lines
* src/vm/builtin.c (builtin_isanysubclass): Code cleanup.
(builtin_isanysubclass_vftbl): Likewise.
........
r7538 | twisti | 2007-03-17 14:12:00 +0100 (Sat, 17 Mar 2007) | 3 lines
* src/vm/builtin.h (builtin_isanysubclass_vftbl): Removed, made
static.
........
r7543 | ajordan | 2007-03-20 01:25:19 +0100 (Tue, 20 Mar 2007) | 3 lines
* src/vm/jit/sparc64/md-abi.c (md_param_alloc_native): using this for native param allocation. No need for my own version of this anymore.
* src/vm/jit/sparc64/codegen.c: Likewise.
........
r7547 | twisti | 2007-03-21 14:18:20 +0100 (Wed, 21 Mar 2007) | 4 lines
* src/vmcore/linker.c (link_primitivetype_table): Set super class
explicitly to NULL.
(linker_compute_subclasses): Indent.
........
r7548 | twisti | 2007-03-21 14:19:44 +0100 (Wed, 21 Mar 2007) | 3 lines
* src/vmcore/zip.c (zip_get): Don't assign in if-statement, this makes
debugging a bit easier.
........
r7549 | twisti | 2007-03-21 14:27:14 +0100 (Wed, 21 Mar 2007) | 22 lines
* src/vmcore/statistics.c (size_threadobject, size_lock_hashtable)
(size_lock_waiter): Added.
(statistics_print_memory_usage): Print new variables.
* src/vmcore/statistics.h (size_threadobject, size_lock_hashtable)
(size_lock_waiter): Added.
* src/threads/native/lock.c (vmcore/options.h): Added.
[ENABLE_STATISTICS] (vmcore/statistics.h): Added.
(lock_hashtable_init): Added statistics.
(lock_hashtable_grow): Likewise.
(lock_record_add_waiter): Likewise.
(lock_record_remove_waiter): Likewise.
* src/threads/native/threads.c [ENABLE_STATISTICS]
(vmcore/statistics.h): Added.
(threads_preinit): Added statistics.
(threads_init): Likewise.
(threads_start_javathread): Likewise.
(threads_attach_current_thread): Likewise.
(threads_detach_thread): Likewise.
........
r7551 | twisti | 2007-03-21 15:26:09 +0100 (Wed, 21 Mar 2007) | 8 lines
* src/vmcore/statistics.c (size_lock_record_pool): Added.
(statistics_print_memory_usage): Print new variable.
* src/vmcore/statistics.h (size_lock_record_pool): Added.
* src/threads/native/lock.c (lock_record_alloc_new_pool): Added
statistics.
........
r7554 | michi | 2007-03-22 14:55:44 +0100 (Thu, 22 Mar 2007) | 3 lines
* src/vm/jit/arm/codegen.c (codegen) [!ENABLE_SOFTFLOAT]: Fixed position of
soft null pointer checks in PUTFIELD and GETFIELD.
........
r7559 | twisti | 2007-03-23 12:56:31 +0100 (Fri, 23 Mar 2007) | 5 lines
* src/vm/jit/powerpc/emit.c (emit_load): Use switch-case instead of
if-else contruct.
(emit_store): Likewise.
(emit_copy): Likewise.
........
r7560 | twisti | 2007-03-23 19:51:41 +0100 (Fri, 23 Mar 2007) | 4 lines
* src/vmcore/classcache.c (classcache_add_constraint)
[CLASSCACHE_VERBOSE]: Started to use log-functions.
(classcache_debug_dump): Likewise.
........
r7561 | twisti | 2007-03-23 20:10:35 +0100 (Fri, 23 Mar 2007) | 7 lines
* src/vm/global.h (ACC_CLASS_PRIMITIVE): Defined.
* src/vm/builtin.c (builtin_isanysubclass): Check for primitive
classes.
* src/vmcore/linker.c (link_primitivetype_table): Set primitive flag.
........
r7562 | twisti | 2007-03-23 21:38:14 +0100 (Fri, 23 Mar 2007) | 4 lines
* src/vm/builtin.c (builtin_isanysubclass_vftbl): Removed.
(builtin_descriptorscompatible): Use builtin_isanysubclass instead of
builtin_isanysubclass_vftbl.
........
r7563 | twisti | 2007-03-23 22:33:53 +0100 (Fri, 23 Mar 2007) | 22 lines
* src/vm/builtin.c (builtin_isanysubclass): Removed.
(builtin_instanceof): Replaced builtin_isanysubclass with
class_isanysubclass.
(builtin_descriptorscompatible): Likewise.
* src/vm/builtin.h (builtin_isanysubclass): Removed.
* src/vm/access.c (access_is_accessible_member): Replaced
builtin_isanysubclass with class_isanysubclass.
* src/native/vm/java_lang_Class.c (isAssignableFrom): Likewise.
* src/vm/jit/asmpart.h (castinfo): Removed.
* src/vmcore/class.c (vm/jit/asmpart.h): Added.
(class_isanysubclass): New function.
* src/vmcore/class.h (castinfo): Added.
(class_isanysubclass): Likewise.
* src/cacaoh/dummy.c (asm_getclassvalues_atomic): New function.
(intrp_asm_getclassvalues_atomic): Likewise.
........
r7573 | twisti | 2007-03-25 20:55:02 +0200 (Sun, 25 Mar 2007) | 21 lines
* src/native/native.c (native_get_parametertypes): Removed.
(native_get_exceptiontypes): Likewise.
* src/native/native.h: Likewise.
* src/vmcore/method.c (vm/builtin.h): Added.
(vm/resolve.h): Likewise.
(method_get_parametertypearray): New function.
(method_get_exceptionarray): Likewise.
* src/vmcore/method.h (method_get_parametertypearray): Added.
(method_get_exceptionarray): Likewise.
* src/cacaoh/dummy.c (builtin_anewarray): Added.
(resolve_class_from_typedesc): Likewise.
* src/native/vm/gnu/java_lang_reflect_Method.c (getParameterTypes):
Use method function.
(getExceptionTypes): Likewise.
* src/native/vm/gnu/java_lang_reflect_Constructor.c
(getParameterTypes): Likewise.
(getExceptionTypes): Likewise.
........
r7575 | twisti | 2007-03-25 22:30:50 +0200 (Sun, 25 Mar 2007) | 9 lines
Reverted patch 7268.
* src/vm/jit/code.c: Reverted.
* src/vm/jit/code.h: Likewise.
* src/vm/jit/jit.c: Likewise.
* src/vm/jit/jit.h: Likewise.
* src/vmcore/loader.c: Likewise.
* src/vmcore/method.h: Likewise.
........
r7581 | pm | 2007-03-26 09:23:16 +0200 (Mon, 26 Mar 2007) | 10 lines
* src/vm/jit/s390/emit.c,
src/vm/jit/s390/md-abi.h,
src/vm/jit/s390/md.c,
src/vm/jit/s390/emit.h,
src/vm/jit/s390/codegen.c,
src/vm/jit/s390/codegen.h,
src/vm/jit/s390/tests/tests.java.pp,
src/vm/jit/s390/patcher.c,
src/vm/jit/s390/md-abi.c: Chaned a lot.
........
r7587 | twisti | 2007-03-28 15:29:09 +0200 (Wed, 28 Mar 2007) | 19 lines
* src/vm/exceptions.c (throw_exception_exit_intern): Removed.
(throw_exception): Likewise.
(throw_exception_exit): Likewise.
(throw_main_exception): Likewise.
(throw_main_exception_exit): Likewise.
(throw_cacao_exception_exit): Likewise.
(exceptions_print_stacktrace): New function.
* src/vm/exceptions.h: Likewise.
* src/vm/vm.c (vm_create): Use vm_abort or exceptions_print_stacktrace
instead of throw_main_exception_exit.
(vm_run): Likewise.
(vm_exit): Likewise.
(vm_get_mainclass_from_jar): Likewise.
* src/threads/native/threads.c (threads_init): Use return instead of
throw_exception_exit.
(threads_startup_thread): Use vm_abort.
........
r7593 | twisti | 2007-03-28 22:22:13 +0200 (Wed, 28 Mar 2007) | 3 lines
Initialized merge tracking via "svnmerge" with revisions "1-7592" from
svn+ssh://c1.complang.tuwien.ac.at/ahome/cacao/svn/cacao/branches/twisti
........
r7594 | twisti | 2007-03-28 22:28:37 +0200 (Wed, 28 Mar 2007) | 3 lines
Initialized merge tracking via "svnmerge" with revisions "1-6086" from
svn+ssh://c1.complang.tuwien.ac.at/ahome/cacao/svn/cacao/branches/twisti
........
r7595 | twisti | 2007-03-28 22:50:34 +0200 (Wed, 28 Mar 2007) | 3 lines
Initialized merge tracking via "svnmerge" with revisions "1-6085" from
file:///ahome/cacao/svn/cacao/branches/twisti
........
r7596 | twisti | 2007-03-28 23:05:53 +0200 (Wed, 28 Mar 2007) | 2 lines
* Merged in twisti-branch.
........
r7597 | michi | 2007-03-29 00:25:44 +0200 (Thu, 29 Mar 2007) | 2 lines
* AUTHORS: Added myself to the list of authors (finally).
........
r7598 | twisti | 2007-03-29 00:32:13 +0200 (Thu, 29 Mar 2007) | 2 lines
* svnmerge uninit.
........
--HG--
branch : exact-gc
154 files changed: