Mercurial > hg > graal-compiler
diff src/share/vm/classfile/vmSymbols.hpp @ 5554:70f715dfbb41
Bring Java renamings and restructurings to the C++ part.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Sun, 10 Jun 2012 01:17:48 +0200 |
| parents | 8872bc0eebdf |
| children | 120820e30baa |
line wrap: on
line diff
--- a/src/share/vm/classfile/vmSymbols.hpp Sat Jun 09 22:50:50 2012 +0200 +++ b/src/share/vm/classfile/vmSymbols.hpp Sun Jun 10 01:17:48 2012 +0200 @@ -267,91 +267,92 @@ NOT_LP64( do_alias(intptr_signature, int_signature) ) \ 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 */ \ - template(com_oracle_graal_hotspot_bridge_VMToCompiler, "com/oracle/graal/hotspot/bridge/VMToCompiler") \ - template(com_oracle_graal_hotspot_ri_HotSpotMethodResolved, "com/oracle/graal/hotspot/meta/HotSpotMethodResolvedImpl") \ - template(com_oracle_graal_hotspot_HotSpotTargetMethod, "com/oracle/graal/hotspot/HotSpotTargetMethod") \ - template(com_oracle_graal_hotspot_ri_HotSpotMethodData, "com/oracle/graal/hotspot/meta/HotSpotMethodData") \ - template(com_oracle_graal_hotspot_HotSpotCodeInfo, "com/oracle/graal/hotspot/meta/HotSpotCodeInfo") \ - template(com_oracle_graal_hotspot_HotSpotField, "com/oracle/graal/hotspot/meta/HotSpotField") \ - template(com_oracle_graal_hotspot_HotSpotCompiledMethod, "com/oracle/graal/hotspot/meta/HotSpotCompiledMethod") \ - template(com_oracle_graal_hotspot_HotSpotOptions, "com/oracle/graal/hotspot/HotSpotOptions") \ - template(com_oracle_graal_hotspot_HotSpotTypeResolved, "com/oracle/graal/hotspot/meta/HotSpotTypeResolvedImpl") \ - template(com_oracle_graal_hotspot_HotSpotType, "com/oracle/graal/hotspot/meta/HotSpotType") \ - template(com_oracle_graal_hotspot_HotSpotKlassOop, "com/oracle/graal/hotspot/meta/HotSpotKlassOop") \ - template(com_oracle_graal_hotspot_HotSpotProxy, "com/oracle/graal/hotspot/HotSpotProxy") \ - template(com_oracle_graal_hotspot_CompilerImpl, "com/oracle/graal/hotspot/HotSpotGraalRuntime") \ - template(com_oracle_max_cri_ri_RiMethod, "com/oracle/graal/api/meta/JavaMethod") \ - template(com_oracle_max_cri_ri_RiResolvedField, "com/oracle/graal/api/meta/ResolvedJavaField") \ - template(com_oracle_max_cri_ri_RiType, "com/oracle/graal/api/meta/JavaType") \ - template(com_oracle_max_cri_ri_RiConstantPool, "com/oracle/graal/api/meta/ConstantPool") \ - template(com_oracle_max_cri_ri_RiExceptionHandler, "com/oracle/graal/api/meta/ExceptionHandler") \ - template(com_oracle_max_cri_ci_CiAssumptions, "com/oracle/graal/api/code/Assumptions") \ - template(com_oracle_max_cri_ci_CiAssumptions_MethodContents, "com/oracle/graal/api/code/Assumptions$MethodContents") \ - template(com_oracle_max_cri_ci_CiAssumptions_ConcreteSubtype, "com/oracle/graal/api/code/Assumptions$ConcreteSubtype") \ - template(com_oracle_max_cri_ci_CiAssumptions_ConcreteMethod, "com/oracle/graal/api/code/Assumptions$ConcreteMethod") \ - template(com_oracle_max_cri_ci_CiGenericCallback, "com/oracle/graal/api/code/GenericCallback") \ - template(com_oracle_max_cri_ci_CiTargetMethod, "com/oracle/graal/api/code/CompilationResult") \ - template(com_oracle_max_cri_ci_CiTargetMethod_Site, "com/oracle/graal/api/code/CompilationResult$Site") \ - template(com_oracle_max_cri_ci_CiTargetMethod_Call, "com/oracle/graal/api/code/CompilationResult$Call") \ - template(com_oracle_max_cri_ci_CiTargetMethod_DataPatch, "com/oracle/graal/api/code/CompilationResult$DataPatch") \ - template(com_oracle_max_cri_ci_CiTargetMethod_Safepoint, "com/oracle/graal/api/code/CompilationResult$Safepoint") \ - template(com_oracle_max_cri_ci_CiTargetMethod_ExceptionHandler, "com/oracle/graal/api/code/CompilationResult$ExceptionHandler") \ - template(com_oracle_max_cri_ci_CiTargetMethod_Mark, "com/oracle/graal/api/code/CompilationResult$Mark") \ - template(com_oracle_max_cri_ci_CiBitMap, "java/util/BitSet") \ - template(com_oracle_max_cri_ci_CiDebugInfo, "com/oracle/graal/api/code/DebugInfo") \ - template(com_oracle_max_cri_ci_CiFrame, "com/oracle/graal/api/code/BytecodeFrame") \ - template(com_oracle_max_cri_ci_CiValue, "com/oracle/graal/api/meta/Value") \ - template(com_oracle_max_cri_ci_CiStackSlot, "com/oracle/graal/api/code/StackSlot") \ - template(com_oracle_max_cri_ci_CiRegisterValue, "com/oracle/graal/api/code/RegisterValue") \ - template(com_oracle_max_cri_ci_CiRegister, "com/oracle/graal/api/code/Register") \ - template(com_oracle_max_cri_ci_CiCodePos, "com/oracle/graal/api/code/BytecodePosition") \ - template(com_oracle_max_cri_ci_CiConstant, "com/oracle/graal/api/meta/Constant") \ - template(com_oracle_max_cri_ci_CiVirtualObject, "com/oracle/graal/api/code/VirtualObject") \ - template(com_oracle_max_cri_ci_CiMonitorValue, "com/oracle/graal/api/code/MonitorValue") \ - template(com_oracle_max_cri_ci_CiKind, "com/oracle/graal/api/meta/Kind") \ - template(com_oracle_max_cri_ci_CiRuntimeCall, "com/oracle/graal/api/code/RuntimeCall") \ - template(startCompiler_name, "startCompiler") \ - template(bootstrap_name, "bootstrap") \ - template(shutdownCompiler_name, "shutdownCompiler") \ - template(compileMethod_name, "compileMethod") \ - template(compileMethod_signature, "(Lcom/oracle/graal/hotspot/meta/HotSpotMethodResolved;IZI)Z") \ - template(setOption_name, "setOption") \ - template(setDefaultOptions_name, "setDefaultOptions") \ - template(setOption_signature, "(Ljava/lang/String;)Z") \ - template(createRiMethodResolved_name, "createRiMethodResolved") \ - template(createRiMethodResolved_signature, "(JLjava/lang/String;)Lcom/oracle/graal/api/meta/JavaMethod;") \ - template(createRiMethodUnresolved_name, "createRiMethodUnresolved") \ - template(createRiMethodUnresolved_signature, "(Ljava/lang/String;Ljava/lang/String;Lcom/oracle/graal/api/meta/JavaType;)Lcom/oracle/graal/api/meta/JavaMethod;") \ - template(createRiSignature_name, "createRiSignature") \ - template(createRiSignature_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/Signature;") \ - template(createRiField_name, "createRiField") \ - template(createRiField_signature, "(Lcom/oracle/graal/api/meta/JavaType;Ljava/lang/String;Lcom/oracle/graal/api/meta/JavaType;II)Lcom/oracle/graal/api/meta/JavaField;") \ - template(createRiType_name, "createRiType") \ - template(createRiType_signature, "(JLjava/lang/String;)Lcom/oracle/graal/api/meta/JavaType;") \ - template(createRiTypePrimitive_name, "createRiTypePrimitive") \ - template(createRiTypePrimitive_signature, "(I)Lcom/oracle/graal/api/meta/JavaType;") \ - template(createRiTypeUnresolved_name, "createRiTypeUnresolved") \ - template(createRiTypeUnresolved_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/JavaType;") \ - template(createCiConstant_name, "createCiConstant") \ - template(createCiConstant_signature, "(Lcom/oracle/graal/api/meta/Kind;J)Lcom/oracle/graal/api/meta/Constant;") \ - template(createCiConstantFloat_name, "createCiConstantFloat") \ - template(createCiConstantFloat_signature, "(F)Lcom/oracle/graal/api/meta/Constant;") \ - template(createCiConstantDouble_name, "createCiConstantDouble") \ - template(createCiConstantDouble_signature, "(D)Lcom/oracle/graal/api/meta/Constant;") \ - template(createCiConstantObject_name, "createCiConstantObject") \ - template(createCiConstantObject_signature, "(Ljava/lang/Object;)Lcom/oracle/graal/api/meta/Constant;") \ - template(getVMToCompiler_name, "getVMToCompiler") \ - template(getVMToCompiler_signature, "()Lcom/oracle/graal/hotspot/bridge/VMToCompiler;") \ - template(getInstance_name, "getInstance") \ - template(initialize_name, "initialize") \ - template(getInstance_signature, "()Lcom/oracle/graal/hotspot/HotSpotGraalRuntime;") \ - template(forObject_name, "forObject") \ - template(callbackInternal_name, "callbackInternal") \ - template(callback_signature, "(Ljava/lang/Object;)Ljava/lang/Object;") \ - template(MethodInvalidatedException, "com/oracle/graal/api/meta/InstalledCode$MethodInvalidatedException") \ - \ + \ + /* Support for Graal */ \ + template(java_util_BitSet, "java/util/BitSet") \ + /* graal.hotspot */ \ + template(com_oracle_graal_hotspot_HotSpotGraalRuntime, "com/oracle/graal/hotspot/HotSpotGraalRuntime") \ + template(com_oracle_graal_hotspot_HotSpotKlassOop, "com/oracle/graal/hotspot/HotSpotKlassOop") \ + template(com_oracle_graal_hotspot_HotSpotOptions, "com/oracle/graal/hotspot/HotSpotOptions") \ + template(com_oracle_graal_hotspot_HotSpotProxy, "com/oracle/graal/hotspot/HotSpotProxy") \ + template(com_oracle_graal_hotspot_HotSpotTargetMethod, "com/oracle/graal/hotspot/HotSpotTargetMethod") \ + template(com_oracle_graal_hotspot_bridge_VMToCompiler, "com/oracle/graal/hotspot/bridge/VMToCompiler") \ + template(com_oracle_graal_hotspot_meta_HotSpotCodeInfo, "com/oracle/graal/hotspot/meta/HotSpotCodeInfo") \ + template(com_oracle_graal_hotspot_meta_HotSpotCompiledMethod, "com/oracle/graal/hotspot/meta/HotSpotCompiledMethod") \ + template(com_oracle_graal_hotspot_meta_HotSpotJavaType, "com/oracle/graal/hotspot/meta/HotSpotJavaType") \ + template(com_oracle_graal_hotspot_meta_HotSpotMethodData, "com/oracle/graal/hotspot/meta/HotSpotMethodData") \ + template(com_oracle_graal_hotspot_meta_HotSpotResolvedJavaField, "com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField") \ + template(com_oracle_graal_hotspot_meta_HotSpotResolvedJavaMethod, "com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod") \ + template(com_oracle_graal_hotspot_meta_HotSpotResolvedJavaType, "com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType") \ + /* graal.api.meta */ \ + template(com_oracle_graal_api_meta_Constant, "com/oracle/graal/api/meta/Constant") \ + template(com_oracle_graal_api_meta_ConstantPool, "com/oracle/graal/api/meta/ConstantPool") \ + template(com_oracle_graal_api_meta_ExceptionHandler, "com/oracle/graal/api/meta/ExceptionHandler") \ + template(com_oracle_graal_api_meta_JavaMethod, "com/oracle/graal/api/meta/JavaMethod") \ + template(com_oracle_graal_api_meta_JavaType, "com/oracle/graal/api/meta/JavaType") \ + template(com_oracle_graal_api_meta_Kind, "com/oracle/graal/api/meta/Kind") \ + template(com_oracle_graal_api_meta_ResolvedJavaField, "com/oracle/graal/api/meta/ResolvedJavaField") \ + template(com_oracle_graal_api_meta_Value, "com/oracle/graal/api/meta/Value") \ + /* graal.api.code */ \ + template(com_oracle_graal_api_code_Assumptions, "com/oracle/graal/api/code/Assumptions") \ + template(com_oracle_graal_api_code_Assumptions_MethodContents, "com/oracle/graal/api/code/Assumptions$MethodContents") \ + template(com_oracle_graal_api_code_Assumptions_ConcreteSubtype, "com/oracle/graal/api/code/Assumptions$ConcreteSubtype") \ + template(com_oracle_graal_api_code_Assumptions_ConcreteMethod, "com/oracle/graal/api/code/Assumptions$ConcreteMethod") \ + template(com_oracle_graal_api_code_GenericCallback, "com/oracle/graal/api/code/GenericCallback") \ + template(com_oracle_graal_api_code_InstalledCode, "com/oracle/graal/api/code/CompilationResult") \ + template(com_oracle_graal_api_code_InstalledCode_Call, "com/oracle/graal/api/code/CompilationResult$Call") \ + template(com_oracle_graal_api_code_InstalledCode_DataPatch, "com/oracle/graal/api/code/CompilationResult$DataPatch") \ + template(com_oracle_graal_api_code_InstalledCode_ExceptionHandler, "com/oracle/graal/api/code/CompilationResult$ExceptionHandler") \ + template(com_oracle_graal_api_code_InstalledCode_Mark, "com/oracle/graal/api/code/CompilationResult$Mark") \ + template(com_oracle_graal_api_code_InstalledCode_Safepoint, "com/oracle/graal/api/code/CompilationResult$Safepoint") \ + template(com_oracle_graal_api_code_InstalledCode_Site, "com/oracle/graal/api/code/CompilationResult$Site") \ + template(com_oracle_graal_api_code_BytecodeFrame, "com/oracle/graal/api/code/BytecodeFrame") \ + template(com_oracle_graal_api_code_BytecodePosition, "com/oracle/graal/api/code/BytecodePosition") \ + template(com_oracle_graal_api_code_DebugInfo, "com/oracle/graal/api/code/DebugInfo") \ + template(com_oracle_graal_api_code_MonitorValue, "com/oracle/graal/api/code/MonitorValue") \ + template(com_oracle_graal_api_code_Register, "com/oracle/graal/api/code/Register") \ + template(com_oracle_graal_api_code_RegisterValue, "com/oracle/graal/api/code/RegisterValue") \ + template(com_oracle_graal_api_code_RuntimeCall, "com/oracle/graal/api/code/RuntimeCall") \ + template(com_oracle_graal_api_code_StackSlot, "com/oracle/graal/api/code/StackSlot") \ + template(com_oracle_graal_api_code_VirtualObject, "com/oracle/graal/api/code/VirtualObject") \ + template(startCompiler_name, "startCompiler") \ + template(bootstrap_name, "bootstrap") \ + template(shutdownCompiler_name, "shutdownCompiler") \ + template(compileMethod_name, "compileMethod") \ + template(compileMethod_signature, "(Lcom/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod;IZI)Z") \ + template(setOption_name, "setOption") \ + template(setDefaultOptions_name, "setDefaultOptions") \ + template(setOption_signature, "(Ljava/lang/String;)Z") \ + template(createResolvedJavaMethod_name, "createResolvedJavaMethod") \ + template(createResolvedJavaMethod_signature, "(JLjava/lang/String;)Lcom/oracle/graal/api/meta/JavaMethod;") \ + template(createJavaMethod_name, "createJavaMethod") \ + template(createJavaMethod_signature, "(Ljava/lang/String;Ljava/lang/String;Lcom/oracle/graal/api/meta/JavaType;)Lcom/oracle/graal/api/meta/JavaMethod;") \ + template(createSignature_name, "createSignature") \ + template(createSignature_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/Signature;") \ + template(createJavaField_name, "createJavaField") \ + template(createJavaField_signature, "(Lcom/oracle/graal/api/meta/JavaType;Ljava/lang/String;Lcom/oracle/graal/api/meta/JavaType;II)Lcom/oracle/graal/api/meta/JavaField;") \ + template(createJavaType_name, "createJavaType") \ + template(createJavaType_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/JavaType;") \ + template(createPrimitiveJavaType_name, "createPrimitiveJavaType") \ + template(createPrimitiveJavaType_signature, "(I)Lcom/oracle/graal/api/meta/JavaType;") \ + template(createConstant_name, "createConstant") \ + template(createConstant_signature, "(Lcom/oracle/graal/api/meta/Kind;J)Lcom/oracle/graal/api/meta/Constant;") \ + template(createConstantFloat_name, "createConstantFloat") \ + template(createConstantFloat_signature, "(F)Lcom/oracle/graal/api/meta/Constant;") \ + template(createConstantDouble_name, "createConstantDouble") \ + template(createConstantDouble_signature, "(D)Lcom/oracle/graal/api/meta/Constant;") \ + template(createConstantObject_name, "createConstantObject") \ + template(createConstantObject_signature, "(Ljava/lang/Object;)Lcom/oracle/graal/api/meta/Constant;") \ + template(getVMToCompiler_name, "getVMToCompiler") \ + template(getVMToCompiler_signature, "()Lcom/oracle/graal/hotspot/bridge/VMToCompiler;") \ + template(getInstance_name, "getInstance") \ + template(initialize_name, "initialize") \ + template(getInstance_signature, "()Lcom/oracle/graal/hotspot/HotSpotGraalRuntime;") \ + template(forObject_name, "forObject") \ + template(callbackInternal_name, "callbackInternal") \ + template(callback_signature, "(Ljava/lang/Object;)Ljava/lang/Object;") \ + template(MethodInvalidatedException, "com/oracle/graal/api/meta/InstalledCode$MethodInvalidatedException") \ + \ \ /* common method and field names */ \ template(object_initializer_name, "<init>") \