Mercurial > hg > graal-compiler
comparison src/share/vm/c1x/c1x_VMEntries.cpp @ 1931:48bbaead8b6c
Adjustments after merge with OpenJDK repository.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Tue, 30 Nov 2010 16:39:35 +0100 |
parents | fe69dec9a1ed |
children | 8d88c9ac9247 |
comparison
equal
deleted
inserted
replaced
1930:2d26b0046e0d | 1931:48bbaead8b6c |
---|---|
211 | 211 |
212 // public RiMethod RiConstantPool_lookupMethod(long vmId, int cpi, byte byteCode); | 212 // public RiMethod RiConstantPool_lookupMethod(long vmId, int cpi, byte byteCode); |
213 JNIEXPORT jobject JNICALL Java_com_sun_hotspot_c1x_VMEntries_RiConstantPool_1lookupMethod(JNIEnv *env, jobject, jlong vmId, jint index, jbyte byteCode) { | 213 JNIEXPORT jobject JNICALL Java_com_sun_hotspot_c1x_VMEntries_RiConstantPool_1lookupMethod(JNIEnv *env, jobject, jlong vmId, jint index, jbyte byteCode) { |
214 VM_ENTRY_MARK; | 214 VM_ENTRY_MARK; |
215 | 215 |
216 index = C1XCompiler::to_cp_index_u2(index); | |
216 constantPoolHandle cp = VmIds::get<constantPoolOop>(vmId); | 217 constantPoolHandle cp = VmIds::get<constantPoolOop>(vmId); |
217 | 218 |
218 Bytecodes::Code bc = (Bytecodes::Code) (((int) byteCode) & 0xFF); | 219 Bytecodes::Code bc = (Bytecodes::Code) (((int) byteCode) & 0xFF); |
219 ciInstanceKlass* loading_klass = (ciInstanceKlass *) CURRENT_ENV->get_object(cp->pool_holder()); | 220 ciInstanceKlass* loading_klass = (ciInstanceKlass *) CURRENT_ENV->get_object(cp->pool_holder()); |
220 ciMethod *cimethod = CURRENT_ENV->get_method_by_index(cp, index, bc, loading_klass); | 221 ciMethod *cimethod = CURRENT_ENV->get_method_by_index(cp, index, bc, loading_klass); |
250 | 251 |
251 // public RiField RiConstantPool_lookupField(long vmId, int cpi); | 252 // public RiField RiConstantPool_lookupField(long vmId, int cpi); |
252 JNIEXPORT jobject JNICALL Java_com_sun_hotspot_c1x_VMEntries_RiConstantPool_1lookupField(JNIEnv *env, jobject, jlong vmId, jint index, jbyte byteCode) { | 253 JNIEXPORT jobject JNICALL Java_com_sun_hotspot_c1x_VMEntries_RiConstantPool_1lookupField(JNIEnv *env, jobject, jlong vmId, jint index, jbyte byteCode) { |
253 VM_ENTRY_MARK; | 254 VM_ENTRY_MARK; |
254 | 255 |
256 index = C1XCompiler::to_cp_index_u2(index); | |
255 constantPoolOop cp = VmIds::get<constantPoolOop>(vmId); | 257 constantPoolOop cp = VmIds::get<constantPoolOop>(vmId); |
256 | 258 |
257 ciInstanceKlass* loading_klass = (ciInstanceKlass *) CURRENT_ENV->get_object(cp->pool_holder()); | 259 ciInstanceKlass* loading_klass = (ciInstanceKlass *) CURRENT_ENV->get_object(cp->pool_holder()); |
258 ciField *field = CURRENT_ENV->get_field_by_index(loading_klass, index); | 260 ciField *field = CURRENT_ENV->get_field_by_index(loading_klass, index); |
259 Bytecodes::Code code = (Bytecodes::Code)(((int) byteCode) & 0xFF); | 261 Bytecodes::Code code = (Bytecodes::Code)(((int) byteCode) & 0xFF); |