Merged revisions 8137-8178 via svnmerge from
authormichi <none@none>
Thu, 5 Jul 2007 11:21:08 +0000 (11:21 +0000)
committermichi <none@none>
Thu, 5 Jul 2007 11:21:08 +0000 (11:21 +0000)
commit66ddc64ad81adbde39a82fca7adee578555a90ed
treee64b8aa3be99c074cda8d7796b4127f84042da44
parentd7150e2e489280e3216bdb503f8fa03b8df5f6a1
Merged revisions 8137-8178 via svnmerge from
svn+ssh://michi@c1.complang.tuwien.ac.at/ahome/cacao/svn/cacao/trunk

........
  r8139 | twisti | 2007-06-24 12:12:27 +0200 (Sun, 24 Jun 2007) | 3 lines

  * src/vm/jit/stacktrace.c (stacktrace_print_trace): Handle
  WITH_CLASSPATH_SUN properly.
........
  r8142 | pm | 2007-06-25 20:58:11 +0200 (Mon, 25 Jun 2007) | 3 lines

  * src/vm/jit/s390/tests/jasmin.status: Added.
........
  r8143 | twisti | 2007-06-26 17:47:43 +0200 (Tue, 26 Jun 2007) | 3 lines

  * src/vm/jit/i386/patcher.c (patcher_builtin_multianewarray): Dont'
  patch function address.
........
  r8144 | pm | 2007-06-26 23:16:35 +0200 (Tue, 26 Jun 2007) | 3 lines

  * src/vm/jit/s390/tests/dacapo.status: Added more dacapo eclipse results.
........
  r8145 | michi | 2007-06-27 10:54:10 +0200 (Wed, 27 Jun 2007) | 16 lines

  * src/vm/jit/patcher-common.h: Added.
  * src/vm/jit/patcher-common.t: Added.
  * src/vm/jit/Makefile.am: Added above two files.

  * src/vm/jit/code.h (codeinfo): Added patcher list.
  * src/vm/jit/code.c (code_codeinfo_new, code_codeinfo_free): Patcher list is
  created and freed together with codeinfo.

  * src/vm/jit/codegen-common.c (codegen_finish): Absolute PCs for patchers are
  resolved.

  * src/vm/jit/emit-common.h (emit_patcher_traps): Added prototype.

  * src/vm/exception.c (exceptions_new_hardware_exception): Patcher handler is
  called if needed.
........
  r8146 | michi | 2007-06-27 11:04:17 +0200 (Wed, 27 Jun 2007) | 3 lines

  * src/vm/exceptions.h: Added EXCEPTION_HARDWARE_COMPILER.
  * src/vm/exceptions.c (exceptions_init): Made check clearer.
........
  r8147 | twisti | 2007-06-27 11:23:24 +0200 (Wed, 27 Jun 2007) | 2 lines

  * src/native/vm/gnu/java_lang_VMRuntime.c (unistd.h): Added.
........
  r8149 | twisti | 2007-06-27 15:26:49 +0200 (Wed, 27 Jun 2007) | 3 lines

  * src/native/vm/sun_misc_Unsafe.c (putObject): New function.
  (park): New function, but not implemented.
........
  r8150 | twisti | 2007-06-27 20:35:40 +0200 (Wed, 27 Jun 2007) | 6 lines

  * src/mm/boehm.c (gc_init): Set GC_all_interior_pointers to 0 and call
  GC_INIT very late.

  * src/vm/vm.c (vm_create): Initialze the GC before all other
  subsystems.
........
  r8151 | pm | 2007-06-27 22:08:30 +0200 (Wed, 27 Jun 2007) | 2 lines

  * src/vm/jit/s390/codegen.c (codegen_emit): Replace some load/stores by a mvc.
........
  r8152 | pm | 2007-06-27 22:37:45 +0200 (Wed, 27 Jun 2007) | 2 lines

  * src/vm/jit/s390/codegen.c (codegen_emit): Fix profiling code.
........
  r8153 | ajordan | 2007-06-27 22:56:03 +0200 (Wed, 27 Jun 2007) | 12 lines

  * src/vm/jit/sparc64/md-abi.h: Removed faulty register offset
  multiplication from REG_WINDOW_TRANSPOSE.

  * src/vm/jit/sparc64/asmpart.S: fixed offsets.h include.

  * src/vm/jit/sparc64/solaris/macro_rename.h: Added include,
  which renames the REG_SP defined from Solaris sys headers to
  REG_SP_SOLARIS and defines mine.
  * src/vm/jit/sparc64/emit.c: Used here.
  * src/vm/jit/sparc64/codegen.c: Used here.
  * src/vm/jit/sparc64/patcher.c: Used here.
........
  r8154 | ajordan | 2007-06-27 22:56:57 +0200 (Wed, 27 Jun 2007) | 2 lines

  * configure.ac: Added librt for SPARC/Solaris.
........
  r8155 | ajordan | 2007-06-27 23:53:44 +0200 (Wed, 27 Jun 2007) | 6 lines

  * src/vm/builtin.c (builtin_f2l): Added for DISABLE_GC.
  (builtin_d2l): Likewise.

  * src/native/jni.c (_Jv_jni_invokeNative): Added SPARC to defines, corrected
  bitwise & for ARM.
........
  r8156 | ajordan | 2007-06-28 00:07:28 +0200 (Thu, 28 Jun 2007) | 2 lines

  * configure.ac: Check for librt should only be done on Solaris.
........
  r8157 | michi | 2007-06-28 00:12:32 +0200 (Thu, 28 Jun 2007) | 3 lines

  * src/vm/vm.c: Fixed messed up ifdefs introduced with M68K.
  * src/vm/vm.h: Likewise.
........
  r8158 | ajordan | 2007-06-28 02:01:34 +0200 (Thu, 28 Jun 2007) | 6 lines

  * src/vm/jit/sparc64/md-abi.c (md_param_alloc): Added absolute offsets for
  native arguments (reguse * 8).

  * src/vm/jit/sparc64/codegen.c (codegen_emit_stub_native): Adapted to
  change above.
........
  r8159 | michi | 2007-06-28 02:31:31 +0200 (Thu, 28 Jun 2007) | 5 lines

  * src/vm/jit/verify/typecheck-typeinferer.c: Removed patcher.h include.
  * src/vm/jit/verify/typecheck.c: Likewise.
  * src/vm/jit/parse.c: Likewise.
  * src/vm/builtin.c: Likewise.
........
  r8160 | michi | 2007-06-28 03:52:19 +0200 (Thu, 28 Jun 2007) | 26 lines

  * src/vm/jit/arm/emit.c (emit_patcher_traps): Formerly known
  as emit_patcher_stubs, now emits traps instead of stubs.

  * src/vm/jit/arm/codegen.c (codegen_emit, codegen_emit_stub_native): Call the
  new patcher functions and adapted to above change.

  * src/vm/jit/arm/patcher.c: Adapted patchers to new signature for traps.
  (patcher_get_putfield): Fixed severe bug for long values.
  (patcher_wrapper): Removed, this is obsolete.

  * src/vm/jit/arm/codegen.h (M_TRAP): Added.

  * src/vm/jit/arm/asmpart.S (asm_patcher_wrapper): Removed, this is obsolete.

  * src/vm/jit/arm/linux/md-os.c (md_signal_handler_sigill): Only calls the
  exception handling if exception object present.

  * src/vm/jit/patcher-common.c: Fixed includes.

  * src/vm/jit/patcher-common.h [__ARM__]: Added prototypes for patcher functions.
  (patchref_t): Added datap.

  * src/vm/jit/patcher.h [__ARM__]: Defined away old patcher stuff.

  * src/vm/jit/codegen-common.c (codegen_finish): Resolves pr->datap as well.
........
  r8161 | twisti | 2007-06-28 12:30:08 +0200 (Thu, 28 Jun 2007) | 11 lines

  * src/vm/global.h (ACC_CLASS_REFERENCE_MASK): Added.
  (ACC_CLASS_SOFT_REFERENCE): Renamed to ACC_CLASS_REFERENCE_SOFT.
  (ACC_CLASS_WEAK_REFERENCE): Renamed to ACC_CLASS_REFERENCE_WEAK.
  (ACC_CLASS_PHANTOM_REFERENCE): Renamed to ACC_CLASS_REFERENCE_PHANTOM.

  * src/vmcore/class.c (class_create_classinfo): Flag soft/weak/phantom
  reference classes.

  * src/vmcore/linker.c (link_class_intern): Inherit the reference
  flags.
........
  r8162 | twisti | 2007-06-28 15:40:37 +0200 (Thu, 28 Jun 2007) | 2 lines

  * src/native/vm/sun/jvm.c: Added copyright header.
........
  r8163 | twisti | 2007-06-29 20:53:55 +0200 (Fri, 29 Jun 2007) | 16 lines

  * configure.ac (AC_CHECK_HEADERS): Added netdb.h, ucontext.h.
  (AC_CHECK_FUNCS): Added gethostbyname, htons, malloc, recv, send.
  (AC_CHECK_ENABLE_ZLIB): Moved code to function.
  (AC_CHECK_ENABLE_LTDL): Likewise.

  * m4/zlib.m4: New file.
  * m4/ltdl.m4: Likewise.

  * src/native/native.c [ENABLE_LTDL && HAVE_LTDL_H] (ltdl.h): Added
  #ifdef.
  [ENABLE_LTDL] (hashtable_library): Likewise.
  (native_init) [ENABLE_LTDL]: Likewise.
  [ENABLE_LTDL] (native_library_open): Likewise.
  [ENABLE_LTDL] (native_library_add): Likewise.
  [ENABLE_LTLD] (native_library_find): Likewise.
........
  r8164 | twisti | 2007-06-29 20:56:08 +0200 (Fri, 29 Jun 2007) | 2 lines

  * src/native/native.c (native_library_find): Typo.
........
  r8165 | twisti | 2007-06-29 21:02:08 +0200 (Fri, 29 Jun 2007) | 4 lines

  * src/native/vm/java_lang_Runtime.c [ENABLE_LTDL && HAVE_LTDL_H]
  (ltdl.h): Added #ifdef.
  (loadLibrary) [ENABLE_LTDL]: Likewise.
........
  r8166 | twisti | 2007-06-29 21:45:17 +0200 (Fri, 29 Jun 2007) | 9 lines

  * src/native/native.c: Removed wrong comment.

  * src/native/native.h [ENABLE_LTDL && HAVE_LTDL_H] (ltdl.h): Added
  #ifdef.
  [ENABLE_LTDL] (hashtable_library_loader_entry): Likewise.
  [ENABLE_LTDL] (hashtable_library_name_entry): Likewise.
  [ENABLE_LTDL] (native_library_open, native_library_add)
  (native_library_find): Likewise.
........
  r8167 | twisti | 2007-06-29 22:27:41 +0200 (Fri, 29 Jun 2007) | 3 lines

  * src/native/native.h (hashtable_library_name_entry): Moved up, build
  fix.
........
  r8168 | twisti | 2007-06-30 14:20:48 +0200 (Sat, 30 Jun 2007) | 2 lines

  * src/mm/nogc.c (vm/vm.h): Added.
........
  r8169 | twisti | 2007-06-30 14:33:50 +0200 (Sat, 30 Jun 2007) | 18 lines

  * src/vmcore/class.c (class_is_array): New function.
  (class_is_interface): Likewise.
  * src/vmcore/class.h: Likewise.

  * src/native/vm/java_lang_Class.c (stdint.h): Added.
  (isInterface): Made JNI function, use class_is_interface.
  (isArray): Made JNI function, use class_is_array.
  * src/native/vm/java_lang_Class.h: Likewise.

  * src/native/vm/cldc1.1/java_lang_Class.c (methods): Register common
  methods for isInterface and isArray.
  (isInterface): Removed.
  (isArray): Likewise.

  * src/native/vm/gnu/java_lang_VMClass.c (isInterface): Changed to JNI
  call.
  (isArray): Likewise.
........
  r8170 | twisti | 2007-06-30 16:03:18 +0200 (Sat, 30 Jun 2007) | 23 lines

  * src/native/jni.c [ENABLE_JAVASE] (native/vm/reflect.h): Added.
  (_Jv_JNI_ToReflectedMethod): Implemented.

  * src/native/vm/java_lang_Class.c [ENABLE_JAVASE]
  (native/vm/reflect.h): Added.
  (getDeclaredFields): Use reflect_field_new.
  (getDeclaredMethods): Use reflect_method_new.
  (getDeclaredConstructors): Use reflect_constructor_new.
  (getEnclosingConstructor): Use reflect_constructor_new.
  (getEnclosingMethod): Use reflect_method_new.

  * src/native/vm/sun/jvm.c (jio_vsnprintf): Added count check.
  (jio_snprintf): Implemented.
  (JVM_IsInterface): Use class_is_interface.
  (JVM_IsArrayClass): Use class_is_array.
  (JVM_InvokeMethod): Disabled debug output.

  * src/native/vm/reflect.c: New file.
  * src/native/vm/reflect.h: Likewise.

  * src/native/vm/Makefile.am [ENABLE_JAVASE] (REFLECT_SOURCES): Added.
  (libnativevm_la_SOURCES): Added REFLECT_SOURCES.
........
  r8171 | twisti | 2007-06-30 16:13:58 +0200 (Sat, 30 Jun 2007) | 2 lines

  * src/native/vm/reflect.c: Fixed includes.
........
  r8172 | twisti | 2007-06-30 16:14:52 +0200 (Sat, 30 Jun 2007) | 3 lines

  * src/native/vm/reflect.c: Added Id keyword.
  * src/native/vm/reflect.h: Likewise.
........
  r8173 | twisti | 2007-06-30 19:40:09 +0200 (Sat, 30 Jun 2007) | 3 lines

  * src/native/vm/sun/jvm.c (JVM_Available): Fixed return value (seems
  it's a boolean value, 1 is OK, 0 is error).
........
  r8174 | twisti | 2007-07-01 19:49:25 +0200 (Sun, 01 Jul 2007) | 2 lines

  * src/vmcore/options.c (options_xx): Fixed warnings.
........
  r8175 | twisti | 2007-07-02 16:07:24 +0200 (Mon, 02 Jul 2007) | 3 lines

  * src/vm/exceptions.c (exceptions_init) [!(__ARM__ && __LINUX__)]:
  Don't mmap page 0x0 on arm-linux.
........
  r8176 | twisti | 2007-07-03 17:43:14 +0200 (Tue, 03 Jul 2007) | 3 lines

  * src/vm/jit/i386/darwin/Makefile.am (AM_CPPFLAGS): Added
  -I$(top_builddir)/src.
........
  r8177 | twisti | 2007-07-03 18:05:27 +0200 (Tue, 03 Jul 2007) | 3 lines

  * src/native/vm/sun_misc_Unsafe.c (methods): Added unpark.
  (unpark): New function, but unimplemented.
........
  r8178 | michi | 2007-07-05 13:13:20 +0200 (Thu, 05 Jul 2007) | 22 lines

  * src/vm/exceptions.c (exceptions_new_hardware_exception):  Stackframeinfo block
  is now on the stack of the signal handler function.

  * src/vm/exceptions.h (exceptions_new_hardware_exception): Changed signature.

  * src/vm/jit/arm/linux/md-os.c (md_signal_handler_sigsegv): Passes sfi to
  exceptions function.

  * src/vm/jit/powerpc/linux/md-os.c: Likewise.
  * src/vm/jit/powerpc/darwin/md-os.c: Likewise.
  * src/vm/jit/sparc64/linux/md-os.c: Likewise.
  * src/vm/jit/sparc64/solaris/md-os.c: Likewise.
  * src/vm/jit/alpha/linux/md-os.c: Likewise.
  * src/vm/jit/s390/md.c: Likewise.
  * src/vm/jit/mips/linux/md-os.c: Likewise.
  * src/vm/jit/mips/irix/md-os.c: Likewise.
  * src/vm/jit/m68k/linux/md-os.c: Likewise.
  * src/vm/jit/powerpc64/linux/md-os.c: Likewise.
  * src/vm/jit/i386/darwin/md-os.c: Likewise.
  * src/vm/jit/i386/linux/md-os.c: Likewise.
  * src/vm/jit/x86_64/linux/md-os.c: Likewise.
........

--HG--
branch : exact-gc
63 files changed:
configure.ac
src/mm/boehm.c
src/mm/nogc.c
src/native/jni.c
src/native/native.c
src/native/native.h
src/native/vm/Makefile.am
src/native/vm/cldc1.1/java_lang_Class.c
src/native/vm/gnu/java_lang_VMClass.c
src/native/vm/gnu/java_lang_VMRuntime.c
src/native/vm/java_lang_Class.c
src/native/vm/java_lang_Class.h
src/native/vm/java_lang_Runtime.c
src/native/vm/sun_misc_Unsafe.c
src/vm/builtin.c
src/vm/exceptions.c
src/vm/exceptions.h
src/vm/global.h
src/vm/jit/Makefile.am
src/vm/jit/alpha/linux/md-os.c
src/vm/jit/arm/asmpart.S
src/vm/jit/arm/codegen.c
src/vm/jit/arm/codegen.h
src/vm/jit/arm/emit.c
src/vm/jit/arm/linux/md-os.c
src/vm/jit/arm/patcher.c
src/vm/jit/code.c
src/vm/jit/code.h
src/vm/jit/codegen-common.c
src/vm/jit/emit-common.h
src/vm/jit/i386/darwin/Makefile.am
src/vm/jit/i386/darwin/md-os.c
src/vm/jit/i386/linux/md-os.c
src/vm/jit/i386/patcher.c
src/vm/jit/m68k/linux/md-os.c
src/vm/jit/mips/irix/md-os.c
src/vm/jit/mips/linux/md-os.c
src/vm/jit/parse.c
src/vm/jit/patcher.h
src/vm/jit/powerpc/darwin/md-os.c
src/vm/jit/powerpc/linux/md-os.c
src/vm/jit/powerpc64/linux/md-os.c
src/vm/jit/s390/codegen.c
src/vm/jit/s390/md.c
src/vm/jit/s390/tests/dacapo.status
src/vm/jit/sparc64/asmpart.S
src/vm/jit/sparc64/codegen.c
src/vm/jit/sparc64/emit.c
src/vm/jit/sparc64/linux/md-os.c
src/vm/jit/sparc64/md-abi.c
src/vm/jit/sparc64/md-abi.h
src/vm/jit/sparc64/patcher.c
src/vm/jit/sparc64/solaris/md-os.c
src/vm/jit/stacktrace.c
src/vm/jit/verify/typecheck-typeinferer.c
src/vm/jit/verify/typecheck.c
src/vm/jit/x86_64/linux/md-os.c
src/vm/vm.c
src/vm/vm.h
src/vmcore/class.c
src/vmcore/class.h
src/vmcore/linker.c
src/vmcore/options.c