comparison src/share/vm/graal/graalCompilerToVM.cpp @ 7226:8a3efb8c831d

Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 14 Dec 2012 13:02:49 +0100
parents 31c4d9f9e922 5d0bb7d52783
children c0806f4ff3ea
comparison
equal deleted inserted replaced
7225:31c4d9f9e922 7226:8a3efb8c831d
606 set_boolean("windowsOs", true); 606 set_boolean("windowsOs", true);
607 #else 607 #else
608 set_boolean("windowsOs", false); 608 set_boolean("windowsOs", false);
609 #endif 609 #endif
610 set_boolean("verifyOops", VerifyOops); 610 set_boolean("verifyOops", VerifyOops);
611 set_boolean("useFastLocking", UseFastLocking); 611 set_boolean("useFastLocking", GraalUseFastLocking);
612 set_boolean("useFastNewObjectArray", UseFastNewObjectArray);
613 set_boolean("useBiasedLocking", UseBiasedLocking); 612 set_boolean("useBiasedLocking", UseBiasedLocking);
614 set_boolean("useFastNewTypeArray", UseFastNewTypeArray);
615 set_boolean("useTLAB", UseTLAB); 613 set_boolean("useTLAB", UseTLAB);
616 set_int("codeEntryAlignment", CodeEntryAlignment); 614 set_int("codeEntryAlignment", CodeEntryAlignment);
617 set_int("vmPageSize", os::vm_page_size()); 615 set_int("vmPageSize", os::vm_page_size());
618 set_int("stackShadowPages", StackShadowPages); 616 set_int("stackShadowPages", StackShadowPages);
619 set_int("hubOffset", oopDesc::klass_offset_in_bytes()); 617 set_int("hubOffset", oopDesc::klass_offset_in_bytes());
642 set_int("extraStackEntries", Method::extra_stack_entries()); 640 set_int("extraStackEntries", Method::extra_stack_entries());
643 set_int("methodAccessFlagsOffset", in_bytes(Method::access_flags_offset())); 641 set_int("methodAccessFlagsOffset", in_bytes(Method::access_flags_offset()));
644 set_int("klassHasFinalizerFlag", JVM_ACC_HAS_FINALIZER); 642 set_int("klassHasFinalizerFlag", JVM_ACC_HAS_FINALIZER);
645 set_int("threadExceptionOopOffset", in_bytes(JavaThread::exception_oop_offset())); 643 set_int("threadExceptionOopOffset", in_bytes(JavaThread::exception_oop_offset()));
646 set_int("threadExceptionPcOffset", in_bytes(JavaThread::exception_pc_offset())); 644 set_int("threadExceptionPcOffset", in_bytes(JavaThread::exception_pc_offset()));
647 set_long("safepointPollingAddress", (jlong)(os::get_polling_page() + (SafepointPollOffset % os::vm_page_size())));
648 set_boolean("isPollingPageFar", Assembler::is_polling_page_far()); 645 set_boolean("isPollingPageFar", Assembler::is_polling_page_far());
649 set_int("classMirrorOffset", in_bytes(Klass::java_mirror_offset())); 646 set_int("classMirrorOffset", in_bytes(Klass::java_mirror_offset()));
650 set_int("runtimeCallStackSize", (jint)frame::arg_reg_save_area_bytes); 647 set_int("runtimeCallStackSize", (jint)frame::arg_reg_save_area_bytes);
651 set_int("klassModifierFlagsOffset", in_bytes(Klass::modifier_flags_offset())); 648 set_int("klassModifierFlagsOffset", in_bytes(Klass::modifier_flags_offset()));
652 set_int("klassAccessFlagsOffset", in_bytes(Klass::access_flags_offset())); 649 set_int("klassAccessFlagsOffset", in_bytes(Klass::access_flags_offset()));
733 set_long("arithmeticCosStub", VmIds::addStub(CAST_FROM_FN_PTR(address, SharedRuntime::dcos))); 730 set_long("arithmeticCosStub", VmIds::addStub(CAST_FROM_FN_PTR(address, SharedRuntime::dcos)));
734 set_long("arithmeticTanStub", VmIds::addStub(CAST_FROM_FN_PTR(address, SharedRuntime::dtan))); 731 set_long("arithmeticTanStub", VmIds::addStub(CAST_FROM_FN_PTR(address, SharedRuntime::dtan)));
735 set_long("logPrimitiveStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_log_primitive_id))); 732 set_long("logPrimitiveStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_log_primitive_id)));
736 set_long("logObjectStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_log_object_id))); 733 set_long("logObjectStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_log_object_id)));
737 set_long("logPrintfStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_log_printf_id))); 734 set_long("logPrintfStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_log_printf_id)));
735
736 set_int("deoptReasonNone", Deoptimization::Reason_none);
737 set_int("deoptReasonNullCheck", Deoptimization::Reason_null_check);
738 set_int("deoptReasonRangeCheck", Deoptimization::Reason_range_check);
739 set_int("deoptReasonClassCheck", Deoptimization::Reason_class_check);
740 set_int("deoptReasonArrayCheck", Deoptimization::Reason_array_check);
741 set_int("deoptReasonUnreached0", Deoptimization::Reason_unreached0);
742 set_int("deoptReasonTypeCheckInlining", Deoptimization::Reason_type_checked_inlining);
743 set_int("deoptReasonOptimizedTypeCheck", Deoptimization::Reason_optimized_type_check);
744 set_int("deoptReasonNotCompiledExceptionHandler", Deoptimization::Reason_not_compiled_exception_handler);
745 set_int("deoptReasonUnresolved", Deoptimization::Reason_unresolved);
746 set_int("deoptReasonJsrMismatch", Deoptimization::Reason_jsr_mismatch);
747 set_int("deoptReasonDiv0Check", Deoptimization::Reason_div0_check);
748 set_int("deoptReasonConstraint", Deoptimization::Reason_constraint);
749
750 set_int("deoptActionNone", Deoptimization::Action_none);
751 set_int("deoptActionMaybeRecompile", Deoptimization::Action_maybe_recompile);
752 set_int("deoptActionReinterpret", Deoptimization::Action_reinterpret);
753 set_int("deoptActionMakeNotEntrant", Deoptimization::Action_make_not_entrant);
754 set_int("deoptActionMakeNotCompilable", Deoptimization::Action_make_not_compilable);
738 755
739 756
740 BarrierSet* bs = Universe::heap()->barrier_set(); 757 BarrierSet* bs = Universe::heap()->barrier_set();
741 switch (bs->kind()) { 758 switch (bs->kind()) {
742 case BarrierSet::CardTableModRef: 759 case BarrierSet::CardTableModRef: