Mercurial > hg > graal-jvmci-8
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompilerToVM.cpp Mon Feb 27 13:10:13 2012 +0100 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Mon Feb 27 14:36:47 2012 +0100 @@ -763,16 +763,16 @@ set_int(env, config, "stackShadowPages", StackShadowPages); set_int(env, config, "hubOffset", oopDesc::klass_offset_in_bytes()); set_int(env, config, "arrayLengthOffset", arrayOopDesc::length_offset_in_bytes()); - set_int(env, config, "klassStateOffset", instanceKlass::init_state_offset_in_bytes() + sizeof(oopDesc)); + set_int(env, config, "klassStateOffset", instanceKlass::init_state_offset()); set_int(env, config, "klassStateFullyInitialized", (int)instanceKlass::fully_initialized); set_int(env, config, "threadTlabTopOffset", in_bytes(JavaThread::tlab_top_offset())); set_int(env, config, "threadTlabEndOffset", in_bytes(JavaThread::tlab_end_offset())); set_int(env, config, "threadObjectOffset", in_bytes(JavaThread::threadObj_offset())); - set_int(env, config, "instanceHeaderPrototypeOffset", Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes()); + set_int(env, config, "instanceHeaderPrototypeOffset", Klass::prototype_header_offset()); set_int(env, config, "threadExceptionOopOffset", in_bytes(JavaThread::exception_oop_offset())); set_int(env, config, "threadExceptionPcOffset", in_bytes(JavaThread::exception_pc_offset())); set_int(env, config, "threadMultiNewArrayStorage", in_bytes(JavaThread::graal_multinewarray_storage_offset())); - set_int(env, config, "classMirrorOffset", klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes()); + set_int(env, config, "classMirrorOffset", Klass::java_mirror_offset()); set_int(env, config, "methodDataOopDataOffset", in_bytes(methodDataOopDesc::data_offset())); set_int(env, config, "dataLayoutHeaderSize", DataLayout::header_size_in_bytes()); @@ -805,8 +805,8 @@ set_long(env, config, "fastMonitorExitStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_monitorexit_id))); set_long(env, config, "safepointPollingAddress", (jlong)(os::get_polling_page() + (SafepointPollOffset % os::vm_page_size()))); set_int(env, config, "runtimeCallStackSize", (jint)frame::arg_reg_save_area_bytes); - set_int(env, config, "klassModifierFlagsOffset", Klass::modifier_flags_offset_in_bytes() + sizeof(oopDesc)); - set_int(env, config, "graalMirrorKlassOffset", klassOopDesc::klass_part_offset_in_bytes() + Klass::graal_mirror_offset_in_bytes()); + set_int(env, config, "klassModifierFlagsOffset", Klass::modifier_flags_offset()); + set_int(env, config, "graalMirrorKlassOffset", Klass::graal_mirror_offset()); set_int(env, config, "klassOopOffset", java_lang_Class::klass_offset_in_bytes()); set_boolean(env, config, "isPollingPageFar", Assembler::is_polling_page_far()); @@ -844,7 +844,7 @@ env->SetIntArrayRegion(arrayOffsets, i, 1, &offset); } set_int_array(env, config, "arrayOffsets", arrayOffsets); - set_int(env, config, "arrayClassElementOffset", objArrayKlass::element_klass_offset_in_bytes() + sizeof(oopDesc)); + set_int(env, config, "arrayClassElementOffset", objArrayKlass::element_klass_offset()); return config; }