comparison src/share/vm/graal/graalCompilerToVM.cpp @ 5130:ab038e0d6b43

Merge
author Lukas Stadler <lukas.stadler@jku.at>
date Wed, 21 Mar 2012 11:28:22 +0100
parents 51111665eda6 dad1ac9dba7d
children fdd9dd4508fa
comparison
equal deleted inserted replaced
5129:51111665eda6 5130:ab038e0d6b43
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", in_bytes(Klass::java_mirror_offset())); 775 set_int(env, config, "classMirrorOffset", in_bytes(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, "methodDataOopTrapHistoryOffset", in_bytes(methodDataOopDesc::trap_history_offset()));
778 set_int(env, config, "dataLayoutHeaderSize", DataLayout::header_size_in_bytes()); 779 set_int(env, config, "dataLayoutHeaderSize", DataLayout::header_size_in_bytes());
779 set_int(env, config, "dataLayoutTagOffset", in_bytes(DataLayout::tag_offset())); 780 set_int(env, config, "dataLayoutTagOffset", in_bytes(DataLayout::tag_offset()));
780 set_int(env, config, "dataLayoutFlagsOffset", in_bytes(DataLayout::flags_offset())); 781 set_int(env, config, "dataLayoutFlagsOffset", in_bytes(DataLayout::flags_offset()));
781 set_int(env, config, "dataLayoutBCIOffset", in_bytes(DataLayout::bci_offset())); 782 set_int(env, config, "dataLayoutBCIOffset", in_bytes(DataLayout::bci_offset()));
782 set_int(env, config, "dataLayoutCellsOffset", in_bytes(DataLayout::cell_offset(0))); 783 set_int(env, config, "dataLayoutCellsOffset", in_bytes(DataLayout::cell_offset(0)));