Mercurial > hg > truffle

comparison src/share/vm/graal/graalCompilerToVM.cpp @ 5783:22b0cb49cc60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clean up some entries in HotSpotVMConfig
author Lukas Stadler <lukas.stadler@jku.at>
date Fri, 06 Jul 2012 16:20:55 +0200
parents 2a64cf19ab2a
children 58a607307306
comparison
equal deleted inserted replaced
5777:9e56d5113c66 5783:22b0cb49cc60
802 set_int(env, config, "threadObjectOffset", in_bytes(JavaThread::threadObj_offset())); 802 set_int(env, config, "threadObjectOffset", in_bytes(JavaThread::threadObj_offset()));
803 set_int(env, config, "instanceHeaderPrototypeOffset", in_bytes(Klass::prototype_header_offset())); 803 set_int(env, config, "instanceHeaderPrototypeOffset", in_bytes(Klass::prototype_header_offset()));
804 set_int(env, config, "threadExceptionOopOffset", in_bytes(JavaThread::exception_oop_offset())); 804 set_int(env, config, "threadExceptionOopOffset", in_bytes(JavaThread::exception_oop_offset()));
805 set_int(env, config, "threadExceptionPcOffset", in_bytes(JavaThread::exception_pc_offset())); 805 set_int(env, config, "threadExceptionPcOffset", in_bytes(JavaThread::exception_pc_offset()));
806 set_int(env, config, "threadMultiNewArrayStorageOffset", in_bytes(JavaThread::graal_multinewarray_storage_offset())); 806 set_int(env, config, "threadMultiNewArrayStorageOffset", in_bytes(JavaThread::graal_multinewarray_storage_offset()));
807 set_long(env, config, "safepointPollingAddress", (jlong)(os::get_polling_page() + (SafepointPollOffset % os::vm_page_size())));
808 set_boolean(env, config, "isPollingPageFar", Assembler::is_polling_page_far());
807 set_int(env, config, "classMirrorOffset", in_bytes(Klass::java_mirror_offset())); 809 set_int(env, config, "classMirrorOffset", in_bytes(Klass::java_mirror_offset()));
810 set_int(env, config, "runtimeCallStackSize", (jint)frame::arg_reg_save_area_bytes);
811 set_int(env, config, "klassModifierFlagsOffset", in_bytes(Klass::modifier_flags_offset()));
812 set_int(env, config, "klassOopOffset", java_lang_Class::klass_offset_in_bytes());
813 set_int(env, config, "graalMirrorKlassOffset", in_bytes(Klass::graal_mirror_offset()));
814 set_int(env, config, "nmethodEntryOffset", nmethod::verified_entry_point_offset());
815 set_int(env, config, "methodCompiledEntryOffset", in_bytes(methodOopDesc::from_compiled_offset()));
808 816
809 set_int(env, config, "methodDataOopDataOffset", in_bytes(methodDataOopDesc::data_offset())); 817 set_int(env, config, "methodDataOopDataOffset", in_bytes(methodDataOopDesc::data_offset()));
810 set_int(env, config, "methodDataOopTrapHistoryOffset", in_bytes(methodDataOopDesc::trap_history_offset())); 818 set_int(env, config, "methodDataOopTrapHistoryOffset", in_bytes(methodDataOopDesc::trap_history_offset()));
811 set_int(env, config, "dataLayoutHeaderSize", DataLayout::header_size_in_bytes()); 819 set_int(env, config, "dataLayoutHeaderSize", DataLayout::header_size_in_bytes());
812 set_int(env, config, "dataLayoutTagOffset", in_bytes(DataLayout::tag_offset())); 820 set_int(env, config, "dataLayoutTagOffset", in_bytes(DataLayout::tag_offset()));
822 // The stub must also do initialization when the compiled check fails. 830 // The stub must also do initialization when the compiled check fails.
823 Runtime1::StubID newInstanceStub = Runtime1::fast_new_instance_init_check_id; 831 Runtime1::StubID newInstanceStub = Runtime1::fast_new_instance_init_check_id;
824 832
825 set_long(env, config, "debugStub", VmIds::addStub((address)warning)); 833 set_long(env, config, "debugStub", VmIds::addStub((address)warning));
826 set_long(env, config, "instanceofStub", VmIds::addStub(Runtime1::entry_for(Runtime1::slow_subtype_check_id))); 834 set_long(env, config, "instanceofStub", VmIds::addStub(Runtime1::entry_for(Runtime1::slow_subtype_check_id)));
827 set_long(env, config, "verifyOopStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_verify_oop_id)));
828 set_long(env, config, "newInstanceStub", VmIds::addStub(Runtime1::entry_for(newInstanceStub))); 835 set_long(env, config, "newInstanceStub", VmIds::addStub(Runtime1::entry_for(newInstanceStub)));
829 set_long(env, config, "newTypeArrayStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_type_array_id))); 836 set_long(env, config, "newTypeArrayStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_type_array_id)));
830 set_long(env, config, "newObjectArrayStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_object_array_id))); 837 set_long(env, config, "newObjectArrayStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_object_array_id)));
831 set_long(env, config, "newMultiArrayStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_multi_array_id))); 838 set_long(env, config, "newMultiArrayStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_multi_array_id)));
832 set_long(env, config, "loadKlassStub", VmIds::addStub(Runtime1::entry_for(Runtime1::load_klass_patching_id)));
833 set_long(env, config, "accessFieldStub", VmIds::addStub(Runtime1::entry_for(Runtime1::access_field_patching_id)));
834 set_long(env, config, "resolveStaticCallStub", VmIds::addStub(SharedRuntime::get_resolve_static_call_stub()));
835 set_long(env, config, "inlineCacheMissStub", VmIds::addStub(SharedRuntime::get_ic_miss_stub())); 839 set_long(env, config, "inlineCacheMissStub", VmIds::addStub(SharedRuntime::get_ic_miss_stub()));
836 set_long(env, config, "handleExceptionStub", VmIds::addStub(Runtime1::entry_for(Runtime1::handle_exception_nofpu_id))); 840 set_long(env, config, "handleExceptionStub", VmIds::addStub(Runtime1::entry_for(Runtime1::handle_exception_nofpu_id)));
837 set_long(env, config, "handleDeoptStub", VmIds::addStub(SharedRuntime::deopt_blob()->unpack())); 841 set_long(env, config, "handleDeoptStub", VmIds::addStub(SharedRuntime::deopt_blob()->unpack()));
838 set_long(env, config, "monitorEnterStub", VmIds::addStub(Runtime1::entry_for(Runtime1::monitorenter_id))); 842 set_long(env, config, "monitorEnterStub", VmIds::addStub(Runtime1::entry_for(Runtime1::monitorenter_id)));
839 set_long(env, config, "monitorExitStub", VmIds::addStub(Runtime1::entry_for(Runtime1::monitorexit_id))); 843 set_long(env, config, "monitorExitStub", VmIds::addStub(Runtime1::entry_for(Runtime1::monitorexit_id)));
840 set_long(env, config, "fastMonitorEnterStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_monitorenter_id))); 844 set_long(env, config, "fastMonitorEnterStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_monitorenter_id)));
841 set_long(env, config, "fastMonitorExitStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_monitorexit_id))); 845 set_long(env, config, "fastMonitorExitStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_monitorexit_id)));
842 set_long(env, config, "safepointPollingAddress", (jlong)(os::get_polling_page() + (SafepointPollOffset % os::vm_page_size()))); 846 set_long(env, config, "verifyOopStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_verify_oop_id)));
843 set_int(env, config, "runtimeCallStackSize", (jint)frame::arg_reg_save_area_bytes); 847
844 set_int(env, config, "klassModifierFlagsOffset", in_bytes(Klass::modifier_flags_offset()));
845 set_int(env, config, "graalMirrorKlassOffset", in_bytes(Klass::graal_mirror_offset()));
846 set_int(env, config, "klassOopOffset", java_lang_Class::klass_offset_in_bytes());
847 set_int(env, config, "methodCompiledEntryOffset", in_bytes(methodOopDesc::from_compiled_offset()));
848
849 set_boolean(env, config, "isPollingPageFar", Assembler::is_polling_page_far());
850
851 set_int(env, config, "nmethodEntryOffset", nmethod::verified_entry_point_offset());
852 848
853 BarrierSet* bs = Universe::heap()->barrier_set(); 849 BarrierSet* bs = Universe::heap()->barrier_set();
854 switch (bs->kind()) { 850 switch (bs->kind()) {
855 case BarrierSet::CardTableModRef: 851 case BarrierSet::CardTableModRef:
856 case BarrierSet::CardTableExtension: { 852 case BarrierSet::CardTableExtension: {