Michael Starzinger [Mon, 8 Oct 2007 22:30:05 +0000 (00:30 +0200)]
* src/native/jni.c (_Jv_JNI_DeleteLocalRef): Fixed compiler warning.
(_Jv_JNI_GetXXXField, _Jv_JNI_SetXXXField): Fixed for handles.
(_Jv_JNI_GetStaticObjectField, _Jv_JNI_SetStaticObjectField): Likewise.
(_Jv_JNI_SetObjectArrayElement): Adapted to new builtin_canstore.
(_Jv_JNI_NewGlobalRef): Made LLNI critical sections smaller to avoid deadlock.
Michael Starzinger [Mon, 8 Oct 2007 22:19:05 +0000 (00:19 +0200)]
* src/threads/native/threads.c (threads_detach_thread): Fixed debug output and
compiler warning.
Christian Thalinger [Mon, 8 Oct 2007 20:28:19 +0000 (22:28 +0200)]
* src/vm/jit/powerpc/arch.h (JIT_COMPILER_VIA_SIGNAL): Temporarily
added.
* src/vm/jit/powerpc/asmpart.S (asm_call_jit_compiler): Removed.
(L_jit_asm_compile$stub): Likewise.
(L_exceptions_get_and_clear_exception$stub): Likewise.
* src/vm/jit/powerpc/codegen.c (codegen_emit_stub_compiler): Removed.
* src/vm/jit/powerpc/codegen.h (COMPILERSTUB_CODESIZE): Adapted size.
* src/vm/jit/powerpc/darwin/md-asm.h (asm_call_jit_compiler): Removed.
(exceptions_get_and_clear_exception): Likewise.
(jit_asm_compile): Likewise.
* src/vm/jit/powerpc/emit.c (emit_trap_compiler): New function.
* src/vm/jit/powerpc/darwin/md-os.c (md_signal_handler_sigsegv): Added
compiler-by-signals code.
* src/vm/jit/powerpc/linux/md-os.c: Likewise.
Christian Thalinger [Mon, 8 Oct 2007 20:04:26 +0000 (22:04 +0200)]
* src/vm/jit/powerpc/codegen.c (codegen_emit_stub_native): Removed
patcher stuff.
Christian Thalinger [Mon, 8 Oct 2007 18:40:19 +0000 (20:40 +0200)]
* tests/regression/extest.java: Updated a bit and added another
testcase.
* tests/regression/extest.2output: Updated.
* tests/regression/extest_clinit.java: Removed.
Christian Thalinger [Mon, 8 Oct 2007 18:35:52 +0000 (20:35 +0200)]
* src/vm/jit/stacktrace.c (stacktrace_stackframeinfo_add) [!NDEBUG]:
Added DebugStackFrameInfo output.
(stacktrace_stackframeinfo_remove): Likewise.
(stacktrace_stack_walk): Bugfix when a patcher in a leaf-method causes
an exception.
Michael Starzinger [Mon, 8 Oct 2007 17:51:40 +0000 (19:51 +0200)]
* src/vm/builtin.c: Major cleanup of code and commentes, to much to list here,
please accept my apologies for this short commit message. Everything is
Handles-ready now.
* src/vm/builtin.h: Adapted signatures of builtins and added vim boilerplate.
Michael Starzinger [Mon, 8 Oct 2007 15:56:48 +0000 (17:56 +0200)]
* src/native/llni.h (LLNI_QUICKWRAP): Added new macro.
* src/threads/native/lock.h: Use above macro for internal locking.
(LOCK_WAIT_FOREVER, LOCK_NOTIFY): Added new macros.
* src/vm/finalizer.c: Use internal locking macros throughout the code.
* src/vm/jit/optimizing/recompile.c: Likewise.
Christian Thalinger [Mon, 8 Oct 2007 15:50:04 +0000 (17:50 +0200)]
* src/vm/jit/replace.c (replace_create_replacement_points): Use new
code inline functions.
(replace_pop_activation_record): Likewise.
(replace_push_activation_record): Likewise.
Michael Starzinger [Mon, 8 Oct 2007 15:25:09 +0000 (17:25 +0200)]
* src/vm/jit/arm/emit.c (emit_verbosecall_exit): Fixed comments.
Michael Starzinger [Mon, 8 Oct 2007 14:57:26 +0000 (16:57 +0200)]
* src/vm/vm.c (vm_create): Moved localref_table_init from vm_createjvm.
Michael Starzinger [Mon, 8 Oct 2007 13:12:45 +0000 (15:12 +0200)]
* src/native/vm/cldc1.1/java_lang_Object.c
(Java_java_lang_Object_notify): Adapted to new locking function signatures.
(Java_java_lang_Object_notifyAll): Likewise.
(Java_java_lang_Object_wait): Likewise.
* src/native/vm/gnu/java_lang_VMObject.c
(Java_java_lang_VMObject_notify): Adapted to new locking function signatures.
(Java_java_lang_VMObject_notifyAll): Likewise.
(Java_java_lang_VMObject_wait): Likewise.
* src/native/vm/sun/jvm.c
(JVM_MonitorWait): Adapted to new locking function signatures.
(JVM_MonitorNotify): Likewise.
(JVM_MonitorNotifyAll): Likewise.
Christian Thalinger [Mon, 8 Oct 2007 11:49:43 +0000 (13:49 +0200)]
* Merged with
ad640e81c710.
Christian Thalinger [Mon, 8 Oct 2007 11:48:59 +0000 (13:48 +0200)]
* src/vm/jit/code.h (codeinfo): Renamed codeflags to flags.
(CODE_IS_VALID, CODE_IS_INVALID, CODE_IS_LEAFMETHOD)
(CODE_SETFLAG_INVALID, CODE_SETFLAG_LEAFMETHOD): Removed.
(code_is_invalid, code_flag_invalid, code_unflag_invalid): New inline
function.
(code_is_leafmethod, code_flag_leafmethod, code_unflag_leafmethod):
Likewise.
* src/vm/jit/jit.c (jit_invalidate_code): Use new inline functions.
(jit_get_current_code): Likewise.
Michael Starzinger [Mon, 8 Oct 2007 11:36:44 +0000 (13:36 +0200)]
* src/threads/lock-common.h: Changed signature of most locking functions to
take handles as arguments.
* src/cacaoh/dummy.c: Adapted to new signatures.
* src/threads/native/lock.c: Adapted to new signatures and added LLNI critical
sections. Will slow down locking for [ENABLE_HANDLES && ENABLE_GC_CACAO].
(lock_lockword_get). Implemented.
(lock_lockword_set): Implemented.
Michael Starzinger [Mon, 8 Oct 2007 11:10:51 +0000 (13:10 +0200)]
* src/vm/jit/alpha/emit.c (emit_verbosecall_enter): Adapted to use new tracer.
(emit_verbosecall_exit): Likewise.
* src/vm/jit/alpha/md-abi.h (TRACE_ARGS_NUM): Removed.
Michael Starzinger [Sun, 7 Oct 2007 23:12:02 +0000 (01:12 +0200)]
* src/native/llni.h (LLNI_CRITICAL_START_THREAD): Added faster macro.
(LLNI_CRITICAL_END_THREAD): Likewise.
* src/native/llni.c (llni_critical_start_thread): Implemented faster function.
(llni_critical_end_thread): Likewise.
Michael Starzinger [Sun, 7 Oct 2007 22:29:12 +0000 (00:29 +0200)]
* src/native/llni.h (LLNI_field_set_ref): Fixed problem with NULL references.
Michael Starzinger [Sun, 7 Oct 2007 19:23:03 +0000 (21:23 +0200)]
* src/vm/builtin.c (builtin_print_argument): Removed obsolete function.
(builtin_verbosecall_enter): Made a dummy function, use new tracer.
(builtin_verbosecall_exit): Likewise.
Michael Starzinger [Sun, 7 Oct 2007 19:19:01 +0000 (21:19 +0200)]
* src/vm/jit/powerpc64/emit.c (emit_verbosecall_enter): Adapted to use new tracer.
(emit_verbosecall_exit): Likewise.
* src/vm/jit/powerpc64/linux/md-abi.h (TRACE_ARGS_NUM): Removed.
Michael Starzinger [Sun, 7 Oct 2007 17:55:53 +0000 (19:55 +0200)]
* src/vm/jit/arm/emit.c (emit_verbosecall_enter): Adapted to use new tracer.
(emit_verbosecall_exit): Likewise.
* src/vm/jit/arm/md-abi.h (TRACE_ARGS_NUM): Removed.
Michael Starzinger [Sun, 7 Oct 2007 17:12:16 +0000 (19:12 +0200)]
* src/vm/jit/i386/emit.c (emit_verbosecall_enter): Adapted to use new tracer.
(emit_verbosecall_exit): Likewise.
* src/vm/jit/i386/md-abi.h (TRACE_ARGS_NUM): Removed.
Michael Starzinger [Sun, 7 Oct 2007 15:26:47 +0000 (17:26 +0200)]
* src/vm/jit/x86_64/emit.c (emit_verbosecall_enter): Adapted to use new tracer.
(emit_verbosecall_exit): Likewise.
* src/vm/jit/x86_64/md-abi.h (TRACE_ARGS_NUM): Removed.
* src/vm/jit/s390/md-abi.h (TRACE_ARGS_NUM): Removed, already uses new tracer.
* src/vm/jit/powerpc/darwin/md-abi.h (TRACE_ARGS_NUM): Likewise.
* src/vm/jit/powerpc/linux/md-abi.h (TRACE_ARGS_NUM): Likewise.
* src/vm/jit/powerpc/netbsd/md-abi.h (TRACE_ARGS_NUM): Likewise.
* src/vm/jit/powerpc/emit.c (vm/builtin.h): Removed obsolete include.
Michael Starzinger [Sat, 6 Oct 2007 21:33:39 +0000 (23:33 +0200)]
* src/threads/threads-common.h (threads_thread_get_object): Added.
(threads_thread_set_object): Added.
* src/threads/threads-common.c: Use above functions throughout the code.
* src/threads/native/threads.c: Likewise.
* src/native/vm/java_lang_Thread.c: Likewise.
(_Jv_java_lang_Thread_start): Fixed compiler warning.
(_Jv_java_lang_Thread_currentThread) [ENABLE_JAVASE]: Fixed for handles.
Michael Starzinger [Sat, 6 Oct 2007 18:54:45 +0000 (20:54 +0200)]
* src/native/llni.h (LLNI_objectarray_element_set) Removed.
(LLNI_objectarray_element_get) Removed.
* src/native/jni.c: Use array_objectarray functions throughout the code.
* src/vm/builtin.c: Likewise.
Michael Starzinger [Sat, 6 Oct 2007 18:42:36 +0000 (20:42 +0200)]
* src/native/jni.c (_Jv_JNI_DeleteLocalRef): Handle NULL references correctly.
* src/native/localref.c (localref_add, localref_del): Added assertion.
Christian Thalinger [Sat, 6 Oct 2007 11:30:28 +0000 (13:30 +0200)]
* src/vm/jit/jit.c (jit_compile_intern): Use native_method_resolve and
check for exception.
* src/vm/jit/x86_64/codegen.c (codegen_emit_stub_native): Removed
patcher stuff.
Christian Thalinger [Sat, 6 Oct 2007 09:47:57 +0000 (11:47 +0200)]
* src/native/native.c (native_resolve_function): Renamed to
native_method_resolve.
* src/native/native.h: Likewise.
* src/vm/jit/patcher-common.c (patcher_resolve_native_function):
Likewise.
Christian Thalinger [Fri, 5 Oct 2007 23:27:47 +0000 (01:27 +0200)]
* src/vm/jit/allocator/simplereg.c (ICMD_IF_FCMPxx, ICMD_IF_FCMPL_xx):
Removed.
* src/vm/jit/jit.h: Likewise.
* src/vm/jit/powerpc/codegen.c: Likewise.
* src/vm/jit/powerpc64/codegen.c: Likewise.
* src/vm/jit/show.c: Likewise.
* src/vm/jit/stack.c: Likewise.
* src/vm/jit/verify/icmds.c: Likewise.
Michael Starzinger [Wed, 3 Oct 2007 21:45:26 +0000 (23:45 +0200)]
* src/vm/array.c (array_objectarray_element_set): Fixed for handles.
(array_objectarray_element_get): Likewise.
* src/cacaoh/dummy.c
(array_objectarray_element_set): Do not use LLNI_objectarray macros.
(array_objectarray_element_get): Likewise.
* src/vm/jit/argument.c: Use array_objectarray functions instead of
LLNI_objectarray.
* src/vm/jit/stacktrace.c: Likewise.
Christian Thalinger [Wed, 3 Oct 2007 21:43:17 +0000 (23:43 +0200)]
* src/vm/jit/stacktrace.c (stacktrace_create_stackframeinfo): Removed.
(stacktrace_create_extern_stackframeinfo): Renamed to
stacktrace_stackframeinfo_add.
(stacktrace_remove_stackframeinfo): Renamed to
stacktrace_stackframeinfo_remove.
* src/vm/jit/stacktrace.h: Likewise.
* src/vm/exceptions.c,
src/vm/jit/codegen-common.c,
src/vm/jit/jit.c,
src/vm/jit/m68k/patcher.c,
src/vm/jit/sparc64/patcher.c,
src/vm/signal.c: Renamed functions as above.
Michael Starzinger [Wed, 3 Oct 2007 21:19:52 +0000 (23:19 +0200)]
* src/vm/jit/x86_64/codegen.c (codegen_emit_stub_native): Fixed stackframesize
for (md->paramcount == 0 && md->returntype != TYPE_VOID) cases.
Michael Starzinger [Wed, 3 Oct 2007 21:17:58 +0000 (23:17 +0200)]
* src/native/localref.c: Improved debug output with -XX:+DebugLocalReferences.
(localref_check_uncleared): Implemented.
* src/vmcore/options.c (opt_DebugLocalReferences): Added.
* src/vmcore/options.h (opt_DebugLocalReferences): Likewise.
Christian Thalinger [Wed, 3 Oct 2007 21:05:08 +0000 (23:05 +0200)]
* src/vm/jit/codegen-common.c (codegen_start_native_call): Renamed
currentsp to sp, removed javara, use
stacktrace_create_extern_stackframeinfo instead of
stacktrace_create_native_stackframeinfo.
(codegen_finish_native_call): Renamed currentsp to sp.
* src/vm/jit/stacktrace.c (stdint.h): Added.
(stacktrace_create_extern_stackframe): Always get methodinfo and store
it in stackframeinfo.
(stacktrace_create_native_stackframeinfo): Removed.
(stacktrace_add_entry): Renamed to stacktrace_entry_add, made inline.
(stacktrace_add_method): Renamed to stacktrace_method_add, made
inline.
(stacktrace_stack_walk): New function.
(stacktrace_create): Completely rewritten.
Michael Starzinger [Wed, 3 Oct 2007 15:33:39 +0000 (17:33 +0200)]
* src/vm/jit/stacktrace.c (stacktrace_fillInStackTrace): Returns a bytearray.
(stacktrace_print_trace): Does not use stacktracecontainer anymore.
* src/vm/jit/stacktrace.h (stacktracecontainer): Removed.
(stacktrace_fillInStackTrace): Adapted prototype to above change.
* src/native/vm/cldc1.1/java_lang_Throwable.c: Adapted to above changes.
* src/native/vm/gnu/java_lang_VMThrowable.c: Likewise.
* src/native/vm/sun/jvm.c: Likewise.
Christian Thalinger [Wed, 3 Oct 2007 14:47:07 +0000 (16:47 +0200)]
* src/vm/jit/jit.c (jit_compile_handle): Removed unused variable.
Christian Thalinger [Wed, 3 Oct 2007 14:37:24 +0000 (16:37 +0200)]
* src/vm/jit/powerpc64/arch.h (JIT_COMPILER_VIA_SIGNAL): Temporarily
added.
* src/vm/jit/powerpc64/asmpart.S (asm_call_jit_compiler): Removed.
* src/vm/jit/powerpc64/codegen.c (codegen_emit_stub_compiler):
Likewise.
* src/vm/jit/powerpc64/codegen.h (COMPILERSTUB_CODESIZE): Adapted
size.
* src/vm/jit/powerpc64/emit.c (emit_trap_compiler): New function.
* src/vm/jit/powerpc64/linux/md-os.c (md_signal_handler_sigsegv):
Added compiler-by-signals code.
Christian Thalinger [Wed, 3 Oct 2007 14:15:03 +0000 (16:15 +0200)]
* src/vm/jit/alpha/arch.h (JIT_COMPILER_VIA_SIGNAL): Temporarily
added.
* src/vm/jit/alpha/asmpart.S (asm_call_jit_compiler): Removed.
* src/vm/jit/alpha/codegen.c (codegen_emit_stub_compiler): Likewise.
* src/vm/jit/alpha/codegen.h (COMPILERSTUB_CODESIZE): Adapted size.
* src/vm/jit/alpha/emit.c (emit_trap_compiler): New function.
* src/vm/jit/alpha/linux/md-os.c (vm/exceptions.h): Added.
(md_signal_handler_sigsegv): Added compiler-by-signals code.
Michael Starzinger [Wed, 3 Oct 2007 13:25:09 +0000 (15:25 +0200)]
* src/vm/vm.c: Use array_objectarray functions instead of LLNI_objectarray.
* src/native/vm/gnu/gnu_classpath_VMStackWalker.c: Likewise.
* src/native/vm/gnu/java_lang_VMThrowable.c: Likewise.
* src/native/vm/java_lang_Class.c: Likewise.
Christian Thalinger [Wed, 3 Oct 2007 13:03:30 +0000 (15:03 +0200)]
* src/vm/jit/m68k/md.c (md_codegen_patch_branch): Removed.
* src/vm/jit/powerpc64/md.c: Likewise.
* src/vm/jit/s390/md.c: Likewise.
Michael Starzinger [Wed, 3 Oct 2007 13:01:22 +0000 (15:01 +0200)]
* src/vm/builtintable.inc (builtintable_internal): Added preliminary entry for
builtin_multianewarray.
Michael Starzinger [Wed, 3 Oct 2007 11:27:28 +0000 (13:27 +0200)]
* src/mm/memory.h [ENABLE_GC_BOEHM]: GCNEW macros are available for boehm only.
* src/native/localref.c: Adapted ifdefs to above change.
* src/vmcore/class.c: Adapted ifdefs to above change.
(class_free): Fixed, fields array get freed properly.
* src/vmcore/field.c: Adapted ifdefs to above change.
(field_free): Implemented, field value memory gets freed.
Michael Starzinger [Mon, 1 Oct 2007 20:22:47 +0000 (22:22 +0200)]
* src/native/vm/reflect.c [ENABLE_ANNOTATIONS]: Fixed includes.
Michael Starzinger [Mon, 1 Oct 2007 18:59:47 +0000 (20:59 +0200)]
* doc/Makefile.am: Fixed clean target to work properly.
* doc/handbook/Makefile.am: Likewise.
Christian Thalinger [Mon, 1 Oct 2007 15:51:31 +0000 (17:51 +0200)]
* src/vm/jit/i386/md.c (vm/vm.h): Added.
(md_jit_method_patch_address): Rewritten to new proposed version.
Christian Thalinger [Mon, 1 Oct 2007 15:39:41 +0000 (17:39 +0200)]
* src/vm/jit/i386/linux/md-os.c (md_signal_handler_sigsegv): Set PV
and XPC correctly.
Christian Thalinger [Mon, 1 Oct 2007 15:37:28 +0000 (17:37 +0200)]
* src/vm/jit/i386/emit.c (emit_verbosecall_enter): Use M_CLTD.
Christian Thalinger [Mon, 1 Oct 2007 15:33:19 +0000 (17:33 +0200)]
* src/vm/jit/jit.c (jit_compile_handle): Changed signature.
* src/vm/jit/jit.h: Likewise.
* src/vm/jit/x86_64/linux/md-os.c (md_signal_handler_sigsegv): Set PV
and XPC correctly.
* src/vm/signal.c (signal_handle): Get the methodinfo pointer and pass
it to jit_compile_handle.
Christian Thalinger [Mon, 1 Oct 2007 14:05:01 +0000 (16:05 +0200)]
* src/vm/jit/i386/arch.h (JIT_COMPILER_VIA_SIGNAL): Temporarily added.
* src/vm/jit/i386/asmpart.S (asm_call_jit_compiler): Removed.
* src/vm/jit/i386/codegen.c (codegen_emit_stub_compiler): Likewise.
* src/vm/jit/i386/codegen.h (COMPILERSTUB_CODESIZE): Adapted size.
(M_BYTE1, M_BYTE2): New macros.
(M_CLTD, M_RET, M_NOP): Use M_BYTE1.
(M_UD2): Use M_BYTE2.
* src/vm/jit/i386/emit.c (emit_trap_compiler): New function.
(emit_trap): Use macros.
(emit_cltd, emit_ret, emit_nop): Removed.
* src/vm/jit/i386/emit.h (emit_cltd, emit_ret, emit_nop): Likewise.
* src/vm/jit/i386/linux/md-os.c (md_signal_handler_sigsegv): Added JIT
compiler code.
Christian Thalinger [Mon, 1 Oct 2007 14:01:52 +0000 (16:01 +0200)]
* src/vm/jit/x86_64/emit.c (emit_trap_compiler): Fixed comment.
Christian Thalinger [Mon, 1 Oct 2007 13:06:51 +0000 (15:06 +0200)]
* src/vm/jit/x86_64/linux/md-os.c (md_signal_handler_sigsegv): Removed
debug output.
Christian Thalinger [Mon, 1 Oct 2007 13:03:23 +0000 (15:03 +0200)]
* src/native/vm/sun/jvm.c (JVM_InitProperties): Fixed warning.
Christian Thalinger [Mon, 1 Oct 2007 13:01:10 +0000 (15:01 +0200)]
* src/native/vm/sun/jvm.c (vm/system.h): Added.
(JVM_ActiveProcessorCount): Implemented.
Christian Thalinger [Mon, 1 Oct 2007 12:54:33 +0000 (14:54 +0200)]
* src/native/vm/gnu/java_lang_VMRuntime.c (vm/system.h): Added.
(availableProcessors): Use system_processors_online.
* src/vm/Makefile.am (libvm_la_SOURCES): Added system.[ch].
* src/vm/system.c: New file.
* src/vm/system.h: Likewise.
Christian Thalinger [Mon, 1 Oct 2007 12:12:48 +0000 (14:12 +0200)]
* src/vm/jit/jit.c (jit_compile_handle): Fixed warning.
* src/vm/vm.c (vm_abort_disassemble): Likewise.
Christian Thalinger [Mon, 1 Oct 2007 12:08:34 +0000 (14:08 +0200)]
* src/native/vm/sun/jvm.c (JVM_SetClassSigners): Implemented.
* src/vmcore/class.h (classinfo) [WITH_CLASSPATH_SUN]: Added signers.
Christian Thalinger [Mon, 1 Oct 2007 11:17:44 +0000 (13:17 +0200)]
* src/vm/jit/jit.c (jit_compile_intern) [WITH_CLASSPATH_SUN]: Don't
verify sub-classes of sun/reflect/MagicAccessorImpl.
Peter Molnar [Sat, 29 Sep 2007 21:10:15 +0000 (21:10 +0000)]
* src/vm/jit/s390/patcher.c (patcher_checkcast_instanceof_interface): Fix error introduced in changeset 7586.
Peter Molnar [Sat, 29 Sep 2007 20:47:09 +0000 (20:47 +0000)]
* src/vm/jit/s390/codegen.h: Added functions for instruction parsing and manipulation, added opcode defines.
* src/vm/jit/s390/codegen.c (codegen_emit): Replaced handcrafted machined code patching by marco.
* src/vm/jit/s390/emit.c (emit_branch): Likewise.
* src/vm/jit/s390/md.c (md_jit_method_patch_address, md_signal_handler_sigsegv, md_signal_handler_sigill, md_signal_handler_sigfpe): Replaced handcrafted machine code parsing and patching by calls to new functions.
* src/vm/jit/s390/patcher.c (patcher_invokeinterface, patcher_invokevirtual, patcher_get_putfield): Likewise.
Christian Thalinger [Sat, 29 Sep 2007 18:09:34 +0000 (20:09 +0200)]
* src/vm/jit/asmpart.h [!JIT_COMPILER_VIA_SIGNAL]
(asm_call_jit_compiler): Added #ifdef.
* src/vm/jit/codegen-common.c (codegen_generate_stub_compiler)
[JIT_COMPILER_VIA_SIGNAL]: Added new code.
* src/vm/jit/codegen-common.h [!JIT_COMPILER_VIA_SIGNAL]
(codegen_emit_stub_compiler): Added #ifdef.
* src/vm/jit/emit-common.h (emit_trap_compiler): Added.
* src/vm/jit/jit.c [!JIT_COMPILER_VIA_SIGNAL] (jit_asm_compile): Added
#ifdef.
(jit_compile_handle): New function.
* src/vm/jit/jit.h (vm/jit/stacktrace.h): Added.
[!JIT_COMPILER_VIA_SIGNAL] (jit_asm_compile): Added #ifdef.
* src/vm/jit/x86_64/arch.h (JIT_COMPILER_VIA_SIGNAL): Added
temporarily.
* src/vm/jit/x86_64/asmpart.S (asm_call_jit_compiler): Removed.
* src/vm/jit/x86_64/codegen.c (codegen_emit_stub_compiler): Removed.
* src/vm/jit/x86_64/codegen.h (COMPILERSTUB_CODESIZE): Adapted.
* src/vm/jit/x86_64/emit.c (emit_trap_compiler): New function.
* src/vm/jit/x86_64/linux/md-os.c (md_signal_handler_sigsegv): Added
JIT compiler handling code.
* src/vm/signal.c (signal_handle): Likewise.
Christian Thalinger [Sat, 29 Sep 2007 16:12:52 +0000 (18:12 +0200)]
* src/vm/jit/md.h (md_get_method_patch_address): Removed.
* src/vm/jit/jit.h (md_jit_method_patch_address): Added.
* src/vm/jit/jit.c (jit_asm_compile): Call md_jit_method_patch_address
with new signature.
* src/vm/jit/replace.c (replace_patch_future_calls): Likewise.
* src/vm/jit/alpha/md.c,
src/vm/jit/arm/md.c,
src/vm/jit/i386/md.c,
src/vm/jit/m68k/md.c,
src/vm/jit/mips/md.c,
src/vm/jit/powerpc/md.c,
src/vm/jit/powerpc64/md.c,
src/vm/jit/s390/md.c,
src/vm/jit/sparc64/md.c,
src/vm/jit/x86_64/md.c: Tried to fix the includes.
(md_get_method_patch_address): Renamed to md_jit_method_patch_address
and changed the signature.
Christian Thalinger [Sat, 29 Sep 2007 15:34:54 +0000 (17:34 +0200)]
* src/vm/jit/alpha/codegen.h (M_MEM_GET_Opcode): New macro.
(M_MEM_GET_A): Renamed to M_MEM_GET_Ra to be consistent with handbook.
(M_MEM_GET_B): Renamed to M_MEM_GET_Rb.
(M_MEM_GET_DISP): Renamed to M_MEM_GET_Memory_disp.
* src/vm/jit/alpha/linux/md-os.c (md_signal_handler_sigsegv): Use new
macro names.
Christian Thalinger [Sat, 29 Sep 2007 10:51:13 +0000 (12:51 +0200)]
* src/vm/vm.c [ENABLE_DISASSEMBLER] (vm/jit/disass.h): Added.
(vm_abort_disassemble): New function.
* src/vm/vm.h (vm_abort_disassemble): Likewise.
Christian Thalinger [Fri, 28 Sep 2007 18:31:10 +0000 (20:31 +0200)]
* src/native/jni.c: Merged with
93595e0b477d.
Michael Starzinger [Fri, 28 Sep 2007 14:42:22 +0000 (16:42 +0200)]
* src/vm/jit/replace.c (replace_gc_into_native): Implemented.
* src/mm/cacao-gc/rootset.c (rootset_writeback): Use above function.
Christian Thalinger [Fri, 28 Sep 2007 13:24:58 +0000 (15:24 +0200)]
* src/vm/jit/powerpc/asmpart.S (asm_vm_call_method): Don't fake a Java
call, because we don't patch this call anymore (TODO: all other
architectures as well).
Christian Thalinger [Fri, 28 Sep 2007 13:18:20 +0000 (15:18 +0200)]
* src/native/jni.c (_Jv_JNI_GetEnv): Use jni_version_check.
Christian Thalinger [Fri, 28 Sep 2007 13:12:26 +0000 (15:12 +0200)]
* src/vm/jit/powerpc/asmpart.S
(L_stacktrace_create_extern_stackframeinfo$stub): Removed.
(L_stacktrace_remove_stackframeinfo$stub): Likewise.
(L_replace_me$stub): Likewise.
(L_replace_build_execution_state$stub): Likewise.
(L_replace_free_safestack$stub): Likewise.
* src/vm/jit/powerpc/darwin/md-asm.h (jumptable_int, jumptable_long):
Removed.
(asm_patcher_wrapper): Likewise.
(patcher_wrapper): Likewise.
(replace_me): Likewise.
(replace_build_execution_state): Likewise.
(replace_free_safestack): Likewise.
(stacktrace_create_extern_stackframeinfo): Likewise.
(stacktrace_remove_stackframeinfo): Likewise.
Michael Starzinger [Fri, 28 Sep 2007 11:17:17 +0000 (13:17 +0200)]
* src/mm/cacao-gc/compact.c (compact_thread_classes): Removed obsolete function.
* src/mm/cacao-gc/mark.c (mark_classes): Likewise.
Michael Starzinger [Fri, 28 Sep 2007 11:14:08 +0000 (13:14 +0200)]
* src/vm/jit/argument.c: Added missing method comments.
(vm/exceptions.h): Removed include.
(argument_vmarray_from_objectarray): Do not throw exceptions, but return NULL.
* src/vm/vm.c (vm_call_method_objectarray): Adapted to above changes and fixed
nativeworld sections.
Christian Thalinger [Fri, 28 Sep 2007 08:47:38 +0000 (10:47 +0200)]
* src/vm/jit/jit.c (TRACECOMPILERCALLS): New macro.
(jit_compile): Use TRACECOMPILERCALLS.
(jit_compile_intern): Removed some DEBUG_JIT_COMPILEVERBOSE.
* src/vmcore/options.c (opt_TraceCompilerCalls): New variable.
(options_xx): Handle opt_TraceCompilerCalls.
* src/vmcore/options.h (opt_TraceCompilerCalls): Added.
Peter Molnar [Thu, 27 Sep 2007 22:12:29 +0000 (22:12 +0000)]
* src/vm/jit/s390/codegen.h (N_BRANCH_MIN, N_BRANCH_MAX): Fix (muliply by 2).
Michael Starzinger [Thu, 27 Sep 2007 19:19:31 +0000 (21:19 +0200)]
* src/vm/jit/argument.c (argument_vmarray_store_adr): Fixed for handles.
* src/vm/vm.c (vm_call_array): Likewise.
Michael Starzinger [Thu, 27 Sep 2007 19:05:19 +0000 (21:05 +0200)]
* src/vm/vm.c (vm_call_array): Made static, removed compiler call.
(vm_call_method_objectarray): Added.
(vm_call_method_valist): Added nativeworld macros, added compiler call.
(vm_call_method_jvalue): Likewise.
* src/vm/vm.h (vm_call_array): Removed prototypes.
(vm_call_method_objectarray): Added prototype.
* src/native/jni.c (_Jv_jni_invokeNative): Moved parts to vm.c for clearness.
Christian Thalinger [Thu, 27 Sep 2007 18:57:57 +0000 (20:57 +0200)]
* src/vm/jit/code.c (code_get_methodinfo_for_pv): Return NULL if code
is NULL (asm_vm_call_method).
Michael Starzinger [Thu, 27 Sep 2007 18:44:27 +0000 (20:44 +0200)]
* src/threads/threads-common.c (vmcore/options.h): Fixed include.
Christian Thalinger [Thu, 27 Sep 2007 16:23:47 +0000 (18:23 +0200)]
* src/mm/memory.c (memory_mprotect): Fixed signature, manpage is wrong
about the signature of mprotect.
* src/mm/memory.h: Likewise.
Michael Starzinger [Thu, 27 Sep 2007 10:48:12 +0000 (12:48 +0200)]
* src/vm/jit/argument.c (argument_vmarray_store_int),
(argument_vmarray_store_lng),
(argument_vmarray_store_flt),
(argument_vmarray_store_dbl),
(argument_vmarray_store_adr),
(argument_vmarray_from_valist),
(argument_vmarray_from_jvalue),
(argument_vmarray_from_objectarray): Moved from vm.c to this file.
* src/vm/jit/argument.h (argument_vmarray_from_valist): Added prototype.
(argument_vmarray_from_jvalue): Likewise.
(argument_vmarray_from_objectarray): Likewise.
* src/vm/vm.c: See above!
* src/vm/vm.h (vm_array_from_objectarray): Removed prototype.
* src/native/jni.c (_Jv_jni_invokeNative): Adapted to above changes.
Christian Thalinger [Thu, 27 Sep 2007 10:16:49 +0000 (12:16 +0200)]
* src/vmcore/class.c (class_is_primitive,
class_is_anonymousclass,
class_is_array,
class_is_interface,
class_is_localclass,
class_is_memberclass,
class_get_classloader,
class_get_superclass): Moved to class.h and made them static inline.
* src/vmcore/class.h: Likewise.
Michael Starzinger [Thu, 27 Sep 2007 10:03:21 +0000 (12:03 +0200)]
* src/threads/lock-common.h: Removed obsolete comment.
* src/toolbox/logging.c (threads/threads-common.h): Added include.
Michael Starzinger [Thu, 27 Sep 2007 09:48:43 +0000 (11:48 +0200)]
* src/mm/gc-common.h (heap_hashcode): Added inline function.
* src/native/jni.c: Use above function throughout file.
* src/native/vm/gnu/java_lang_VMSystem.c: Likewise.
* src/threads/native/lock.c: Likewise.
* src/vmcore/loader.c: Likewise.
Christian Thalinger [Wed, 26 Sep 2007 11:01:19 +0000 (13:01 +0200)]
* src/threads/native/lock.c: Renamed monitorPtr to lockword in the
whole file.
(stdint.h): Added.
* src/vm/global.h (stdint.h): Added.
(java_object_t): Renamed monitorPtr to lockword and changed the type
to uintptr_t.
Michael Starzinger [Wed, 26 Sep 2007 01:29:46 +0000 (03:29 +0200)]
* src/threads/native/threads.c (threads_init): Removed obsolete call to register
references with the GC.
* src/threads/threads-common.c (threads_thread_new): Also register reference
to exception object with the GC.
Michael Starzinger [Wed, 26 Sep 2007 01:09:51 +0000 (03:09 +0200)]
* src/threads/native/threads.c: Improved debug output.
* src/threads/threads-common.c: Likewise.
* src/threads/threads-common.h (DEBUGTHREADS): Added.
* src/vm/vm.c (vm_create): Removed -verbose:threads option.
* src/vmcore/options.c (opt_DebugThreads): Added -XX:+DebugThreads option.
* src/vmcore/options.h (opt_DebugThreads): Likewise.
Michael Starzinger [Tue, 25 Sep 2007 22:23:55 +0000 (00:23 +0200)]
* src/threads/native/threads.h (native/include/java_lang_Thread.h): Removed.
(threadobject): The object pointer is of type java_object_t now.
* src/threads/native/threads.c: Adapted to above changes and use LLNI macros.
* src/threads/threads-common.h (threads_thread_start): Changed signature to not
use java_lang_Thread anymore.
* src/threads/threads-common.c: Adapted to above changes and use LLNI macros.
(threads_preinit): Fixed corruption of mainthread->flags.
Michael Starzinger [Tue, 25 Sep 2007 21:34:27 +0000 (23:34 +0200)]
* src/vm/jit/alpha/md.c (md_patch_replacement_point): Removed debug code.
* src/vm/jit/i386/md.c: Likewise.
* src/vm/jit/mips/md.c: Likewise.
* src/vm/jit/powerpc/md.c: Likewise.
* src/vm/jit/powerpc64/md.c: Likewise.
* src/vm/jit/sparc64/md.c: Likewise.
* src/vm/jit/x86_64/md.c: Likewise.
* src/vm/jit/replace.c
(replace_activate_replacement_points) [ENABLE_DISASSEMBLER]: Improved debug.
(replace_deactivate_replacement_points) [ENABLE_DISASSEMBLER]: Likewise.
Michael Starzinger [Tue, 25 Sep 2007 13:10:55 +0000 (15:10 +0200)]
* src/native/localref.c [ENABLE_HANDLES] (localref_native_exit): Implemented.
(localref_native_enter): Renamed from localref_fill.
* src/native/localref.h (localref_native_exit): Added prototype.
(localref_native_enter): Renamed from localref_fill.
* src/vm/jit/argument.c (argument_jitreturn_store): Implemented.
* src/vm/jit/argument.h (argument_jitreturn_store): Added prototype.
* src/vm/jit/codegen-common.c (codegen_start_native_call): Improved comments
and adapted to above changes.
(codegen_finish_native_call): Likewise.
Michael Starzinger [Tue, 25 Sep 2007 13:03:29 +0000 (15:03 +0200)]
* src/cacaoh/dummy.c (llni_critical_start, llni_critical_end): Removed aborts.
Michael Starzinger [Tue, 25 Sep 2007 12:55:56 +0000 (14:55 +0200)]
* src/vm/signal.c (signal_handle): Wrap and unwrap references correctly.
Michael Starzinger [Tue, 25 Sep 2007 11:32:15 +0000 (13:32 +0200)]
* src/vm/jit/replace.c (replace_find_replacement_point_for_pc): Fixed assertion.
(replace_me_wrapper): Simplified search for replacement point.
Michael Starzinger [Tue, 25 Sep 2007 10:23:40 +0000 (12:23 +0200)]
* src/vm/jit/alpha/linux/md-os.c (md_replace_executionstate_write): Fixed
compiler warning.
* src/vm/jit/x86_64/linux/md-os.c (md_replace_executionstate_read): Implemented.
(md_replace_executionstate_write): Likewise.
Michael Starzinger [Tue, 25 Sep 2007 10:16:53 +0000 (12:16 +0200)]
* src/vm/jit/i386/arch.h (REPLACEMENT_PATCH_SIZE): Adapted to new trap mcode.
* src/vm/jit/x86_64/arch.h (REPLACEMENT_PATCH_SIZE): Likewise.
Michael Starzinger [Tue, 25 Sep 2007 07:32:51 +0000 (09:32 +0200)]
* src/vm/jit/codegen-common.c (codegen_set_replacement_point): Add NOPs if
replacement testing mode is enabled.
* src/vm/jit/replace.c (replace_me_wrapper): Finished implementation.
(replace_me): Major code cleanup. Removed safestack stuff.
(replace_build_execution_state): Likewise.
(replace_activate_replacement_points): Adapted changes from previous rev.
(replace_deactivate_replacement_points): Likewise.
(replace_alloc_safestack): Removed.
(replace_free_safestack): Removed.
* src/vm/jit/replace.h (replace_safestack_t): Removed.
(md_replace_executionstate_read): Added prototype.
(md_replace_executionstate_write): Likewise.
* src/vm/signal.c (signal_handle): Adapted to new replace_me_wrapper.
Michael Starzinger [Mon, 24 Sep 2007 23:11:17 +0000 (01:11 +0200)]
* src/vm/signallocal.h (signal_handle): Changed signature.
* src/vm/signal.c (signal_handles): Create stackframeinfo here.
* src/vm/jit/alpha/linux/md-os.c (md_signal_handler_sigsegv): Adapted to new
signature and removed stackframeinfo creation.
* src/vm/jit/arm/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/m68k/linux/md-os.c: Likewise.
* src/vm/jit/mips/irix/md-os.c: Likewise.
* src/vm/jit/mips/linux/md-os.c: Likewise.
* src/vm/jit/powerpc/darwin/md-os.c: Likewise.
* src/vm/jit/powerpc/linux/md-os.c: Likewise.
* src/vm/jit/powerpc64/linux/md-os.c: Likewise.
* src/vm/jit/s390/md.c: Likewise.
* src/vm/jit/sparc64/linux/md-os.c: Likewise.
* src/vm/jit/sparc64/solaris/md-os.c: Likewise.
* src/vm/jit/x86_64/linux/md-os.c: Likewise.
Michael Starzinger [Mon, 24 Sep 2007 20:46:16 +0000 (22:46 +0200)]
* src/vm/jit/i386/asmpart.S (asm_replacement_in, asm_replacement_out): Removed
obsolete functions.
* src/vm/jit/i386/cygwin/md-asm.h: Likewise.
* src/vm/jit/i386/darwin/md-asm.h: Likewise.
* src/vm/jit/mips/asmpart.S: Likewise.
* src/vm/jit/powerpc/asmpart.S: Likewise.
* src/vm/jit/powerpc/darwin/md-asm.h: Likewise.
* src/vm/jit/powerpc64/asmpart.S: Likewise.
* src/vm/jit/s390/asmpart.S: Likewise.
* src/vm/jit/x86_64/asmpart.S: Likewise.
Michael Starzinger [Mon, 24 Sep 2007 20:36:23 +0000 (22:36 +0200)]
* src/vm/jit/m68k/emit.c (emit_replacement_stubs): Removed obsolete function.
* src/vm/jit/i386/linux/md-os.c: Reordered functions in file.
Michael Starzinger [Mon, 24 Sep 2007 20:23:42 +0000 (22:23 +0200)]
* src/vm/jit/alpha/md.c (md_patch_replacement_point): Changed signature.
* src/vm/jit/i386/md.c: Likewise.
* src/vm/jit/mips/md.c: Likewise.
* src/vm/jit/powerpc/md.c: Likewise.
* src/vm/jit/powerpc64/md.c: Likewise.
* src/vm/jit/s390/md.c: Likewise.
* src/vm/jit/sparc64/md.c: Likewise.
* src/vm/jit/x86_64/md.c: Likewise.
Michael Starzinger [Mon, 24 Sep 2007 18:25:13 +0000 (20:25 +0200)]
* src/vm/jit/jit.c (jit_compile_intern) [ENABLE_REPLACEMENT]: Activate
replacement points after code generation if testing option is given.
* src/vmcore/options.c [ENABLE_REPLACEMENT] (opt_TestReplacement): Added
replacement testing option.
* src/vmcore/options.h [ENABLE_REPLACEMENT] (opt_TestReplacement): Likewise.
Christian Thalinger [Sun, 23 Sep 2007 19:19:28 +0000 (21:19 +0200)]
* src/vmcore/statistics.c (size_stacksize): New variable.
(statistics_print_memory_usage): Print new variable.
* src/vmcore/statistics.h (size_stacksize): Added.
Christian Thalinger [Sun, 23 Sep 2007 19:18:31 +0000 (21:18 +0200)]
* src/mm/memory.c (memory_mprotect): New function.
* src/mm/memory.h: Likewise.
projects / cacao.git / log