Mercurial > hg > graal-jvmci-8
comparison src/share/vm/jvmci/jvmciCompilerToVM.cpp @ 22455:7ad03bf3d4a9
renames related to using metaspace wrappers instead of raw metaspace values
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 24 Aug 2015 11:06:40 +0200 |
parents | 76af33d4d504 |
children | da68ca58b271 |
comparison
equal
deleted
inserted
replaced
22454:76af33d4d504 | 22455:7ad03bf3d4a9 |
---|---|
278 } | 278 } |
279 oop result = CompilerToVM::get_jvmci_method(ucm, CHECK_NULL); | 279 oop result = CompilerToVM::get_jvmci_method(ucm, CHECK_NULL); |
280 return JNIHandles::make_local(THREAD, result); | 280 return JNIHandles::make_local(THREAD, result); |
281 C2V_END | 281 C2V_END |
282 | 282 |
283 C2V_VMENTRY(jobject, getKlassImplementor, (JNIEnv *, jobject, jobject jvmci_type)) | 283 C2V_VMENTRY(jobject, getImplementor, (JNIEnv *, jobject, jobject jvmci_type)) |
284 InstanceKlass* klass = (InstanceKlass*) CompilerToVM::asKlass(jvmci_type); | 284 InstanceKlass* klass = (InstanceKlass*) CompilerToVM::asKlass(jvmci_type); |
285 oop implementor = CompilerToVM::get_jvmci_type(klass->implementor(), CHECK_NULL); | 285 oop implementor = CompilerToVM::get_jvmci_type(klass->implementor(), CHECK_NULL); |
286 return JNIHandles::make_local(THREAD, implementor); | 286 return JNIHandles::make_local(THREAD, implementor); |
287 C2V_END | 287 C2V_END |
288 | 288 |
388 C2V_VMENTRY(jint, lookupKlassRefIndexInPool, (JNIEnv*, jobject, jobject jvmci_constant_pool, jint index)) | 388 C2V_VMENTRY(jint, lookupKlassRefIndexInPool, (JNIEnv*, jobject, jobject jvmci_constant_pool, jint index)) |
389 constantPoolHandle cp = CompilerToVM::asConstantPool(jvmci_constant_pool); | 389 constantPoolHandle cp = CompilerToVM::asConstantPool(jvmci_constant_pool); |
390 return cp->klass_ref_index_at(index); | 390 return cp->klass_ref_index_at(index); |
391 C2V_END | 391 C2V_END |
392 | 392 |
393 C2V_VMENTRY(jobject, resolveKlassInPool, (JNIEnv*, jobject, jobject jvmci_constant_pool, jint index)) | 393 C2V_VMENTRY(jobject, resolveTypeInPool, (JNIEnv*, jobject, jobject jvmci_constant_pool, jint index)) |
394 constantPoolHandle cp = CompilerToVM::asConstantPool(jvmci_constant_pool); | 394 constantPoolHandle cp = CompilerToVM::asConstantPool(jvmci_constant_pool); |
395 Klass* resolved_klass = cp->klass_at(index, CHECK_NULL); | 395 Klass* resolved_klass = cp->klass_at(index, CHECK_NULL); |
396 Handle klass = CompilerToVM::get_jvmci_type(resolved_klass, CHECK_NULL); | 396 Handle klass = CompilerToVM::get_jvmci_type(resolved_klass, CHECK_NULL); |
397 return JNIHandles::make_local(THREAD, klass()); | 397 return JNIHandles::make_local(THREAD, klass()); |
398 C2V_END | 398 C2V_END |
804 VMThread::execute(&op); | 804 VMThread::execute(&op); |
805 } | 805 } |
806 InstalledCode::set_address(hotspotInstalledCode, 0); | 806 InstalledCode::set_address(hotspotInstalledCode, 0); |
807 C2V_END | 807 C2V_END |
808 | 808 |
809 C2V_VMENTRY(jobject, getJavaMirror, (JNIEnv* env, jobject, jobject jvmci_type)) | |
810 Klass* klass = CompilerToVM::asKlass(jvmci_type); | |
811 return JNIHandles::make_local(THREAD, klass->java_mirror()); | |
812 C2V_END | |
813 | |
814 C2V_VMENTRY(jobject, readUncompressedOop, (JNIEnv*, jobject, jlong addr)) | 809 C2V_VMENTRY(jobject, readUncompressedOop, (JNIEnv*, jobject, jlong addr)) |
815 oop ret = oopDesc::load_decode_heap_oop((oop*)(address)addr); | 810 oop ret = oopDesc::load_decode_heap_oop((oop*)(address)addr); |
816 return JNIHandles::make_local(THREAD, ret); | 811 return JNIHandles::make_local(THREAD, ret); |
817 C2V_END | 812 C2V_END |
818 | 813 |
844 // tty->time_stamp is the time since VM start which should be used | 839 // tty->time_stamp is the time since VM start which should be used |
845 // for all HotSpot log output when a timestamp is required. | 840 // for all HotSpot log output when a timestamp is required. |
846 return tty->time_stamp().milliseconds(); | 841 return tty->time_stamp().milliseconds(); |
847 C2V_END | 842 C2V_END |
848 | 843 |
849 C2V_VMENTRY(jobject, getSymbol, (JNIEnv*, jobject, jlong metaspaceSymbol)) | 844 C2V_VMENTRY(jobject, getSymbol, (JNIEnv*, jobject, jlong symbol)) |
850 Handle sym = java_lang_String::create_from_symbol((Symbol*)(address)metaspaceSymbol, CHECK_NULL); | 845 Handle sym = java_lang_String::create_from_symbol((Symbol*)(address)symbol, CHECK_NULL); |
851 return JNIHandles::make_local(THREAD, sym()); | 846 return JNIHandles::make_local(THREAD, sym()); |
852 C2V_END | 847 C2V_END |
853 | 848 |
854 bool matches(jobjectArray methods, Method* method) { | 849 bool matches(jobjectArray methods, Method* method) { |
855 objArrayOop methods_oop = (objArrayOop) JNIHandles::resolve(methods); | 850 objArrayOop methods_oop = (objArrayOop) JNIHandles::resolve(methods); |
1147 {CC"getBytecode", CC"("HS_RESOLVED_METHOD")[B", FN_PTR(getBytecode)}, | 1142 {CC"getBytecode", CC"("HS_RESOLVED_METHOD")[B", FN_PTR(getBytecode)}, |
1148 {CC"getExceptionTableStart", CC"("HS_RESOLVED_METHOD")J", FN_PTR(getExceptionTableStart)}, | 1143 {CC"getExceptionTableStart", CC"("HS_RESOLVED_METHOD")J", FN_PTR(getExceptionTableStart)}, |
1149 {CC"getExceptionTableLength", CC"("HS_RESOLVED_METHOD")I", FN_PTR(getExceptionTableLength)}, | 1144 {CC"getExceptionTableLength", CC"("HS_RESOLVED_METHOD")I", FN_PTR(getExceptionTableLength)}, |
1150 {CC"hasBalancedMonitors", CC"("HS_RESOLVED_METHOD")Z", FN_PTR(hasBalancedMonitors)}, | 1145 {CC"hasBalancedMonitors", CC"("HS_RESOLVED_METHOD")Z", FN_PTR(hasBalancedMonitors)}, |
1151 {CC"findUniqueConcreteMethod", CC"("HS_RESOLVED_KLASS HS_RESOLVED_METHOD")"HS_RESOLVED_METHOD, FN_PTR(findUniqueConcreteMethod)}, | 1146 {CC"findUniqueConcreteMethod", CC"("HS_RESOLVED_KLASS HS_RESOLVED_METHOD")"HS_RESOLVED_METHOD, FN_PTR(findUniqueConcreteMethod)}, |
1152 {CC"getKlassImplementor", CC"("HS_RESOLVED_KLASS")"HS_RESOLVED_KLASS, FN_PTR(getKlassImplementor)}, | 1147 {CC"getImplementor", CC"("HS_RESOLVED_KLASS")"HS_RESOLVED_KLASS, FN_PTR(getImplementor)}, |
1153 {CC"getStackTraceElement", CC"("HS_RESOLVED_METHOD"I)"STACK_TRACE_ELEMENT, FN_PTR(getStackTraceElement)}, | 1148 {CC"getStackTraceElement", CC"("HS_RESOLVED_METHOD"I)"STACK_TRACE_ELEMENT, FN_PTR(getStackTraceElement)}, |
1154 {CC"methodIsIgnoredBySecurityStackWalk", CC"("HS_RESOLVED_METHOD")Z", FN_PTR(methodIsIgnoredBySecurityStackWalk)}, | 1149 {CC"methodIsIgnoredBySecurityStackWalk", CC"("HS_RESOLVED_METHOD")Z", FN_PTR(methodIsIgnoredBySecurityStackWalk)}, |
1155 {CC"doNotInlineOrCompile", CC"("HS_RESOLVED_METHOD")V", FN_PTR(doNotInlineOrCompile)}, | 1150 {CC"doNotInlineOrCompile", CC"("HS_RESOLVED_METHOD")V", FN_PTR(doNotInlineOrCompile)}, |
1156 {CC"canInlineMethod", CC"("HS_RESOLVED_METHOD")Z", FN_PTR(canInlineMethod)}, | 1151 {CC"canInlineMethod", CC"("HS_RESOLVED_METHOD")Z", FN_PTR(canInlineMethod)}, |
1157 {CC"shouldInlineMethod", CC"("HS_RESOLVED_METHOD")Z", FN_PTR(shouldInlineMethod)}, | 1152 {CC"shouldInlineMethod", CC"("HS_RESOLVED_METHOD")Z", FN_PTR(shouldInlineMethod)}, |
1164 {CC"lookupAppendixInPool0", CC"("HS_CONSTANT_POOL"I)"OBJECT, FN_PTR(lookupAppendixInPool)}, | 1159 {CC"lookupAppendixInPool0", CC"("HS_CONSTANT_POOL"I)"OBJECT, FN_PTR(lookupAppendixInPool)}, |
1165 {CC"lookupMethodInPool", CC"("HS_CONSTANT_POOL"IB)"HS_RESOLVED_METHOD, FN_PTR(lookupMethodInPool)}, | 1160 {CC"lookupMethodInPool", CC"("HS_CONSTANT_POOL"IB)"HS_RESOLVED_METHOD, FN_PTR(lookupMethodInPool)}, |
1166 {CC"constantPoolRemapInstructionOperandFromCache0",CC"("HS_CONSTANT_POOL"I)I", FN_PTR(constantPoolRemapInstructionOperandFromCache)}, | 1161 {CC"constantPoolRemapInstructionOperandFromCache0",CC"("HS_CONSTANT_POOL"I)I", FN_PTR(constantPoolRemapInstructionOperandFromCache)}, |
1167 {CC"resolveConstantInPool", CC"("HS_CONSTANT_POOL"I)"OBJECT, FN_PTR(resolveConstantInPool)}, | 1162 {CC"resolveConstantInPool", CC"("HS_CONSTANT_POOL"I)"OBJECT, FN_PTR(resolveConstantInPool)}, |
1168 {CC"resolvePossiblyCachedConstantInPool0", CC"("HS_CONSTANT_POOL"I)"OBJECT, FN_PTR(resolvePossiblyCachedConstantInPool)}, | 1163 {CC"resolvePossiblyCachedConstantInPool0", CC"("HS_CONSTANT_POOL"I)"OBJECT, FN_PTR(resolvePossiblyCachedConstantInPool)}, |
1169 {CC"resolveKlassInPool", CC"("HS_CONSTANT_POOL"I)"HS_RESOLVED_KLASS, FN_PTR(resolveKlassInPool)}, | 1164 {CC"resolveTypeInPool", CC"("HS_CONSTANT_POOL"I)"HS_RESOLVED_KLASS, FN_PTR(resolveTypeInPool)}, |
1170 {CC"resolveFieldInPool", CC"("HS_CONSTANT_POOL"IB[J)"HS_RESOLVED_KLASS, FN_PTR(resolveFieldInPool)}, | 1165 {CC"resolveFieldInPool", CC"("HS_CONSTANT_POOL"IB[J)"HS_RESOLVED_KLASS, FN_PTR(resolveFieldInPool)}, |
1171 {CC"resolveInvokeDynamicInPool", CC"("HS_CONSTANT_POOL"I)V", FN_PTR(resolveInvokeDynamicInPool)}, | 1166 {CC"resolveInvokeDynamicInPool", CC"("HS_CONSTANT_POOL"I)V", FN_PTR(resolveInvokeDynamicInPool)}, |
1172 {CC"resolveInvokeHandleInPool", CC"("HS_CONSTANT_POOL"I)V", FN_PTR(resolveInvokeHandleInPool)}, | 1167 {CC"resolveInvokeHandleInPool", CC"("HS_CONSTANT_POOL"I)V", FN_PTR(resolveInvokeHandleInPool)}, |
1173 {CC"resolveMethod", CC"("HS_RESOLVED_KLASS HS_RESOLVED_METHOD HS_RESOLVED_KLASS")"HS_RESOLVED_METHOD, FN_PTR(resolveMethod)}, | 1168 {CC"resolveMethod", CC"("HS_RESOLVED_KLASS HS_RESOLVED_METHOD HS_RESOLVED_KLASS")"HS_RESOLVED_METHOD, FN_PTR(resolveMethod)}, |
1174 {CC"getVtableIndexForInterface", CC"("HS_RESOLVED_KLASS HS_RESOLVED_METHOD")I", FN_PTR(getVtableIndexForInterface)}, | 1169 {CC"getVtableIndexForInterface", CC"("HS_RESOLVED_KLASS HS_RESOLVED_METHOD")I", FN_PTR(getVtableIndexForInterface)}, |
1188 {CC"getLineNumberTable", CC"("HS_RESOLVED_METHOD")[J", FN_PTR(getLineNumberTable)}, | 1183 {CC"getLineNumberTable", CC"("HS_RESOLVED_METHOD")[J", FN_PTR(getLineNumberTable)}, |
1189 {CC"getLocalVariableTableStart", CC"("HS_RESOLVED_METHOD")J", FN_PTR(getLocalVariableTableStart)}, | 1184 {CC"getLocalVariableTableStart", CC"("HS_RESOLVED_METHOD")J", FN_PTR(getLocalVariableTableStart)}, |
1190 {CC"getLocalVariableTableLength", CC"("HS_RESOLVED_METHOD")I", FN_PTR(getLocalVariableTableLength)}, | 1185 {CC"getLocalVariableTableLength", CC"("HS_RESOLVED_METHOD")I", FN_PTR(getLocalVariableTableLength)}, |
1191 {CC"reprofile", CC"("HS_RESOLVED_METHOD")V", FN_PTR(reprofile)}, | 1186 {CC"reprofile", CC"("HS_RESOLVED_METHOD")V", FN_PTR(reprofile)}, |
1192 {CC"invalidateInstalledCode", CC"("INSTALLED_CODE")V", FN_PTR(invalidateInstalledCode)}, | 1187 {CC"invalidateInstalledCode", CC"("INSTALLED_CODE")V", FN_PTR(invalidateInstalledCode)}, |
1193 {CC"getJavaMirror", CC"("HS_RESOLVED_KLASS")"CLASS, FN_PTR(getJavaMirror)}, | |
1194 {CC"readUncompressedOop", CC"(J)"OBJECT, FN_PTR(readUncompressedOop)}, | 1188 {CC"readUncompressedOop", CC"(J)"OBJECT, FN_PTR(readUncompressedOop)}, |
1195 {CC"collectCounters", CC"()[J", FN_PTR(collectCounters)}, | 1189 {CC"collectCounters", CC"()[J", FN_PTR(collectCounters)}, |
1196 {CC"allocateCompileId", CC"("HS_RESOLVED_METHOD"I)I", FN_PTR(allocateCompileId)}, | 1190 {CC"allocateCompileId", CC"("HS_RESOLVED_METHOD"I)I", FN_PTR(allocateCompileId)}, |
1197 {CC"isMature", CC"("METASPACE_METHOD_DATA")Z", FN_PTR(isMature)}, | 1191 {CC"isMature", CC"("METASPACE_METHOD_DATA")Z", FN_PTR(isMature)}, |
1198 {CC"hasCompiledCodeForOSR", CC"("HS_RESOLVED_METHOD"II)Z", FN_PTR(hasCompiledCodeForOSR)}, | 1192 {CC"hasCompiledCodeForOSR", CC"("HS_RESOLVED_METHOD"II)Z", FN_PTR(hasCompiledCodeForOSR)}, |