Mercurial > hg > graal-jvmci-8
comparison src/share/vm/graal/graalCompilerToVM.cpp @ 4971:5d6aa83676be
Merge fixes.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 27 Feb 2012 14:36:47 +0100 |
parents | f35c183f33ce |
children | 5d154704b04c |
comparison
equal
deleted
inserted
replaced
4970:33df1aeaebbf | 4971:5d6aa83676be |
---|---|
761 set_int(env, config, "codeEntryAlignment", CodeEntryAlignment); | 761 set_int(env, config, "codeEntryAlignment", CodeEntryAlignment); |
762 set_int(env, config, "vmPageSize", os::vm_page_size()); | 762 set_int(env, config, "vmPageSize", os::vm_page_size()); |
763 set_int(env, config, "stackShadowPages", StackShadowPages); | 763 set_int(env, config, "stackShadowPages", StackShadowPages); |
764 set_int(env, config, "hubOffset", oopDesc::klass_offset_in_bytes()); | 764 set_int(env, config, "hubOffset", oopDesc::klass_offset_in_bytes()); |
765 set_int(env, config, "arrayLengthOffset", arrayOopDesc::length_offset_in_bytes()); | 765 set_int(env, config, "arrayLengthOffset", arrayOopDesc::length_offset_in_bytes()); |
766 set_int(env, config, "klassStateOffset", instanceKlass::init_state_offset_in_bytes() + sizeof(oopDesc)); | 766 set_int(env, config, "klassStateOffset", instanceKlass::init_state_offset()); |
767 set_int(env, config, "klassStateFullyInitialized", (int)instanceKlass::fully_initialized); | 767 set_int(env, config, "klassStateFullyInitialized", (int)instanceKlass::fully_initialized); |
768 set_int(env, config, "threadTlabTopOffset", in_bytes(JavaThread::tlab_top_offset())); | 768 set_int(env, config, "threadTlabTopOffset", in_bytes(JavaThread::tlab_top_offset())); |
769 set_int(env, config, "threadTlabEndOffset", in_bytes(JavaThread::tlab_end_offset())); | 769 set_int(env, config, "threadTlabEndOffset", in_bytes(JavaThread::tlab_end_offset())); |
770 set_int(env, config, "threadObjectOffset", in_bytes(JavaThread::threadObj_offset())); | 770 set_int(env, config, "threadObjectOffset", in_bytes(JavaThread::threadObj_offset())); |
771 set_int(env, config, "instanceHeaderPrototypeOffset", Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes()); | 771 set_int(env, config, "instanceHeaderPrototypeOffset", Klass::prototype_header_offset()); |
772 set_int(env, config, "threadExceptionOopOffset", in_bytes(JavaThread::exception_oop_offset())); | 772 set_int(env, config, "threadExceptionOopOffset", in_bytes(JavaThread::exception_oop_offset())); |
773 set_int(env, config, "threadExceptionPcOffset", in_bytes(JavaThread::exception_pc_offset())); | 773 set_int(env, config, "threadExceptionPcOffset", in_bytes(JavaThread::exception_pc_offset())); |
774 set_int(env, config, "threadMultiNewArrayStorage", in_bytes(JavaThread::graal_multinewarray_storage_offset())); | 774 set_int(env, config, "threadMultiNewArrayStorage", in_bytes(JavaThread::graal_multinewarray_storage_offset())); |
775 set_int(env, config, "classMirrorOffset", klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes()); | 775 set_int(env, config, "classMirrorOffset", Klass::java_mirror_offset()); |
776 | 776 |
777 set_int(env, config, "methodDataOopDataOffset", in_bytes(methodDataOopDesc::data_offset())); | 777 set_int(env, config, "methodDataOopDataOffset", in_bytes(methodDataOopDesc::data_offset())); |
778 set_int(env, config, "dataLayoutHeaderSize", DataLayout::header_size_in_bytes()); | 778 set_int(env, config, "dataLayoutHeaderSize", DataLayout::header_size_in_bytes()); |
779 set_int(env, config, "dataLayoutTagOffset", in_bytes(DataLayout::tag_offset())); | 779 set_int(env, config, "dataLayoutTagOffset", in_bytes(DataLayout::tag_offset())); |
780 set_int(env, config, "dataLayoutFlagsOffset", in_bytes(DataLayout::flags_offset())); | 780 set_int(env, config, "dataLayoutFlagsOffset", in_bytes(DataLayout::flags_offset())); |
803 set_long(env, config, "monitorExitStub", VmIds::addStub(Runtime1::entry_for(Runtime1::monitorexit_id))); | 803 set_long(env, config, "monitorExitStub", VmIds::addStub(Runtime1::entry_for(Runtime1::monitorexit_id))); |
804 set_long(env, config, "fastMonitorEnterStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_monitorenter_id))); | 804 set_long(env, config, "fastMonitorEnterStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_monitorenter_id))); |
805 set_long(env, config, "fastMonitorExitStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_monitorexit_id))); | 805 set_long(env, config, "fastMonitorExitStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_monitorexit_id))); |
806 set_long(env, config, "safepointPollingAddress", (jlong)(os::get_polling_page() + (SafepointPollOffset % os::vm_page_size()))); | 806 set_long(env, config, "safepointPollingAddress", (jlong)(os::get_polling_page() + (SafepointPollOffset % os::vm_page_size()))); |
807 set_int(env, config, "runtimeCallStackSize", (jint)frame::arg_reg_save_area_bytes); | 807 set_int(env, config, "runtimeCallStackSize", (jint)frame::arg_reg_save_area_bytes); |
808 set_int(env, config, "klassModifierFlagsOffset", Klass::modifier_flags_offset_in_bytes() + sizeof(oopDesc)); | 808 set_int(env, config, "klassModifierFlagsOffset", Klass::modifier_flags_offset()); |
809 set_int(env, config, "graalMirrorKlassOffset", klassOopDesc::klass_part_offset_in_bytes() + Klass::graal_mirror_offset_in_bytes()); | 809 set_int(env, config, "graalMirrorKlassOffset", Klass::graal_mirror_offset()); |
810 set_int(env, config, "klassOopOffset", java_lang_Class::klass_offset_in_bytes()); | 810 set_int(env, config, "klassOopOffset", java_lang_Class::klass_offset_in_bytes()); |
811 | 811 |
812 set_boolean(env, config, "isPollingPageFar", Assembler::is_polling_page_far()); | 812 set_boolean(env, config, "isPollingPageFar", Assembler::is_polling_page_far()); |
813 | 813 |
814 set_int(env, config, "nmethodEntryOffset", nmethod::verified_entry_point_offset()); | 814 set_int(env, config, "nmethodEntryOffset", nmethod::verified_entry_point_offset()); |
842 for (int i=0; i<basicTypeCount; i++) { | 842 for (int i=0; i<basicTypeCount; i++) { |
843 jint offset = arrayOopDesc::base_offset_in_bytes(basicTypes[i]); | 843 jint offset = arrayOopDesc::base_offset_in_bytes(basicTypes[i]); |
844 env->SetIntArrayRegion(arrayOffsets, i, 1, &offset); | 844 env->SetIntArrayRegion(arrayOffsets, i, 1, &offset); |
845 } | 845 } |
846 set_int_array(env, config, "arrayOffsets", arrayOffsets); | 846 set_int_array(env, config, "arrayOffsets", arrayOffsets); |
847 set_int(env, config, "arrayClassElementOffset", objArrayKlass::element_klass_offset_in_bytes() + sizeof(oopDesc)); | 847 set_int(env, config, "arrayClassElementOffset", objArrayKlass::element_klass_offset()); |
848 return config; | 848 return config; |
849 } | 849 } |
850 | 850 |
851 // public HotSpotCompiledMethod installMethod(HotSpotTargetMethod targetMethod, boolean installCode); | 851 // public HotSpotCompiledMethod installMethod(HotSpotTargetMethod targetMethod, boolean installCode); |
852 JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_installMethod(JNIEnv *jniEnv, jobject, jobject targetMethod, jboolean install_code) { | 852 JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_installMethod(JNIEnv *jniEnv, jobject, jobject targetMethod, jboolean install_code) { |