Mercurial > hg > graal-compiler
comparison src/share/vm/graal/graalCompilerToVM.cpp @ 9022:80aee92588cd
Merge
author | Christian Wimmer <christian.wimmer@oracle.com> |
---|---|
date | Thu, 11 Apr 2013 15:41:48 -0700 |
parents | 627dc359e918 3b0ec709827c |
children | e0e85d78843b |
comparison
equal
deleted
inserted
replaced
9021:0524e6e34ad8 | 9022:80aee92588cd |
---|---|
655 set_int("methodMaxLocalsOffset", in_bytes(ConstMethod::size_of_locals_offset())); | 655 set_int("methodMaxLocalsOffset", in_bytes(ConstMethod::size_of_locals_offset())); |
656 set_int("methodConstMethodOffset", in_bytes(Method::const_offset())); | 656 set_int("methodConstMethodOffset", in_bytes(Method::const_offset())); |
657 set_int("constMethodMaxStackOffset", in_bytes(ConstMethod::max_stack_offset())); | 657 set_int("constMethodMaxStackOffset", in_bytes(ConstMethod::max_stack_offset())); |
658 set_int("extraStackEntries", Method::extra_stack_entries()); | 658 set_int("extraStackEntries", Method::extra_stack_entries()); |
659 set_int("methodAccessFlagsOffset", in_bytes(Method::access_flags_offset())); | 659 set_int("methodAccessFlagsOffset", in_bytes(Method::access_flags_offset())); |
660 set_int("methodIntrinsicIdOffset", Method::intrinsic_id_offset_in_bytes()); | |
660 set_int("klassHasFinalizerFlag", JVM_ACC_HAS_FINALIZER); | 661 set_int("klassHasFinalizerFlag", JVM_ACC_HAS_FINALIZER); |
661 set_int("threadExceptionOopOffset", in_bytes(JavaThread::exception_oop_offset())); | 662 set_int("threadExceptionOopOffset", in_bytes(JavaThread::exception_oop_offset())); |
662 set_int("threadExceptionPcOffset", in_bytes(JavaThread::exception_pc_offset())); | 663 set_int("threadExceptionPcOffset", in_bytes(JavaThread::exception_pc_offset())); |
663 set_boolean("isPollingPageFar", Assembler::is_polling_page_far()); | 664 set_boolean("isPollingPageFar", Assembler::is_polling_page_far()); |
664 set_int("classMirrorOffset", in_bytes(Klass::java_mirror_offset())); | 665 set_int("classMirrorOffset", in_bytes(Klass::java_mirror_offset())); |
778 set_int("deoptActionNone", Deoptimization::Action_none); | 779 set_int("deoptActionNone", Deoptimization::Action_none); |
779 set_int("deoptActionMaybeRecompile", Deoptimization::Action_maybe_recompile); | 780 set_int("deoptActionMaybeRecompile", Deoptimization::Action_maybe_recompile); |
780 set_int("deoptActionReinterpret", Deoptimization::Action_reinterpret); | 781 set_int("deoptActionReinterpret", Deoptimization::Action_reinterpret); |
781 set_int("deoptActionMakeNotEntrant", Deoptimization::Action_make_not_entrant); | 782 set_int("deoptActionMakeNotEntrant", Deoptimization::Action_make_not_entrant); |
782 set_int("deoptActionMakeNotCompilable", Deoptimization::Action_make_not_compilable); | 783 set_int("deoptActionMakeNotCompilable", Deoptimization::Action_make_not_compilable); |
784 | |
785 set_int("vmIntrinsicInvokeBasic", vmIntrinsics::_invokeBasic); | |
786 set_int("vmIntrinsicLinkToVirtual", vmIntrinsics::_linkToVirtual); | |
787 set_int("vmIntrinsicLinkToStatic", vmIntrinsics::_linkToStatic); | |
788 set_int("vmIntrinsicLinkToSpecial", vmIntrinsics::_linkToSpecial); | |
789 set_int("vmIntrinsicLinkToInterface", vmIntrinsics::_linkToInterface); | |
790 | |
783 set_int("g1CardQueueIndexOffset", in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_index())); | 791 set_int("g1CardQueueIndexOffset", in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_index())); |
784 set_int("g1CardQueueBufferOffset", in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_buf())); | 792 set_int("g1CardQueueBufferOffset", in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_buf())); |
785 set_int("logOfHRGrainBytes", HeapRegion::LogOfHRGrainBytes); | 793 set_int("logOfHRGrainBytes", HeapRegion::LogOfHRGrainBytes); |
786 set_int("g1SATBQueueMarkingOffset", in_bytes(JavaThread::satb_mark_queue_offset() + PtrQueue::byte_offset_of_active())); | 794 set_int("g1SATBQueueMarkingOffset", in_bytes(JavaThread::satb_mark_queue_offset() + PtrQueue::byte_offset_of_active())); |
787 set_int("g1SATBQueueIndexOffset", in_bytes(JavaThread::satb_mark_queue_offset() + PtrQueue::byte_offset_of_index())); | 795 set_int("g1SATBQueueIndexOffset", in_bytes(JavaThread::satb_mark_queue_offset() + PtrQueue::byte_offset_of_index())); |