Mercurial > hg > truffle
changeset 5505:28af6dff047f
C++ changes for the renamings of CiKind and CiConstant.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Thu, 07 Jun 2012 17:25:52 +0200 |
| parents | 452f91ebdb54 |
| children | 56860d3f9f39 |
| files | src/share/vm/classfile/vmSymbols.hpp src/share/vm/graal/graalCompilerToVM.cpp src/share/vm/graal/graalJavaAccess.hpp |
| diffstat | 3 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/vmSymbols.hpp Thu Jun 07 17:09:57 2012 +0200 +++ b/src/share/vm/classfile/vmSymbols.hpp Thu Jun 07 17:25:52 2012 +0200 @@ -310,10 +310,10 @@ 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/ci/CiConstant") \ + template(com_oracle_max_cri_ci_CiConstant, "com/oracle/max/cri/ri/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/ci/CiKind") \ + template(com_oracle_max_cri_ci_CiKind, "com/oracle/max/cri/ri/RiKind") \ template(com_oracle_max_cri_ci_CiRuntimeCall, "com/oracle/max/cri/ci/CiRuntimeCall") \ template(startCompiler_name, "startCompiler") \ template(bootstrap_name, "bootstrap") \ @@ -338,13 +338,13 @@ template(createRiTypeUnresolved_name, "createRiTypeUnresolved") \ template(createRiTypeUnresolved_signature, "(Ljava/lang/String;)Lcom/oracle/max/cri/ri/RiType;") \ template(createCiConstant_name, "createCiConstant") \ - template(createCiConstant_signature, "(Lcom/oracle/max/cri/ci/CiKind;J)Lcom/oracle/max/cri/ci/CiConstant;") \ + template(createCiConstant_signature, "(Lcom/oracle/max/cri/ri/RiKind;J)Lcom/oracle/max/cri/ri/RiConstant;") \ template(createCiConstantFloat_name, "createCiConstantFloat") \ - template(createCiConstantFloat_signature, "(F)Lcom/oracle/max/cri/ci/CiConstant;") \ + template(createCiConstantFloat_signature, "(F)Lcom/oracle/max/cri/ri/RiConstant;") \ template(createCiConstantDouble_name, "createCiConstantDouble") \ - template(createCiConstantDouble_signature, "(D)Lcom/oracle/max/cri/ci/CiConstant;") \ + template(createCiConstantDouble_signature, "(D)Lcom/oracle/max/cri/ri/RiConstant;") \ template(createCiConstantObject_name, "createCiConstantObject") \ - template(createCiConstantObject_signature, "(Ljava/lang/Object;)Lcom/oracle/max/cri/ci/CiConstant;") \ + template(createCiConstantObject_signature, "(Ljava/lang/Object;)Lcom/oracle/max/cri/ri/RiConstant;") \ template(getVMToCompiler_name, "getVMToCompiler") \ template(getVMToCompiler_signature, "()Lcom/oracle/graal/hotspot/bridge/VMToCompiler;") \ template(getInstance_name, "getInstance") \
--- a/src/share/vm/graal/graalCompilerToVM.cpp Thu Jun 07 17:09:57 2012 +0200 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Thu Jun 07 17:25:52 2012 +0200 @@ -1138,8 +1138,8 @@ #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/ci/CiConstant;" -#define CI_KIND "Lcom/oracle/max/cri/ci/CiKind;" +#define CI_CONSTANT "Lcom/oracle/max/cri/ri/RiConstant;" +#define CI_KIND "Lcom/oracle/max/cri/ri/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 17:09:57 2012 +0200 +++ b/src/share/vm/graal/graalJavaAccess.hpp Thu Jun 07 17:25:52 2012 +0200 @@ -83,7 +83,7 @@ oop_field(HotSpotType, name, "Ljava/lang/String;") \ end_class \ start_class(HotSpotField) \ - oop_field(HotSpotField, constant, "Lcom/oracle/max/cri/ci/CiConstant;") \ + oop_field(HotSpotField, constant, "Lcom/oracle/max/cri/ri/RiConstant;") \ int_field(HotSpotField, offset) \ int_field(HotSpotField, accessFlags) \ end_class \ @@ -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/ci/CiConstant;") \ + oop_field(CiTargetMethod_DataPatch, constant, "Lcom/oracle/max/cri/ri/RiConstant;") \ int_field(CiTargetMethod_DataPatch, alignment) \ end_class \ start_class(CiTargetMethod_Safepoint) \ @@ -181,18 +181,18 @@ int_field(CiCodePos, bci) \ end_class \ start_class(CiConstant) \ - oop_field(CiConstant, kind, "Lcom/oracle/max/cri/ci/CiKind;") \ + oop_field(CiConstant, kind, "Lcom/oracle/max/cri/ri/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/ci/CiKind;"); \ - static_oop_field(CiKind, Byte, "Lcom/oracle/max/cri/ci/CiKind;"); \ - static_oop_field(CiKind, Char, "Lcom/oracle/max/cri/ci/CiKind;"); \ - static_oop_field(CiKind, Short, "Lcom/oracle/max/cri/ci/CiKind;"); \ - static_oop_field(CiKind, Int, "Lcom/oracle/max/cri/ci/CiKind;"); \ - static_oop_field(CiKind, Long, "Lcom/oracle/max/cri/ci/CiKind;"); \ + 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;"); \ end_class \ start_class(CiRuntimeCall) \ static_oop_field(CiRuntimeCall, UnwindException, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ @@ -214,7 +214,7 @@ start_class(RiMethod) \ end_class \ start_class(CiValue) \ - oop_field(CiValue, kind, "Lcom/oracle/max/cri/ci/CiKind;") \ + oop_field(CiValue, kind, "Lcom/oracle/max/cri/ri/RiKind;") \ static_oop_field(CiValue, IllegalValue, "Lcom/oracle/max/cri/ci/CiValue;"); \ end_class \ start_class(CiRegisterValue) \