comparison src/share/vm/graal/graalCompilerToVM.cpp @ 10772:dfc4b73e79e8

Merge
author twisti
date Fri, 12 Jul 2013 10:12:06 -0700
parents ec8ee1c2ad7a c3760150dc29
children d55f24eac4b1
comparison
equal deleted inserted replaced
10771:ec8ee1c2ad7a 10772:dfc4b73e79e8
866 set_boolean("useCompressedOops", UseCompressedOops); 866 set_boolean("useCompressedOops", UseCompressedOops);
867 set_boolean("useCompressedKlassPointers", UseCompressedKlassPointers); 867 set_boolean("useCompressedKlassPointers", UseCompressedKlassPointers);
868 set_address("narrowOopBase", Universe::narrow_oop_base()); 868 set_address("narrowOopBase", Universe::narrow_oop_base());
869 set_int("narrowOopShift", Universe::narrow_oop_shift()); 869 set_int("narrowOopShift", Universe::narrow_oop_shift());
870 set_int("logMinObjAlignment", LogMinObjAlignmentInBytes); 870 set_int("logMinObjAlignment", LogMinObjAlignmentInBytes);
871 set_address("narrowKlassBase", Universe::narrow_klass_base());
872 set_int("narrowKlassShift", Universe::narrow_klass_shift());
873 set_int("logKlassAlignment", LogKlassAlignmentInBytes);
874
871 875
872 set_int("g1CardQueueIndexOffset", in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_index())); 876 set_int("g1CardQueueIndexOffset", in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_index()));
873 set_int("g1CardQueueBufferOffset", in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_buf())); 877 set_int("g1CardQueueBufferOffset", in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_buf()));
874 set_int("logOfHRGrainBytes", HeapRegion::LogOfHRGrainBytes); 878 set_int("logOfHRGrainBytes", HeapRegion::LogOfHRGrainBytes);
875 set_int("g1SATBQueueMarkingOffset", in_bytes(JavaThread::satb_mark_queue_offset() + PtrQueue::byte_offset_of_active())); 879 set_int("g1SATBQueueMarkingOffset", in_bytes(JavaThread::satb_mark_queue_offset() + PtrQueue::byte_offset_of_active()));
1185 oop resolved_o = JNIHandles::resolve(o); 1189 oop resolved_o = JNIHandles::resolve(o);
1186 jlong address = offset + (jlong)resolved_o; 1190 jlong address = offset + (jlong)resolved_o;
1187 return JNIHandles::make_local(*((oop*)address)); 1191 return JNIHandles::make_local(*((oop*)address));
1188 C2V_END 1192 C2V_END
1189 1193
1194 C2V_VMENTRY(jlong, readUnsafeKlassPointer, (JNIEnv *env, jobject, jobject o))
1195 oop resolved_o = JNIHandles::resolve(o);
1196 jlong klass = (jlong)(address)resolved_o->klass();
1197 return klass;
1198 C2V_END
1190 1199
1191 #define CC (char*) /*cast a literal from (const char*)*/ 1200 #define CC (char*) /*cast a literal from (const char*)*/
1192 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(c2v_ ## f)) 1201 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(c2v_ ## f))
1193 1202
1194 #define RESOLVED_TYPE "Lcom/oracle/graal/api/meta/ResolvedJavaType;" 1203 #define RESOLVED_TYPE "Lcom/oracle/graal/api/meta/ResolvedJavaType;"
1264 {CC"getLocalVariableTable", CC"("HS_RESOLVED_METHOD")["LOCAL, FN_PTR(getLocalVariableTable)}, 1273 {CC"getLocalVariableTable", CC"("HS_RESOLVED_METHOD")["LOCAL, FN_PTR(getLocalVariableTable)},
1265 {CC"getFileName", CC"("HS_RESOLVED_JAVA_TYPE")"STRING, FN_PTR(getFileName)}, 1274 {CC"getFileName", CC"("HS_RESOLVED_JAVA_TYPE")"STRING, FN_PTR(getFileName)},
1266 {CC"reprofile", CC"("METASPACE_METHOD")V", FN_PTR(reprofile)}, 1275 {CC"reprofile", CC"("METASPACE_METHOD")V", FN_PTR(reprofile)},
1267 {CC"invalidateInstalledCode", CC"("HS_INSTALLED_CODE")V", FN_PTR(invalidateInstalledCode)}, 1276 {CC"invalidateInstalledCode", CC"("HS_INSTALLED_CODE")V", FN_PTR(invalidateInstalledCode)},
1268 {CC"readUnsafeUncompressedPointer", CC"("OBJECT"J)"OBJECT, FN_PTR(readUnsafeUncompressedPointer)}, 1277 {CC"readUnsafeUncompressedPointer", CC"("OBJECT"J)"OBJECT, FN_PTR(readUnsafeUncompressedPointer)},
1278 {CC"readUnsafeKlassPointer", CC"("OBJECT")J", FN_PTR(readUnsafeKlassPointer)},
1269 }; 1279 };
1270 1280
1271 int CompilerToVM_methods_count() { 1281 int CompilerToVM_methods_count() {
1272 return sizeof(CompilerToVM_methods) / sizeof(JNINativeMethod); 1282 return sizeof(CompilerToVM_methods) / sizeof(JNINativeMethod);
1273 } 1283 }