Mercurial > hg > truffle
diff src/share/vm/classfile/vmSymbols.hpp @ 21559:be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Thu, 28 May 2015 15:36:48 +0200 |
| parents | 48c1ebd24120 |
| children | ce2113326bc8 |
line wrap: on
line diff
--- a/src/share/vm/classfile/vmSymbols.hpp Wed May 27 13:43:27 2015 +0200 +++ b/src/share/vm/classfile/vmSymbols.hpp Thu May 28 15:36:48 2015 +0200 @@ -298,66 +298,66 @@ LP64_ONLY( do_alias(intptr_signature, long_signature) ) \ template(selectAlternative_signature, "(ZLjava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;") \ \ - /* Support for Graal */ \ + /* Support for JVMCI */ \ template(java_util_BitSet, "java/util/BitSet") \ - GRAAL_ONLY(template(com_oracle_jvmci_debug_Debug, "com/oracle/jvmci/debug/Debug")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotCompiledCode, "com/oracle/jvmci/hotspot/HotSpotCompiledCode")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotCompiledCode_Comment, "com/oracle/jvmci/hotspot/HotSpotCompiledCode$Comment")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotCompiledNmethod, "com/oracle/jvmci/hotspot/HotSpotCompiledNmethod")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotForeignCallTarget, "com/oracle/jvmci/hotspot/HotSpotForeignCallTarget")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotReferenceMap, "com/oracle/jvmci/hotspot/HotSpotReferenceMap")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotReferenceMap_HotSpotOopMap, "com/oracle/jvmci/hotspot/HotSpotReferenceMap$HotSpotOopMap")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_CompilerToVMImpl, "com/oracle/jvmci/hotspot/CompilerToVMImpl")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotInstalledCode, "com/oracle/jvmci/hotspot/HotSpotInstalledCode")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotNmethod, "com/oracle/jvmci/hotspot/HotSpotNmethod")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotResolvedJavaMethodImpl, "com/oracle/jvmci/hotspot/HotSpotResolvedJavaMethodImpl")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotResolvedObjectTypeImpl, "com/oracle/jvmci/hotspot/HotSpotResolvedObjectTypeImpl")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotCompressedNullConstant, "com/oracle/jvmci/hotspot/HotSpotCompressedNullConstant")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotObjectConstantImpl, "com/oracle/jvmci/hotspot/HotSpotObjectConstantImpl")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotMetaspaceConstantImpl, "com/oracle/jvmci/hotspot/HotSpotMetaspaceConstantImpl")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_HotSpotStackFrameReference, "com/oracle/jvmci/hotspot/HotSpotStackFrameReference")) \ - GRAAL_ONLY(template(com_oracle_graal_hotspot_CompilationTask, "com/oracle/graal/hotspot/CompilationTask")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_JavaConstant, "com/oracle/jvmci/meta/JavaConstant")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_PrimitiveConstant, "com/oracle/jvmci/meta/PrimitiveConstant")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_RawConstant, "com/oracle/jvmci/meta/RawConstant")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_NullConstant, "com/oracle/jvmci/meta/NullConstant")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_ExceptionHandler, "com/oracle/jvmci/meta/ExceptionHandler")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_JavaMethod, "com/oracle/jvmci/meta/JavaMethod")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_JavaType, "com/oracle/jvmci/meta/JavaType")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_Kind, "com/oracle/jvmci/meta/Kind")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_LIRKind, "com/oracle/jvmci/meta/LIRKind")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_AbstractValue, "com/oracle/jvmci/meta/AbstractValue")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_Assumptions_ConcreteSubtype, "com/oracle/jvmci/meta/Assumptions$ConcreteSubtype")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_Assumptions_LeafType, "com/oracle/jvmci/meta/Assumptions$LeafType")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_Assumptions_NoFinalizableSubclass, "com/oracle/jvmci/meta/Assumptions$NoFinalizableSubclass")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_Assumptions_ConcreteMethod, "com/oracle/jvmci/meta/Assumptions$ConcreteMethod")) \ - GRAAL_ONLY(template(com_oracle_jvmci_meta_Assumptions_CallSiteTargetValue, "com/oracle/jvmci/meta/Assumptions$CallSiteTargetValue")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_CompilationResult, "com/oracle/jvmci/code/CompilationResult")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_CompilationResult_Call, "com/oracle/jvmci/code/CompilationResult$Call")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_CompilationResult_ConstantReference, "com/oracle/jvmci/code/CompilationResult$ConstantReference")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_CompilationResult_DataPatch, "com/oracle/jvmci/code/CompilationResult$DataPatch")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_CompilationResult_DataSectionReference, "com/oracle/jvmci/code/CompilationResult$DataSectionReference")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_CompilationResult_ExceptionHandler, "com/oracle/jvmci/code/CompilationResult$ExceptionHandler")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_CompilationResult_Mark, "com/oracle/jvmci/code/CompilationResult$Mark")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_CompilationResult_Infopoint, "com/oracle/jvmci/code/CompilationResult$Infopoint")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_CompilationResult_Site, "com/oracle/jvmci/code/CompilationResult$Site")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_InfopointReason, "com/oracle/jvmci/code/InfopointReason")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_InstalledCode, "com/oracle/jvmci/code/InstalledCode")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_BytecodeFrame, "com/oracle/jvmci/code/BytecodeFrame")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_BytecodePosition, "com/oracle/jvmci/code/BytecodePosition")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_DebugInfo, "com/oracle/jvmci/code/DebugInfo")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_Register, "com/oracle/jvmci/code/Register")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_RegisterValue, "com/oracle/jvmci/code/RegisterValue")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_Register_RegisterCategory, "com/oracle/jvmci/code/Register$RegisterCategory")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_StackSlot, "com/oracle/jvmci/code/StackSlot")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_StackLockValue, "com/oracle/jvmci/code/StackLockValue")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_VirtualObject, "com/oracle/jvmci/code/VirtualObject")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_RegisterSaveLayout, "com/oracle/jvmci/code/RegisterSaveLayout")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_InvalidInstalledCodeException, "com/oracle/jvmci/code/InvalidInstalledCodeException")) \ - GRAAL_ONLY(template(com_oracle_jvmci_code_SpeculationLog, "com/oracle/jvmci/code/SpeculationLog")) \ - GRAAL_ONLY(template(compileMetaspaceMethod_name, "compileMetaspaceMethod")) \ - GRAAL_ONLY(template(compileMetaspaceMethod_signature, "(JIJI)V")) \ - GRAAL_ONLY(template(com_oracle_jvmci_hotspot_Stable_signature, "Lcom/oracle/jvmci/hotspot/Stable;")) \ + JVMCI_ONLY(template(com_oracle_jvmci_debug_Debug, "com/oracle/jvmci/debug/Debug")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotCompiledCode, "com/oracle/jvmci/hotspot/HotSpotCompiledCode")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotCompiledCode_Comment, "com/oracle/jvmci/hotspot/HotSpotCompiledCode$Comment")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotCompiledNmethod, "com/oracle/jvmci/hotspot/HotSpotCompiledNmethod")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotForeignCallTarget, "com/oracle/jvmci/hotspot/HotSpotForeignCallTarget")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotReferenceMap, "com/oracle/jvmci/hotspot/HotSpotReferenceMap")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotReferenceMap_HotSpotOopMap, "com/oracle/jvmci/hotspot/HotSpotReferenceMap$HotSpotOopMap")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_CompilerToVMImpl, "com/oracle/jvmci/hotspot/CompilerToVMImpl")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotInstalledCode, "com/oracle/jvmci/hotspot/HotSpotInstalledCode")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotNmethod, "com/oracle/jvmci/hotspot/HotSpotNmethod")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotResolvedJavaMethodImpl, "com/oracle/jvmci/hotspot/HotSpotResolvedJavaMethodImpl")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotResolvedObjectTypeImpl, "com/oracle/jvmci/hotspot/HotSpotResolvedObjectTypeImpl")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotCompressedNullConstant, "com/oracle/jvmci/hotspot/HotSpotCompressedNullConstant")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotObjectConstantImpl, "com/oracle/jvmci/hotspot/HotSpotObjectConstantImpl")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotMetaspaceConstantImpl, "com/oracle/jvmci/hotspot/HotSpotMetaspaceConstantImpl")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_HotSpotStackFrameReference, "com/oracle/jvmci/hotspot/HotSpotStackFrameReference")) \ + JVMCI_ONLY(template(com_oracle_graal_hotspot_CompilationTask, "com/oracle/graal/hotspot/CompilationTask")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_JavaConstant, "com/oracle/jvmci/meta/JavaConstant")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_PrimitiveConstant, "com/oracle/jvmci/meta/PrimitiveConstant")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_RawConstant, "com/oracle/jvmci/meta/RawConstant")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_NullConstant, "com/oracle/jvmci/meta/NullConstant")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_ExceptionHandler, "com/oracle/jvmci/meta/ExceptionHandler")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_JavaMethod, "com/oracle/jvmci/meta/JavaMethod")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_JavaType, "com/oracle/jvmci/meta/JavaType")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_Kind, "com/oracle/jvmci/meta/Kind")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_LIRKind, "com/oracle/jvmci/meta/LIRKind")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_AbstractValue, "com/oracle/jvmci/meta/AbstractValue")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_Assumptions_ConcreteSubtype, "com/oracle/jvmci/meta/Assumptions$ConcreteSubtype")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_Assumptions_LeafType, "com/oracle/jvmci/meta/Assumptions$LeafType")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_Assumptions_NoFinalizableSubclass, "com/oracle/jvmci/meta/Assumptions$NoFinalizableSubclass")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_Assumptions_ConcreteMethod, "com/oracle/jvmci/meta/Assumptions$ConcreteMethod")) \ + JVMCI_ONLY(template(com_oracle_jvmci_meta_Assumptions_CallSiteTargetValue, "com/oracle/jvmci/meta/Assumptions$CallSiteTargetValue")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_CompilationResult, "com/oracle/jvmci/code/CompilationResult")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_CompilationResult_Call, "com/oracle/jvmci/code/CompilationResult$Call")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_CompilationResult_ConstantReference, "com/oracle/jvmci/code/CompilationResult$ConstantReference")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_CompilationResult_DataPatch, "com/oracle/jvmci/code/CompilationResult$DataPatch")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_CompilationResult_DataSectionReference, "com/oracle/jvmci/code/CompilationResult$DataSectionReference")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_CompilationResult_ExceptionHandler, "com/oracle/jvmci/code/CompilationResult$ExceptionHandler")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_CompilationResult_Mark, "com/oracle/jvmci/code/CompilationResult$Mark")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_CompilationResult_Infopoint, "com/oracle/jvmci/code/CompilationResult$Infopoint")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_CompilationResult_Site, "com/oracle/jvmci/code/CompilationResult$Site")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_InfopointReason, "com/oracle/jvmci/code/InfopointReason")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_InstalledCode, "com/oracle/jvmci/code/InstalledCode")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_BytecodeFrame, "com/oracle/jvmci/code/BytecodeFrame")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_BytecodePosition, "com/oracle/jvmci/code/BytecodePosition")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_DebugInfo, "com/oracle/jvmci/code/DebugInfo")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_Register, "com/oracle/jvmci/code/Register")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_RegisterValue, "com/oracle/jvmci/code/RegisterValue")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_Register_RegisterCategory, "com/oracle/jvmci/code/Register$RegisterCategory")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_StackSlot, "com/oracle/jvmci/code/StackSlot")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_StackLockValue, "com/oracle/jvmci/code/StackLockValue")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_VirtualObject, "com/oracle/jvmci/code/VirtualObject")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_RegisterSaveLayout, "com/oracle/jvmci/code/RegisterSaveLayout")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_InvalidInstalledCodeException, "com/oracle/jvmci/code/InvalidInstalledCodeException")) \ + JVMCI_ONLY(template(com_oracle_jvmci_code_SpeculationLog, "com/oracle/jvmci/code/SpeculationLog")) \ + JVMCI_ONLY(template(compileMetaspaceMethod_name, "compileMetaspaceMethod")) \ + JVMCI_ONLY(template(compileMetaspaceMethod_signature, "(JIJI)V")) \ + JVMCI_ONLY(template(com_oracle_jvmci_hotspot_Stable_signature, "Lcom/oracle/jvmci/hotspot/Stable;")) \ \ /* common method and field names */ \ template(object_initializer_name, "<init>") \