Mercurial > hg > graal-compiler
changeset 5508:22fe762332af
Changes in C++ part for the Java renamings.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Thu, 07 Jun 2012 18:37:15 +0200 |
| parents | dc71b06d09f8 |
| children | 6ed763809de7 |
| files | src/share/vm/classfile/vmSymbols.hpp src/share/vm/graal/graalCompilerToVM.cpp src/share/vm/graal/graalJavaAccess.hpp src/share/vm/runtime/arguments.cpp |
| diffstat | 4 files changed, 60 insertions(+), 58 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/vmSymbols.hpp Thu Jun 07 18:24:06 2012 +0200 +++ b/src/share/vm/classfile/vmSymbols.hpp Thu Jun 07 18:37:15 2012 +0200 @@ -284,11 +284,11 @@ template(com_oracle_graal_hotspot_HotSpotProxy, "com/oracle/graal/hotspot/HotSpotProxy") \ template(com_oracle_graal_hotspot_Compiler, "com/oracle/graal/hotspot/Compiler") \ template(com_oracle_graal_hotspot_CompilerImpl, "com/oracle/graal/hotspot/CompilerImpl") \ - template(com_oracle_max_cri_ri_RiMethod, "com/oracle/max/cri/ri/RiMethod") \ - template(com_oracle_max_cri_ri_RiResolvedField, "com/oracle/max/cri/ri/RiResolvedField") \ - template(com_oracle_max_cri_ri_RiType, "com/oracle/max/cri/ri/RiType") \ - template(com_oracle_max_cri_ri_RiConstantPool, "com/oracle/max/cri/ri/RiConstantPool") \ - template(com_oracle_max_cri_ri_RiExceptionHandler, "com/oracle/max/cri/ri/RiExceptionHandler") \ + template(com_oracle_max_cri_ri_RiMethod, "com/oracle/graal/api/meta/RiMethod") \ + template(com_oracle_max_cri_ri_RiResolvedField, "com/oracle/graal/api/meta/RiResolvedField") \ + template(com_oracle_max_cri_ri_RiType, "com/oracle/graal/api/meta/RiType") \ + template(com_oracle_max_cri_ri_RiConstantPool, "com/oracle/graal/api/meta/RiConstantPool") \ + template(com_oracle_max_cri_ri_RiExceptionHandler, "com/oracle/graal/api/meta/RiExceptionHandler") \ template(com_oracle_max_cri_ci_CiAssumptions, "com/oracle/max/cri/ci/CiAssumptions") \ template(com_oracle_max_cri_ci_CiAssumptions_MethodContents, "com/oracle/max/cri/ci/CiAssumptions$MethodContents") \ template(com_oracle_max_cri_ci_CiAssumptions_ConcreteSubtype, "com/oracle/max/cri/ci/CiAssumptions$ConcreteSubtype") \ @@ -302,18 +302,18 @@ template(com_oracle_max_cri_ci_CiTargetMethod_ExceptionHandler, "com/oracle/max/cri/ci/CiTargetMethod$ExceptionHandler") \ template(com_oracle_max_cri_ci_CiTargetMethod_Mark, "com/oracle/max/cri/ci/CiTargetMethod$Mark") \ template(com_oracle_graal_graph_BitMap, "com/oracle/graal/graph/BitMap") \ - template(com_oracle_max_cri_ci_CiBitMap, "com/oracle/max/cri/ci/CiBitMap") \ + template(com_oracle_max_cri_ci_CiBitMap, "com/oracle/graal/api/meta/RiBitMap") \ template(com_oracle_max_cri_ci_CiDebugInfo, "com/oracle/max/cri/ci/CiDebugInfo") \ template(com_oracle_max_cri_ci_CiFrame, "com/oracle/max/cri/ci/CiFrame") \ - template(com_oracle_max_cri_ci_CiValue, "com/oracle/max/cri/ci/CiValue") \ + template(com_oracle_max_cri_ci_CiValue, "com/oracle/graal/api/meta/RiValue") \ template(com_oracle_max_cri_ci_CiStackSlot, "com/oracle/max/cri/ci/CiStackSlot") \ template(com_oracle_max_cri_ci_CiRegisterValue, "com/oracle/max/cri/ci/CiRegisterValue") \ template(com_oracle_max_cri_ci_CiRegister, "com/oracle/max/cri/ci/CiRegister") \ template(com_oracle_max_cri_ci_CiCodePos, "com/oracle/max/cri/ci/CiCodePos") \ - template(com_oracle_max_cri_ci_CiConstant, "com/oracle/max/cri/ri/RiConstant") \ + template(com_oracle_max_cri_ci_CiConstant, "com/oracle/graal/api/meta/RiConstant") \ template(com_oracle_max_cri_ci_CiVirtualObject, "com/oracle/max/cri/ci/CiVirtualObject") \ template(com_oracle_max_cri_ci_CiMonitorValue, "com/oracle/max/cri/ci/CiMonitorValue") \ - template(com_oracle_max_cri_ci_CiKind, "com/oracle/max/cri/ri/RiKind") \ + template(com_oracle_max_cri_ci_CiKind, "com/oracle/graal/api/meta/RiKind") \ template(com_oracle_max_cri_ci_CiRuntimeCall, "com/oracle/max/cri/ci/CiRuntimeCall") \ template(startCompiler_name, "startCompiler") \ template(bootstrap_name, "bootstrap") \ @@ -324,27 +324,27 @@ template(setDefaultOptions_name, "setDefaultOptions") \ template(setOption_signature, "(Ljava/lang/String;)Z") \ template(createRiMethodResolved_name, "createRiMethodResolved") \ - template(createRiMethodResolved_signature, "(JLjava/lang/String;)Lcom/oracle/max/cri/ri/RiMethod;") \ + template(createRiMethodResolved_signature, "(JLjava/lang/String;)Lcom/oracle/graal/api/meta/RiMethod;") \ template(createRiMethodUnresolved_name, "createRiMethodUnresolved") \ - template(createRiMethodUnresolved_signature, "(Ljava/lang/String;Ljava/lang/String;Lcom/oracle/max/cri/ri/RiType;)Lcom/oracle/max/cri/ri/RiMethod;") \ + template(createRiMethodUnresolved_signature, "(Ljava/lang/String;Ljava/lang/String;Lcom/oracle/graal/api/meta/RiType;)Lcom/oracle/graal/api/meta/RiMethod;") \ template(createRiSignature_name, "createRiSignature") \ - template(createRiSignature_signature, "(Ljava/lang/String;)Lcom/oracle/max/cri/ri/RiSignature;") \ + template(createRiSignature_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/RiSignature;") \ template(createRiField_name, "createRiField") \ - template(createRiField_signature, "(Lcom/oracle/max/cri/ri/RiType;Ljava/lang/String;Lcom/oracle/max/cri/ri/RiType;II)Lcom/oracle/max/cri/ri/RiField;") \ + template(createRiField_signature, "(Lcom/oracle/graal/api/meta/RiType;Ljava/lang/String;Lcom/oracle/graal/api/meta/RiType;II)Lcom/oracle/graal/api/meta/RiField;") \ template(createRiType_name, "createRiType") \ - template(createRiType_signature, "(JLjava/lang/String;)Lcom/oracle/max/cri/ri/RiType;") \ + template(createRiType_signature, "(JLjava/lang/String;)Lcom/oracle/graal/api/meta/RiType;") \ template(createRiTypePrimitive_name, "createRiTypePrimitive") \ - template(createRiTypePrimitive_signature, "(I)Lcom/oracle/max/cri/ri/RiType;") \ + template(createRiTypePrimitive_signature, "(I)Lcom/oracle/graal/api/meta/RiType;") \ template(createRiTypeUnresolved_name, "createRiTypeUnresolved") \ - template(createRiTypeUnresolved_signature, "(Ljava/lang/String;)Lcom/oracle/max/cri/ri/RiType;") \ + template(createRiTypeUnresolved_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/RiType;") \ template(createCiConstant_name, "createCiConstant") \ - template(createCiConstant_signature, "(Lcom/oracle/max/cri/ri/RiKind;J)Lcom/oracle/max/cri/ri/RiConstant;") \ + template(createCiConstant_signature, "(Lcom/oracle/graal/api/meta/RiKind;J)Lcom/oracle/graal/api/meta/RiConstant;") \ template(createCiConstantFloat_name, "createCiConstantFloat") \ - template(createCiConstantFloat_signature, "(F)Lcom/oracle/max/cri/ri/RiConstant;") \ + template(createCiConstantFloat_signature, "(F)Lcom/oracle/graal/api/meta/RiConstant;") \ template(createCiConstantDouble_name, "createCiConstantDouble") \ - template(createCiConstantDouble_signature, "(D)Lcom/oracle/max/cri/ri/RiConstant;") \ + template(createCiConstantDouble_signature, "(D)Lcom/oracle/graal/api/meta/RiConstant;") \ template(createCiConstantObject_name, "createCiConstantObject") \ - template(createCiConstantObject_signature, "(Ljava/lang/Object;)Lcom/oracle/max/cri/ri/RiConstant;") \ + template(createCiConstantObject_signature, "(Ljava/lang/Object;)Lcom/oracle/graal/api/meta/RiConstant;") \ template(getVMToCompiler_name, "getVMToCompiler") \ template(getVMToCompiler_signature, "()Lcom/oracle/graal/hotspot/bridge/VMToCompiler;") \ template(getInstance_name, "getInstance") \ @@ -353,7 +353,7 @@ template(forObject_name, "forObject") \ template(callbackInternal_name, "callbackInternal") \ template(callback_signature, "(Ljava/lang/Object;)Ljava/lang/Object;") \ - template(MethodInvalidatedException, "com/oracle/max/cri/ri/RiCompiledMethod$MethodInvalidatedException") \ + template(MethodInvalidatedException, "com/oracle/graal/api/meta/RiCompiledMethod$MethodInvalidatedException") \ \ \ /* common method and field names */ \
--- a/src/share/vm/graal/graalCompilerToVM.cpp Thu Jun 07 18:24:06 2012 +0200 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Thu Jun 07 18:37:15 2012 +0200 @@ -1122,24 +1122,24 @@ #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_##f)) #define PROXY "J" -#define TYPE "Lcom/oracle/max/cri/ri/RiType;" +#define TYPE "Lcom/oracle/graal/api/meta/RiType;" #define RESOLVED_TYPE "Lcom/oracle/graal/hotspot/ri/HotSpotTypeResolved;" -#define METHOD "Lcom/oracle/max/cri/ri/RiMethod;" +#define METHOD "Lcom/oracle/graal/api/meta/RiMethod;" #define RESOLVED_METHOD "Lcom/oracle/graal/hotspot/ri/HotSpotMethodResolved;" #define REFLECT_METHOD "Ljava/lang/reflect/Method;" -#define SIGNATURE "Lcom/oracle/max/cri/ri/RiSignature;" -#define FIELD "Lcom/oracle/max/cri/ri/RiField;" -#define RESOLVED_FIELD "Lcom/oracle/max/cri/ri/RiResolvedField;" -#define CONSTANT_POOL "Lcom/oracle/max/cri/ri/RiConstantPool;" -#define EXCEPTION_HANDLERS "[Lcom/oracle/max/cri/ri/RiExceptionHandler;" +#define SIGNATURE "Lcom/oracle/graal/api/meta/RiSignature;" +#define FIELD "Lcom/oracle/graal/api/meta/RiField;" +#define RESOLVED_FIELD "Lcom/oracle/graal/api/meta/RiResolvedField;" +#define CONSTANT_POOL "Lcom/oracle/graal/api/meta/RiConstantPool;" +#define EXCEPTION_HANDLERS "[Lcom/oracle/graal/api/meta/RiExceptionHandler;" #define TARGET_METHOD "Lcom/oracle/graal/hotspot/HotSpotTargetMethod;" #define CONFIG "Lcom/oracle/graal/hotspot/HotSpotVMConfig;" #define HS_METHOD "Lcom/oracle/graal/hotspot/ri/HotSpotMethod;" #define HS_COMP_METHOD "Lcom/oracle/graal/hotspot/ri/HotSpotCompiledMethod;" #define HS_CODE_INFO "Lcom/oracle/graal/hotspot/ri/HotSpotCodeInfo;" #define METHOD_DATA "Lcom/oracle/graal/hotspot/ri/HotSpotMethodData;" -#define CI_CONSTANT "Lcom/oracle/max/cri/ri/RiConstant;" -#define CI_KIND "Lcom/oracle/max/cri/ri/RiKind;" +#define CI_CONSTANT "Lcom/oracle/graal/api/meta/RiConstant;" +#define CI_KIND "Lcom/oracle/graal/api/meta/RiKind;" #define CI_RUNTIME_CALL "Lcom/oracle/max/cri/ci/CiRuntimeCall;" #define STRING "Ljava/lang/String;" #define OBJECT "Ljava/lang/Object;"
--- a/src/share/vm/graal/graalJavaAccess.hpp Thu Jun 07 18:24:06 2012 +0200 +++ b/src/share/vm/graal/graalJavaAccess.hpp Thu Jun 07 18:37:15 2012 +0200 @@ -65,7 +65,7 @@ start_class(HotSpotMethodResolved) \ oop_field(HotSpotMethodResolved, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \ oop_field(HotSpotMethodResolved, name, "Ljava/lang/String;") \ - oop_field(HotSpotMethodResolved, holder, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ + oop_field(HotSpotMethodResolved, holder, "Lcom/oracle/graal/api/meta/RiResolvedType;") \ oop_field(HotSpotMethodResolved, javaMirror, "Ljava/lang/Object;") \ int_field(HotSpotMethodResolved, codeSize) \ int_field(HotSpotMethodResolved, accessFlags) \ @@ -83,14 +83,14 @@ oop_field(HotSpotType, name, "Ljava/lang/String;") \ end_class \ start_class(HotSpotField) \ - oop_field(HotSpotField, constant, "Lcom/oracle/max/cri/ri/RiConstant;") \ + oop_field(HotSpotField, constant, "Lcom/oracle/graal/api/meta/RiConstant;") \ int_field(HotSpotField, offset) \ int_field(HotSpotField, accessFlags) \ end_class \ start_class(HotSpotCompiledMethod) \ oop_field(HotSpotCompiledMethod, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \ long_field(HotSpotCompiledMethod, nmethod) \ - oop_field(HotSpotCompiledMethod, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;")\ + oop_field(HotSpotCompiledMethod, method, "Lcom/oracle/graal/api/meta/RiResolvedMethod;")\ end_class \ start_class(HotSpotCodeInfo) \ long_field(HotSpotCodeInfo, start) \ @@ -111,7 +111,7 @@ int_field(HotSpotExceptionHandler, endBci) \ int_field(HotSpotExceptionHandler, handlerBci) \ int_field(HotSpotExceptionHandler, catchClassIndex) \ - oop_field(HotSpotExceptionHandler, catchClass, "Lcom/oracle/max/cri/ri/RiType;") \ + oop_field(HotSpotExceptionHandler, catchClass, "Lcom/oracle/graal/api/meta/RiType;") \ end_class \ start_class(CiTargetMethod) \ int_field(CiTargetMethod, frameSize) \ @@ -124,16 +124,16 @@ oop_field(CiAssumptions, list, "[Lcom/oracle/max/cri/ci/CiAssumptions$Assumption;") \ end_class \ start_class(CiAssumptions_MethodContents) \ - oop_field(CiAssumptions_MethodContents, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ + oop_field(CiAssumptions_MethodContents, method, "Lcom/oracle/graal/api/meta/RiResolvedMethod;") \ end_class \ start_class(CiAssumptions_ConcreteSubtype) \ - oop_field(CiAssumptions_ConcreteSubtype, context, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ - oop_field(CiAssumptions_ConcreteSubtype, subtype, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ + oop_field(CiAssumptions_ConcreteSubtype, context, "Lcom/oracle/graal/api/meta/RiResolvedType;") \ + oop_field(CiAssumptions_ConcreteSubtype, subtype, "Lcom/oracle/graal/api/meta/RiResolvedType;") \ end_class \ start_class(CiAssumptions_ConcreteMethod) \ - oop_field(CiAssumptions_ConcreteMethod, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ - oop_field(CiAssumptions_ConcreteMethod, context, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ - oop_field(CiAssumptions_ConcreteMethod, impl, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ + oop_field(CiAssumptions_ConcreteMethod, method, "Lcom/oracle/graal/api/meta/RiResolvedMethod;") \ + oop_field(CiAssumptions_ConcreteMethod, context, "Lcom/oracle/graal/api/meta/RiResolvedType;") \ + oop_field(CiAssumptions_ConcreteMethod, impl, "Lcom/oracle/graal/api/meta/RiResolvedMethod;") \ end_class \ start_class(CiTargetMethod_Site) \ int_field(CiTargetMethod_Site, pcOffset) \ @@ -143,7 +143,7 @@ oop_field(CiTargetMethod_Call, debugInfo, "Lcom/oracle/max/cri/ci/CiDebugInfo;") \ end_class \ start_class(CiTargetMethod_DataPatch) \ - oop_field(CiTargetMethod_DataPatch, constant, "Lcom/oracle/max/cri/ri/RiConstant;") \ + oop_field(CiTargetMethod_DataPatch, constant, "Lcom/oracle/graal/api/meta/RiConstant;") \ int_field(CiTargetMethod_DataPatch, alignment) \ end_class \ start_class(CiTargetMethod_Safepoint) \ @@ -158,8 +158,8 @@ end_class \ start_class(CiDebugInfo) \ oop_field(CiDebugInfo, codePos, "Lcom/oracle/max/cri/ci/CiCodePos;") \ - oop_field(CiDebugInfo, registerRefMap, "Lcom/oracle/max/cri/ci/CiBitMap;") \ - oop_field(CiDebugInfo, frameRefMap, "Lcom/oracle/max/cri/ci/CiBitMap;") \ + oop_field(CiDebugInfo, registerRefMap, "Lcom/oracle/graal/api/meta/RiBitMap;") \ + oop_field(CiDebugInfo, frameRefMap, "Lcom/oracle/graal/api/meta/RiBitMap;") \ end_class \ start_class(GraalBitMap) \ int_field(GraalBitMap, size) \ @@ -167,7 +167,7 @@ oop_field(GraalBitMap, extra, "[J") \ end_class \ start_class(CiFrame) \ - oop_field(CiFrame, values, "[Lcom/oracle/max/cri/ci/CiValue;") \ + oop_field(CiFrame, values, "[Lcom/oracle/graal/api/meta/RiValue;") \ int_field(CiFrame, numLocals) \ int_field(CiFrame, numStack) \ int_field(CiFrame, numLocks) \ @@ -177,22 +177,22 @@ end_class \ start_class(CiCodePos) \ oop_field(CiCodePos, caller, "Lcom/oracle/max/cri/ci/CiCodePos;") \ - oop_field(CiCodePos, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ + oop_field(CiCodePos, method, "Lcom/oracle/graal/api/meta/RiResolvedMethod;") \ int_field(CiCodePos, bci) \ end_class \ start_class(CiConstant) \ - oop_field(CiConstant, kind, "Lcom/oracle/max/cri/ri/RiKind;") \ + oop_field(CiConstant, kind, "Lcom/oracle/graal/api/meta/RiKind;") \ oop_field(CiConstant, object, "Ljava/lang/Object;") \ long_field(CiConstant, primitive) \ end_class \ start_class(CiKind) \ char_field(CiKind, typeChar) \ - static_oop_field(CiKind, Boolean, "Lcom/oracle/max/cri/ri/RiKind;"); \ - static_oop_field(CiKind, Byte, "Lcom/oracle/max/cri/ri/RiKind;"); \ - static_oop_field(CiKind, Char, "Lcom/oracle/max/cri/ri/RiKind;"); \ - static_oop_field(CiKind, Short, "Lcom/oracle/max/cri/ri/RiKind;"); \ - static_oop_field(CiKind, Int, "Lcom/oracle/max/cri/ri/RiKind;"); \ - static_oop_field(CiKind, Long, "Lcom/oracle/max/cri/ri/RiKind;"); \ + static_oop_field(CiKind, Boolean, "Lcom/oracle/graal/api/meta/RiKind;"); \ + static_oop_field(CiKind, Byte, "Lcom/oracle/graal/api/meta/RiKind;"); \ + static_oop_field(CiKind, Char, "Lcom/oracle/graal/api/meta/RiKind;"); \ + static_oop_field(CiKind, Short, "Lcom/oracle/graal/api/meta/RiKind;"); \ + static_oop_field(CiKind, Int, "Lcom/oracle/graal/api/meta/RiKind;"); \ + static_oop_field(CiKind, Long, "Lcom/oracle/graal/api/meta/RiKind;"); \ end_class \ start_class(CiRuntimeCall) \ static_oop_field(CiRuntimeCall, UnwindException, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ @@ -214,8 +214,8 @@ start_class(RiMethod) \ end_class \ start_class(CiValue) \ - oop_field(CiValue, kind, "Lcom/oracle/max/cri/ri/RiKind;") \ - static_oop_field(CiValue, IllegalValue, "Lcom/oracle/max/cri/ci/CiValue;"); \ + oop_field(CiValue, kind, "Lcom/oracle/graal/api/meta/RiKind;") \ + static_oop_field(CiValue, IllegalValue, "Lcom/oracle/graal/api/meta/RiValue;"); \ end_class \ start_class(CiRegisterValue) \ oop_field(CiRegisterValue, reg, "Lcom/oracle/max/cri/ci/CiRegister;") \ @@ -229,12 +229,12 @@ end_class \ start_class(CiVirtualObject) \ int_field(CiVirtualObject, id) \ - oop_field(CiVirtualObject, type, "Lcom/oracle/max/cri/ri/RiType;") \ - oop_field(CiVirtualObject, values, "[Lcom/oracle/max/cri/ci/CiValue;") \ + oop_field(CiVirtualObject, type, "Lcom/oracle/graal/api/meta/RiType;") \ + oop_field(CiVirtualObject, values, "[Lcom/oracle/graal/api/meta/RiValue;") \ end_class \ start_class(CiMonitorValue) \ - oop_field(CiMonitorValue, owner, "Lcom/oracle/max/cri/ci/CiValue;") \ - oop_field(CiMonitorValue, lockData, "Lcom/oracle/max/cri/ci/CiValue;") \ + oop_field(CiMonitorValue, owner, "Lcom/oracle/graal/api/meta/RiValue;") \ + oop_field(CiMonitorValue, lockData, "Lcom/oracle/graal/api/meta/RiValue;") \ boolean_field(CiMonitorValue, eliminated) \ end_class \ /* end*/
--- a/src/share/vm/runtime/arguments.cpp Thu Jun 07 18:24:06 2012 +0200 +++ b/src/share/vm/runtime/arguments.cpp Thu Jun 07 18:37:15 2012 +0200 @@ -2130,6 +2130,8 @@ // this declaration is checked for correctness by 'mx build' - only // modify its entries, not its name or shape const char* graal_projects[] = { + "com.oracle.graal.api", + "com.oracle.graal.api.meta", "com.oracle.max.criutils", "com.oracle.graal.hotspot", "com.oracle.max.asm",