Mercurial > hg > truffle
changeset 4223:e0a4668c57a2
Renaming of VMExits and VMEntries part 4.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Wed, 04 Jan 2012 22:08:17 +0100 |
| parents | 8e2985cdaaa5 |
| children | 26336f60ec7a |
| files | src/cpu/x86/vm/c1_Runtime1_x86.cpp src/share/vm/classfile/systemDictionary.hpp src/share/vm/classfile/vmSymbols.hpp src/share/vm/graal/graalCodeInstaller.cpp src/share/vm/graal/graalCompilerToVM.cpp src/share/vm/graal/graalJavaAccess.hpp src/share/vm/graal/graalVMToCompiler.cpp |
| diffstat | 7 files changed, 173 insertions(+), 174 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/x86/vm/c1_Runtime1_x86.cpp Wed Jan 04 21:13:44 2012 +0100 +++ b/src/cpu/x86/vm/c1_Runtime1_x86.cpp Wed Jan 04 22:08:17 2012 +0100 @@ -1063,9 +1063,9 @@ Handle callback(_callback); Handle argument(_argument); - KlassHandle klass = SystemDictionary::resolve_or_null(vmSymbols::com_sun_cri_ci_CiGenericCallback(), SystemDictionary::java_system_loader(), NULL, thread); + KlassHandle klass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_cri_ci_CiGenericCallback(), SystemDictionary::java_system_loader(), NULL, thread); if (klass.is_null()) { - tty->print_cr("couldn't resolve com_sun_cri_ci_CiGenericCallback"); + tty->print_cr("couldn't resolve com_oracle_max_cri_ci_CiGenericCallback"); } JavaValue result(T_OBJECT);
--- a/src/share/vm/classfile/systemDictionary.hpp Wed Jan 04 21:13:44 2012 +0100 +++ b/src/share/vm/classfile/systemDictionary.hpp Wed Jan 04 22:08:17 2012 +0100 @@ -186,43 +186,43 @@ template(Short_klass, java_lang_Short, Pre) \ template(Integer_klass, java_lang_Integer, Pre) \ template(Long_klass, java_lang_Long, Pre) \ - \ - template(graalOptions_klass, com_sun_graal_graalOptions, Opt) \ - template(HotSpotTypeResolved_klass, com_sun_hotspot_graal_HotSpotTypeResolved, Opt) \ - template(HotSpotType_klass, com_sun_hotspot_graal_HotSpotType, Opt) \ - template(HotSpotField_klass, com_sun_hotspot_graal_HotSpotField, Opt) \ - template(HotSpotCompiledMethod_klass, com_sun_hotspot_graal_HotSpotCompiledMethod, Opt) \ - template(HotSpotMethodResolved_klass, com_sun_hotspot_graal_HotSpotMethodResolved, Opt) \ - template(HotSpotTargetMethod_klass, com_sun_hotspot_graal_HotSpotTargetMethod, Opt) \ - template(HotSpotExceptionHandler_klass,com_sun_hotspot_graal_HotSpotExceptionHandler, Opt) \ - template(CiAssumptions_klass, com_sun_cri_ci_CiAssumptions, Opt) \ - template(CiAssumptions_ConcreteSubtype_klass, com_sun_cri_ci_CiAssumptions_ConcreteSubtype, Opt) \ - template(CiAssumptions_ConcreteMethod_klass, com_sun_cri_ci_CiAssumptions_ConcreteMethod, Opt) \ - template(CiTargetMethod_klass, com_sun_cri_ci_CiTargetMethod, Opt) \ - template(CiTargetMethod_Site_klass, com_sun_cri_ci_CiTargetMethod_Site, Opt) \ - template(CiTargetMethod_Call_klass, com_sun_cri_ci_CiTargetMethod_Call, Opt) \ - template(CiTargetMethod_DataPatch_klass, com_sun_cri_ci_CiTargetMethod_DataPatch, Opt) \ - template(CiTargetMethod_Safepoint_klass, com_sun_cri_ci_CiTargetMethod_Safepoint, Opt) \ - template(CiTargetMethod_ExceptionHandler_klass, com_sun_cri_ci_CiTargetMethod_ExceptionHandler, Opt) \ - template(CiTargetMethod_Mark_klass, com_sun_cri_ci_CiTargetMethod_Mark, Opt) \ - template(GraalBitMap_klass, com_sun_cri_ci_CiBitMap, Opt) \ - template(CiDebugInfo_klass, com_sun_cri_ci_CiDebugInfo, Opt) \ - template(CiFrame_klass, com_sun_cri_ci_CiFrame, Opt) \ - template(CiValue_klass, com_sun_cri_ci_CiValue, Opt) \ - template(CiStackSlot_klass, com_sun_cri_ci_CiStackSlot, Opt) \ - template(CiRegisterValue_klass, com_sun_cri_ci_CiRegisterValue, Opt) \ - template(CiRegister_klass, com_sun_cri_ci_CiRegister, Opt) \ - template(CiCodePos_klass, com_sun_cri_ci_CiCodePos, Opt) \ - template(CiConstant_klass, com_sun_cri_ci_CiConstant, Opt) \ - template(CiVirtualObject_klass, com_sun_cri_ci_CiVirtualObject, Opt) \ - template(CiMonitorValue_klass, com_sun_cri_ci_CiMonitorValue, Opt) \ - template(CiKind_klass, com_sun_cri_ci_CiKind, Opt) \ - template(CiRuntimeCall_klass, com_sun_cri_ci_CiRuntimeCall, Opt) \ - template(RiMethod_klass, com_sun_cri_ri_RiMethod, Opt) \ - template(RiType_klass, com_sun_cri_ri_RiType, Opt) \ - template(RiResolvedField_klass, com_sun_cri_ri_RiResolvedField, Opt) \ - template(RiExceptionHandler_klass, com_sun_cri_ri_RiExceptionHandler, Opt) \ - template(RiTypeProfile_klass, com_sun_cri_ri_RiTypeProfile, Opt) \ + \ + /* Support for Graal */ \ + template(HotSpotTypeResolved_klass, com_oracle_max_graal_hotspot_HotSpotTypeResolved, Opt) \ + template(HotSpotType_klass, com_oracle_max_graal_hotspot_HotSpotType, Opt) \ + template(HotSpotField_klass, com_oracle_max_graal_hotspot_HotSpotField, Opt) \ + template(HotSpotCompiledMethod_klass, com_oracle_max_graal_hotspot_HotSpotCompiledMethod, Opt) \ + template(HotSpotMethodResolved_klass, com_oracle_max_graal_hotspot_ri_HotSpotMethodResolved, Opt) \ + template(HotSpotTargetMethod_klass, com_oracle_max_graal_hotspot_HotSpotTargetMethod, Opt) \ + template(HotSpotExceptionHandler_klass, com_oracle_max_graal_hotspot_HotSpotExceptionHandler, Opt) \ + template(CiAssumptions_klass, com_oracle_max_cri_ci_CiAssumptions, Opt) \ + template(CiAssumptions_ConcreteSubtype_klass, com_oracle_max_cri_ci_CiAssumptions_ConcreteSubtype, Opt) \ + template(CiAssumptions_ConcreteMethod_klass, com_oracle_max_cri_ci_CiAssumptions_ConcreteMethod, Opt) \ + template(CiTargetMethod_klass, com_oracle_max_cri_ci_CiTargetMethod, Opt) \ + template(CiTargetMethod_Site_klass, com_oracle_max_cri_ci_CiTargetMethod_Site, Opt) \ + template(CiTargetMethod_Call_klass, com_oracle_max_cri_ci_CiTargetMethod_Call, Opt) \ + template(CiTargetMethod_DataPatch_klass, com_oracle_max_cri_ci_CiTargetMethod_DataPatch, Opt) \ + template(CiTargetMethod_Safepoint_klass, com_oracle_max_cri_ci_CiTargetMethod_Safepoint, Opt) \ + template(CiTargetMethod_ExceptionHandler_klass, com_oracle_max_cri_ci_CiTargetMethod_ExceptionHandler, Opt) \ + template(CiTargetMethod_Mark_klass, com_oracle_max_cri_ci_CiTargetMethod_Mark, Opt) \ + template(GraalBitMap_klass, com_oracle_max_cri_ci_CiBitMap, Opt) \ + template(CiDebugInfo_klass, com_oracle_max_cri_ci_CiDebugInfo, Opt) \ + template(CiFrame_klass, com_oracle_max_cri_ci_CiFrame, Opt) \ + template(CiValue_klass, com_oracle_max_cri_ci_CiValue, Opt) \ + template(CiStackSlot_klass, com_oracle_max_cri_ci_CiStackSlot, Opt) \ + template(CiRegisterValue_klass, com_oracle_max_cri_ci_CiRegisterValue, Opt) \ + template(CiRegister_klass, com_oracle_max_cri_ci_CiRegister, Opt) \ + template(CiCodePos_klass, com_oracle_max_cri_ci_CiCodePos, Opt) \ + template(CiConstant_klass, com_oracle_max_cri_ci_CiConstant, Opt) \ + template(CiVirtualObject_klass, com_oracle_max_cri_ci_CiVirtualObject, Opt) \ + template(CiMonitorValue_klass, com_oracle_max_cri_ci_CiMonitorValue, Opt) \ + template(CiKind_klass, com_oracle_max_cri_ci_CiKind, Opt) \ + template(CiRuntimeCall_klass, com_oracle_max_cri_ci_CiRuntimeCall, Opt) \ + template(RiMethod_klass, com_oracle_max_cri_ri_RiMethod, Opt) \ + template(RiType_klass, com_oracle_max_cri_ri_RiType, Opt) \ + template(RiResolvedField_klass, com_oracle_max_cri_ri_RiResolvedField, Opt) \ + template(RiExceptionHandler_klass, com_oracle_max_cri_ri_RiExceptionHandler, Opt) \ + template(RiTypeProfile_klass, com_oracle_max_cri_ri_RiTypeProfile, Opt) \ /*end*/
--- a/src/share/vm/classfile/vmSymbols.hpp Wed Jan 04 21:13:44 2012 +0100 +++ b/src/share/vm/classfile/vmSymbols.hpp Wed Jan 04 22:08:17 2012 +0100 @@ -267,83 +267,82 @@ 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_sun_hotspot_graal_VMExits, "com/oracle/max/graal/hotspot/bridge/VMToCompiler") \ - template(com_sun_hotspot_graal_HotSpotMethodResolved, "com/oracle/max/graal/hotspot/ri/HotSpotMethodResolvedImpl") \ - template(com_sun_hotspot_graal_HotSpotTargetMethod, "com/oracle/max/graal/hotspot/HotSpotTargetMethod") \ - template(com_sun_hotspot_graal_HotSpotField, "com/oracle/max/graal/hotspot/ri/HotSpotField") \ - template(com_sun_hotspot_graal_HotSpotCompiledMethod, "com/oracle/max/graal/hotspot/ri/HotSpotCompiledMethod") \ - template(com_sun_graal_graalOptions, "com/sun/graal/graalOptions") \ - template(com_sun_hotspot_graal_HotSpotOptions, "com/oracle/max/graal/hotspot/HotSpotOptions") \ - template(com_sun_hotspot_graal_HotSpotTypeResolved, "com/oracle/max/graal/hotspot/ri/HotSpotTypeResolvedImpl") \ - template(com_sun_hotspot_graal_HotSpotType, "com/oracle/max/graal/hotspot/ri/HotSpotType") \ - template(com_sun_hotspot_graal_HotSpotExceptionHandler,"com/oracle/max/graal/hotspot/ri/HotSpotExceptionHandler") \ - template(com_sun_hotspot_graal_Compiler, "com/oracle/max/graal/hotspot/Compiler") \ - template(com_sun_hotspot_graal_CompilerImpl, "com/oracle/max/graal/hotspot/CompilerImpl") \ - template(com_sun_cri_ri_RiMethod, "com/oracle/max/cri/ri/RiMethod") \ - template(com_sun_cri_ri_RiResolvedField, "com/oracle/max/cri/ri/RiResolvedField") \ - template(com_sun_cri_ri_RiType, "com/oracle/max/cri/ri/RiType") \ - template(com_sun_cri_ri_RiTypeProfile, "com/oracle/max/cri/ri/RiTypeProfile") \ - template(com_sun_cri_ri_RiConstantPool, "com/oracle/max/cri/ri/RiConstantPool") \ - template(com_sun_cri_ri_RiExceptionHandler, "com/oracle/max/cri/ri/RiExceptionHandler") \ - template(com_sun_cri_ci_CiAssumptions, "com/oracle/max/cri/ci/CiAssumptions") \ - template(com_sun_cri_ci_CiAssumptions_ConcreteSubtype, "com/oracle/max/cri/ci/CiAssumptions$ConcreteSubtype") \ - template(com_sun_cri_ci_CiAssumptions_ConcreteMethod, "com/oracle/max/cri/ci/CiAssumptions$ConcreteMethod") \ - template(com_sun_cri_ci_CiGenericCallback, "com/oracle/max/cri/ci/CiGenericCallback") \ - template(com_sun_cri_ci_CiTargetMethod, "com/oracle/max/cri/ci/CiTargetMethod") \ - template(com_sun_cri_ci_CiTargetMethod_Site, "com/oracle/max/cri/ci/CiTargetMethod$Site") \ - template(com_sun_cri_ci_CiTargetMethod_Call, "com/oracle/max/cri/ci/CiTargetMethod$Call") \ - template(com_sun_cri_ci_CiTargetMethod_DataPatch, "com/oracle/max/cri/ci/CiTargetMethod$DataPatch") \ - template(com_sun_cri_ci_CiTargetMethod_Safepoint, "com/oracle/max/cri/ci/CiTargetMethod$Safepoint") \ - template(com_sun_cri_ci_CiTargetMethod_ExceptionHandler, "com/oracle/max/cri/ci/CiTargetMethod$ExceptionHandler") \ - template(com_sun_cri_ci_CiTargetMethod_Mark, "com/oracle/max/cri/ci/CiTargetMethod$Mark") \ - template(com_oracle_max_graal_graph_BitMap, "com/oracle/max/graal/graph/BitMap") \ - template(com_sun_cri_ci_CiBitMap, "com/oracle/max/cri/ci/CiBitMap") \ - template(com_sun_cri_ci_CiDebugInfo, "com/oracle/max/cri/ci/CiDebugInfo") \ - template(com_sun_cri_ci_CiFrame, "com/oracle/max/cri/ci/CiFrame") \ - template(com_sun_cri_ci_CiValue, "com/oracle/max/cri/ci/CiValue") \ - template(com_sun_cri_ci_CiStackSlot, "com/oracle/max/cri/ci/CiStackSlot") \ - template(com_sun_cri_ci_CiRegisterValue, "com/oracle/max/cri/ci/CiRegisterValue") \ - template(com_sun_cri_ci_CiRegister, "com/oracle/max/cri/ci/CiRegister") \ - template(com_sun_cri_ci_CiCodePos, "com/oracle/max/cri/ci/CiCodePos") \ - template(com_sun_cri_ci_CiConstant, "com/oracle/max/cri/ci/CiConstant") \ - template(com_sun_cri_ci_CiVirtualObject, "com/oracle/max/cri/ci/CiVirtualObject") \ - template(com_sun_cri_ci_CiMonitorValue, "com/oracle/max/cri/ci/CiMonitorValue") \ - template(com_sun_cri_ci_CiKind, "com/oracle/max/cri/ci/CiKind") \ - template(com_sun_cri_ci_CiRuntimeCall, "com/oracle/max/cri/ci/CiRuntimeCall") \ + \ + /* Support for Graal */ \ + template(com_oracle_max_graal_hotspot_bridge_VMToCompiler, "com/oracle/max/graal/hotspot/bridge/VMToCompiler") \ + template(com_oracle_max_graal_hotspot_ri_HotSpotMethodResolved, "com/oracle/max/graal/hotspot/ri/HotSpotMethodResolvedImpl") \ + template(com_oracle_max_graal_hotspot_HotSpotTargetMethod, "com/oracle/max/graal/hotspot/HotSpotTargetMethod") \ + template(com_oracle_max_graal_hotspot_HotSpotField, "com/oracle/max/graal/hotspot/ri/HotSpotField") \ + template(com_oracle_max_graal_hotspot_HotSpotCompiledMethod, "com/oracle/max/graal/hotspot/ri/HotSpotCompiledMethod") \ + template(com_oracle_max_graal_hotspot_HotSpotOptions, "com/oracle/max/graal/hotspot/HotSpotOptions") \ + template(com_oracle_max_graal_hotspot_HotSpotTypeResolved, "com/oracle/max/graal/hotspot/ri/HotSpotTypeResolvedImpl") \ + template(com_oracle_max_graal_hotspot_HotSpotType, "com/oracle/max/graal/hotspot/ri/HotSpotType") \ + template(com_oracle_max_graal_hotspot_HotSpotExceptionHandler, "com/oracle/max/graal/hotspot/ri/HotSpotExceptionHandler") \ + template(com_oracle_max_graal_hotspot_Compiler, "com/oracle/max/graal/hotspot/Compiler") \ + template(com_oracle_max_graal_hotspot_CompilerImpl, "com/oracle/max/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_RiTypeProfile, "com/oracle/max/cri/ri/RiTypeProfile") \ + 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_ci_CiAssumptions, "com/oracle/max/cri/ci/CiAssumptions") \ + template(com_oracle_max_cri_ci_CiAssumptions_ConcreteSubtype, "com/oracle/max/cri/ci/CiAssumptions$ConcreteSubtype") \ + template(com_oracle_max_cri_ci_CiAssumptions_ConcreteMethod, "com/oracle/max/cri/ci/CiAssumptions$ConcreteMethod") \ + template(com_oracle_max_cri_ci_CiGenericCallback, "com/oracle/max/cri/ci/CiGenericCallback") \ + template(com_oracle_max_cri_ci_CiTargetMethod, "com/oracle/max/cri/ci/CiTargetMethod") \ + template(com_oracle_max_cri_ci_CiTargetMethod_Site, "com/oracle/max/cri/ci/CiTargetMethod$Site") \ + template(com_oracle_max_cri_ci_CiTargetMethod_Call, "com/oracle/max/cri/ci/CiTargetMethod$Call") \ + template(com_oracle_max_cri_ci_CiTargetMethod_DataPatch, "com/oracle/max/cri/ci/CiTargetMethod$DataPatch") \ + template(com_oracle_max_cri_ci_CiTargetMethod_Safepoint, "com/oracle/max/cri/ci/CiTargetMethod$Safepoint") \ + 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_max_graal_graph_BitMap, "com/oracle/max/graal/graph/BitMap") \ + template(com_oracle_max_cri_ci_CiBitMap, "com/oracle/max/cri/ci/CiBitMap") \ + 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_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/ci/CiConstant") \ + 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_CiRuntimeCall, "com/oracle/max/cri/ci/CiRuntimeCall") \ template(startCompiler_name, "startCompiler") \ template(bootstrap_name, "bootstrap") \ template(shutdownCompiler_name, "shutdownCompiler") \ template(compileMethod_name, "compileMethod") \ - template(compileMethod_signature, "(Lcom/oracle/max/graal/hotspot/ri/HotSpotMethodResolved;IZ)V") \ + template(compileMethod_signature, "(Lcom/oracle/max/graal/hotspot/ri/HotSpotMethodResolved;IZ)V") \ 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/max/cri/ri/RiMethod;") \ + template(createRiMethodResolved_signature, "(JLjava/lang/String;)Lcom/oracle/max/cri/ri/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(createRiSignature_name, "createRiSignature") \ - template(createRiSignature_signature, "(Ljava/lang/String;)Lcom/oracle/max/cri/ri/RiSignature;") \ + template(createRiSignature_signature, "(Ljava/lang/String;)Lcom/oracle/max/cri/ri/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(createRiType_name, "createRiType") \ - template(createRiType_signature, "(JLjava/lang/String;)Lcom/oracle/max/cri/ri/RiType;") \ + template(createRiType_signature, "(JLjava/lang/String;)Lcom/oracle/max/cri/ri/RiType;") \ template(createRiTypePrimitive_name, "createRiTypePrimitive") \ - template(createRiTypePrimitive_signature, "(I)Lcom/oracle/max/cri/ri/RiType;") \ + template(createRiTypePrimitive_signature, "(I)Lcom/oracle/max/cri/ri/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/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/ci/CiKind;J)Lcom/oracle/max/cri/ci/CiConstant;") \ template(createCiConstantFloat_name, "createCiConstantFloat") \ - template(createCiConstantFloat_signature, "(F)Lcom/oracle/max/cri/ci/CiConstant;") \ + template(createCiConstantFloat_signature, "(F)Lcom/oracle/max/cri/ci/CiConstant;") \ template(createCiConstantDouble_name, "createCiConstantDouble") \ - template(createCiConstantDouble_signature, "(D)Lcom/oracle/max/cri/ci/CiConstant;") \ + template(createCiConstantDouble_signature, "(D)Lcom/oracle/max/cri/ci/CiConstant;") \ 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/ci/CiConstant;") \ template(getVMExits_name, "getVMExits") \ - template(getVMExits_signature, "()Lcom/oracle/max/graal/hotspot/bridge/VMToCompiler;") \ + template(getVMExits_signature, "()Lcom/oracle/max/graal/hotspot/bridge/VMToCompiler;") \ template(getInstance_name, "getInstance") \ template(initialize_name, "initialize") \ template(getInstance_signature, "()Lcom/oracle/max/graal/hotspot/Compiler;") \
--- a/src/share/vm/graal/graalCodeInstaller.cpp Wed Jan 04 21:13:44 2012 +0100 +++ b/src/share/vm/graal/graalCodeInstaller.cpp Wed Jan 04 22:08:17 2012 +0100 @@ -463,7 +463,7 @@ record_scope(pc_offset, caller_pos, objects); } oop frame = NULL; - if (code_pos->klass()->klass_part()->name() == vmSymbols::com_sun_cri_ci_CiFrame()) { + if (code_pos->klass()->klass_part()->name() == vmSymbols::com_oracle_max_cri_ci_CiFrame()) { frame = code_pos; } @@ -622,7 +622,7 @@ if (target_klass->is_subclass_of(SystemDictionary::Long_klass())) { global_stub = target; - } else if (target_klass->name() == vmSymbols::com_sun_cri_ci_CiRuntimeCall()) { + } else if (target_klass->name() == vmSymbols::com_oracle_max_cri_ci_CiRuntimeCall()) { runtime_call = target; } else { hotspot_method = target;
--- a/src/share/vm/graal/graalCompilerToVM.cpp Wed Jan 04 21:13:44 2012 +0100 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Wed Jan 04 22:08:17 2012 +0100 @@ -45,7 +45,7 @@ } // public byte[] RiMethod_code(HotSpotResolvedMethod method); -JNIEXPORT jbyteArray JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1code(JNIEnv *env, jobject, jobject hotspot_method) { +JNIEXPORT jbyteArray JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1code(JNIEnv *env, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_code"); methodHandle method = getMethodFromHotSpotMethod(hotspot_method); int code_size = method->code_size(); @@ -55,7 +55,7 @@ } // public String RiMethod_signature(HotSpotResolvedMethod method); -JNIEXPORT jstring JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1signature(JNIEnv *env, jobject, jobject hotspot_method) { +JNIEXPORT jstring JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1signature(JNIEnv *env, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_signature"); VM_ENTRY_MARK methodOop method = getMethodFromHotSpotMethod(hotspot_method); @@ -64,7 +64,7 @@ } // public RiExceptionHandler[] RiMethod_exceptionHandlers(long vmId); -JNIEXPORT jobjectArray JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1exceptionHandlers(JNIEnv *, jobject, jobject hotspot_method) { +JNIEXPORT jobjectArray JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1exceptionHandlers(JNIEnv *, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_exceptionHandlers"); VM_ENTRY_MARK ResourceMark rm; @@ -105,7 +105,7 @@ } // public boolean RiMethod_hasBalancedMonitors(long vmId); -JNIEXPORT jint JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1hasBalancedMonitors(JNIEnv *, jobject, jobject hotspot_method) { +JNIEXPORT jint JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1hasBalancedMonitors(JNIEnv *, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_hasBalancedMonitors"); VM_ENTRY_MARK; @@ -133,7 +133,7 @@ } // public RiMethod getRiMethod(java.lang.reflect.Method reflectionMethod); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getRiMethod(JNIEnv *, jobject, jobject reflection_method_handle) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_getRiMethod(JNIEnv *, jobject, jobject reflection_method_handle) { TRACE_graal_3("CompilerToVM::getRiMethod"); VM_ENTRY_MARK; oop reflection_method = JNIHandles::resolve(reflection_method_handle); @@ -146,7 +146,7 @@ } // public boolean RiMethod_uniqueConcreteMethod(long vmId); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1uniqueConcreteMethod(JNIEnv *, jobject, jobject hotspot_method) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1uniqueConcreteMethod(JNIEnv *, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_uniqueConcreteMethod"); VM_ENTRY_MARK; @@ -177,13 +177,13 @@ } // public native int RiMethod_invocationCount(long vmId); -JNIEXPORT jint JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1invocationCount(JNIEnv *, jobject, jobject hotspot_method) { +JNIEXPORT jint JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1invocationCount(JNIEnv *, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_invocationCount"); return getMethodFromHotSpotMethod(hotspot_method)->invocation_count(); } // public native int RiMethod_exceptionProbability(long vmId, int bci); -JNIEXPORT jint JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_2exceptionProbability(JNIEnv *, jobject, jobject hotspot_method, jint bci) { +JNIEXPORT jint JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_2exceptionProbability(JNIEnv *, jobject, jobject hotspot_method, jint bci) { TRACE_graal_3("CompilerToVM::RiMethod_exceptionProbability"); VM_ENTRY_MARK; ResourceMark rm; @@ -231,7 +231,7 @@ } // public native RiTypeProfile RiMethod_typeProfile(long vmId, int bci); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_2typeProfile(JNIEnv *, jobject, jobject hotspot_method, jint bci) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_2typeProfile(JNIEnv *, jobject, jobject hotspot_method, jint bci) { TRACE_graal_3("CompilerToVM::RiMethod_typeProfile"); VM_ENTRY_MARK; Handle obj; @@ -290,7 +290,7 @@ return JNIHandles::make_local(obj()); } -JNIEXPORT jdouble JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_2branchProbability(JNIEnv *, jobject, jobject hotspot_method, jint bci) { +JNIEXPORT jdouble JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_2branchProbability(JNIEnv *, jobject, jobject hotspot_method, jint bci) { TRACE_graal_3("CompilerToVM::RiMethod_typeProfile"); ResourceMark rm; methodHandle method = getMethodFromHotSpotMethod(hotspot_method); @@ -323,7 +323,7 @@ } } -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_2switchProbability(JNIEnv *, jobject, jobject hotspot_method, jint bci) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_2switchProbability(JNIEnv *, jobject, jobject hotspot_method, jint bci) { TRACE_graal_3("CompilerToVM::RiMethod_typeProfile"); VM_ENTRY_MARK; ResourceMark rm; @@ -362,13 +362,13 @@ } // public native boolean RiMethod_hasCompiledCode(HotSpotMethodResolved method); -JNIEXPORT jboolean JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1hasCompiledCode(JNIEnv *, jobject, jobject hotspot_method) { +JNIEXPORT jboolean JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1hasCompiledCode(JNIEnv *, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_hasCompiledCode"); return getMethodFromHotSpotMethod(hotspot_method)->has_compiled_code(); } // public RiType RiSignature_lookupType(String returnType, HotSpotTypeResolved accessingClass); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiSignature_1lookupType(JNIEnv *env, jobject, jstring jname, jobject accessingClass) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiSignature_1lookupType(JNIEnv *env, jobject, jstring jname, jobject accessingClass) { TRACE_graal_3("CompilerToVM::RiSignature_lookupType"); VM_ENTRY_MARK; ResourceMark rm; @@ -422,7 +422,7 @@ } // public Object RiConstantPool_lookupConstant(HotSpotTypeResolved type, int cpi); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupConstant(JNIEnv *env, jobject, jobject type, jint index) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupConstant(JNIEnv *env, jobject, jobject type, jint index) { TRACE_graal_3("CompilerToVM::RiConstantPool_lookupConstant"); VM_ENTRY_MARK; @@ -467,7 +467,7 @@ } // public RiMethod RiConstantPool_lookupMethod(long vmId, int cpi, byte byteCode); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupMethod(JNIEnv *env, jobject, jobject type, jint index, jbyte byteCode) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupMethod(JNIEnv *env, jobject, jobject type, jint index, jbyte byteCode) { TRACE_graal_3("CompilerToVM::RiConstantPool_lookupMethod"); VM_ENTRY_MARK; index = GraalCompiler::to_cp_index_u2(index); @@ -490,7 +490,7 @@ } // public RiType RiConstantPool_lookupType(long vmId, int cpi); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupType(JNIEnv *env, jobject, jobject type, jint index) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupType(JNIEnv *env, jobject, jobject type, jint index) { TRACE_graal_3("CompilerToVM::RiConstantPool_lookupType"); VM_ENTRY_MARK; @@ -500,7 +500,7 @@ } // public void RiConstantPool_loadReferencedType(long vmId, int cpi); -JNIEXPORT void JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1loadReferencedType(JNIEnv *env, jobject, jobject type, jint index, jbyte op) { +JNIEXPORT void JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1loadReferencedType(JNIEnv *env, jobject, jobject type, jint index, jbyte op) { TRACE_graal_3("CompilerToVM::RiConstantPool_loadReferencedType"); VM_ENTRY_MARK; @@ -524,7 +524,7 @@ } // public RiField RiConstantPool_lookupField(long vmId, int cpi); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupField(JNIEnv *env, jobject, jobject constantPoolHolder, jint index, jbyte byteCode) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupField(JNIEnv *env, jobject, jobject constantPoolHolder, jint index, jbyte byteCode) { TRACE_graal_3("CompilerToVM::RiConstantPool_lookupField"); VM_ENTRY_MARK; ResourceMark rm; @@ -633,7 +633,7 @@ } // public RiMethod RiType_resolveMethodImpl(HotSpotTypeResolved klass, String name, String signature); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_3resolveMethodImpl(JNIEnv *, jobject, jobject resolved_type, jstring name, jstring signature) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_3resolveMethodImpl(JNIEnv *, jobject, jobject resolved_type, jstring name, jstring signature) { TRACE_graal_3("CompilerToVM::RiType_resolveMethodImpl"); VM_ENTRY_MARK; @@ -654,7 +654,7 @@ } // public boolean RiType_isSubtypeOf(HotSpotTypeResolved klass, RiType other); -JNIEXPORT jboolean JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_2isSubtypeOf(JNIEnv *, jobject, jobject klass, jobject jother) { +JNIEXPORT jboolean JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_2isSubtypeOf(JNIEnv *, jobject, jobject klass, jobject jother) { TRACE_graal_3("CompilerToVM::RiType_isSubtypeOf"); oop other = JNIHandles::resolve(jother); assert(other->is_a(HotSpotTypeResolved::klass()), "resolved hotspot type expected"); @@ -672,7 +672,7 @@ } // public RiType RiType_componentType(HotSpotResolvedType klass); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1componentType(JNIEnv *, jobject, jobject klass) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_1componentType(JNIEnv *, jobject, jobject klass) { TRACE_graal_3("CompilerToVM::RiType_componentType"); VM_ENTRY_MARK; KlassHandle array_klass = java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(klass)); @@ -688,7 +688,7 @@ } // public RiType RiType_superType(HotSpotResolvedType klass); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1superType(JNIEnv *, jobject, jobject klass) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_1superType(JNIEnv *, jobject, jobject klass) { TRACE_graal_3("CompilerToVM::RiType_superType"); VM_ENTRY_MARK; KlassHandle klass_handle(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(klass))); @@ -709,7 +709,7 @@ } // public RiType RiType_uniqueConcreteSubtype(HotSpotResolvedType klass); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1uniqueConcreteSubtype(JNIEnv *, jobject, jobject klass) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_1uniqueConcreteSubtype(JNIEnv *, jobject, jobject klass) { TRACE_graal_3("CompilerToVM::RiType_uniqueConcreteSubtype"); VM_ENTRY_MARK; KlassHandle klass_handle(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(klass))); @@ -721,7 +721,7 @@ } // public bool RiType_isInitialized(HotSpotResolvedType klass); -JNIEXPORT jboolean JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1isInitialized(JNIEnv *, jobject, jobject hotspot_klass) { +JNIEXPORT jboolean JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_1isInitialized(JNIEnv *, jobject, jobject hotspot_klass) { TRACE_graal_3("CompilerToVM::RiType_isInitialized"); klassOop klass = java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(hotspot_klass)); assert(klass != NULL, "method must not be called for primitive types"); @@ -729,7 +729,7 @@ } // public RiType RiType_arrayOf(HotSpotTypeResolved klass); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1arrayOf(JNIEnv *, jobject, jobject klass) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_1arrayOf(JNIEnv *, jobject, jobject klass) { TRACE_graal_3("CompilerToVM::RiType_arrayOf"); VM_ENTRY_MARK; @@ -741,7 +741,7 @@ } // public RiResolvedField[] RiType_fields(HotSpotTypeResolved klass); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1fields(JNIEnv *, jobject, jobject klass) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_1fields(JNIEnv *, jobject, jobject klass) { TRACE_graal_3("CompilerToVM::RiType_fields"); VM_ENTRY_MARK; ResourceMark rm; @@ -775,7 +775,7 @@ } // public RiType getPrimitiveArrayType(CiKind kind); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getPrimitiveArrayType(JNIEnv *env, jobject, jobject kind) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_getPrimitiveArrayType(JNIEnv *env, jobject, jobject kind) { TRACE_graal_3("CompilerToVM::getPrimitiveArrayType"); VM_ENTRY_MARK; BasicType type = GraalCompiler::kindToBasicType(CiKind::typeChar(kind)); @@ -785,7 +785,7 @@ } // public long getMaxCallTargetOffset(CiRuntimeCall rtcall); -JNIEXPORT jlong JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getMaxCallTargetOffset(JNIEnv *env, jobject, jobject rtcall) { +JNIEXPORT jlong JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_getMaxCallTargetOffset(JNIEnv *env, jobject, jobject rtcall) { TRACE_graal_3("CompilerToVM::getMaxCallTargetOffset"); VM_ENTRY_MARK; oop call = JNIHandles::resolve(rtcall); @@ -799,7 +799,7 @@ } // public RiType getType(Class<?> javaClass); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getType(JNIEnv *env, jobject, jobject javaClass) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_getType(JNIEnv *env, jobject, jobject javaClass) { TRACE_graal_3("CompilerToVM::getType"); VM_ENTRY_MARK; oop javaClassOop = JNIHandles::resolve(javaClass); @@ -845,7 +845,7 @@ int basicTypeCount = sizeof(basicTypes) / sizeof(BasicType); // public HotSpotVMConfig getConfiguration(); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getConfiguration(JNIEnv *env, jobject) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_getConfiguration(JNIEnv *env, jobject) { jclass klass = env->FindClass("com/oracle/max/graal/hotspot/HotSpotVMConfig"); assert(klass != NULL, "HotSpot vm config class not found"); jobject config = env->AllocObject(klass); @@ -937,7 +937,7 @@ } // public HotSpotCompiledMethod installMethod(HotSpotTargetMethod targetMethod, boolean installCode); -JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_installMethod(JNIEnv *jniEnv, jobject, jobject targetMethod, jboolean install_code) { +JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_installMethod(JNIEnv *jniEnv, jobject, jobject targetMethod, jboolean install_code) { VM_ENTRY_MARK; ResourceMark rm; HandleMark hm; @@ -962,7 +962,7 @@ } // public long installStub(HotSpotTargetMethod targetMethod, String name); -JNIEXPORT jlong JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_installStub(JNIEnv *jniEnv, jobject, jobject targetMethod) { +JNIEXPORT jlong JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_installStub(JNIEnv *jniEnv, jobject, jobject targetMethod) { VM_ENTRY_MARK; ResourceMark rm; HandleMark hm; @@ -977,7 +977,7 @@ #define CC (char*) /*cast a literal from (const char*)*/ -#define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_##f)) +#define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_##f)) #define PROXY "J" #define TYPE "Lcom/oracle/max/cri/ri/RiType;"
--- a/src/share/vm/graal/graalJavaAccess.hpp Wed Jan 04 21:13:44 2012 +0100 +++ b/src/share/vm/graal/graalJavaAccess.hpp Wed Jan 04 22:08:17 2012 +0100 @@ -61,7 +61,7 @@ start_class(HotSpotMethodResolved) \ oop_field(HotSpotMethodResolved, compiler, "Lcom/oracle/max/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/max/cri/ri/RiResolvedType;") \ oop_field(HotSpotMethodResolved, javaMirror, "Ljava/lang/Object;") \ int_field(HotSpotMethodResolved, codeSize) \ int_field(HotSpotMethodResolved, accessFlags) \ @@ -72,19 +72,19 @@ 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/ci/CiConstant;") \ int_field(HotSpotField, offset) \ int_field(HotSpotField, accessFlags) \ end_class \ start_class(HotSpotCompiledMethod) \ long_field(HotSpotCompiledMethod, nmethod) \ - oop_field(HotSpotCompiledMethod, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ + oop_field(HotSpotCompiledMethod, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ end_class \ start_class(HotSpotTargetMethod) \ - oop_field(HotSpotTargetMethod, targetMethod, "Lcom/oracle/max/cri/ci/CiTargetMethod;") \ + oop_field(HotSpotTargetMethod, targetMethod, "Lcom/oracle/max/cri/ci/CiTargetMethod;") \ oop_field(HotSpotTargetMethod, method, "Lcom/oracle/max/graal/hotspot/ri/HotSpotMethodResolved;") \ oop_field(HotSpotTargetMethod, name, "Ljava/lang/String;") \ - oop_field(HotSpotTargetMethod, sites, "[Lcom/oracle/max/cri/ci/CiTargetMethod$Site;") \ + oop_field(HotSpotTargetMethod, sites, "[Lcom/oracle/max/cri/ci/CiTargetMethod$Site;") \ oop_field(HotSpotTargetMethod, exceptionHandlers, "[Lcom/oracle/max/cri/ci/CiTargetMethod$ExceptionHandler;") \ end_class \ start_class(HotSpotExceptionHandler) \ @@ -92,40 +92,40 @@ 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/max/cri/ri/RiType;") \ end_class \ start_class(CiTargetMethod) \ int_field(CiTargetMethod, frameSize) \ int_field(CiTargetMethod, customStackAreaOffset) \ oop_field(CiTargetMethod, targetCode, "[B") \ - oop_field(CiTargetMethod, assumptions, "Lcom/oracle/max/cri/ci/CiAssumptions;") \ + oop_field(CiTargetMethod, assumptions, "Lcom/oracle/max/cri/ci/CiAssumptions;") \ int_field(CiTargetMethod, targetCodeSize) \ end_class \ start_class(CiAssumptions) \ - oop_field(CiAssumptions, list, "[Lcom/oracle/max/cri/ci/CiAssumptions$Assumption;") \ + oop_field(CiAssumptions, list, "[Lcom/oracle/max/cri/ci/CiAssumptions$Assumption;") \ 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/max/cri/ri/RiResolvedType;") \ + oop_field(CiAssumptions_ConcreteSubtype, subtype, "Lcom/oracle/max/cri/ri/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/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;") \ end_class \ start_class(CiTargetMethod_Site) \ int_field(CiTargetMethod_Site, pcOffset) \ end_class \ start_class(CiTargetMethod_Call) \ oop_field(CiTargetMethod_Call, target, "Ljava/lang/Object;") \ - oop_field(CiTargetMethod_Call, debugInfo, "Lcom/oracle/max/cri/ci/CiDebugInfo;") \ + 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/ci/CiConstant;") \ int_field(CiTargetMethod_DataPatch, alignment) \ end_class \ start_class(CiTargetMethod_Safepoint) \ - oop_field(CiTargetMethod_Safepoint, debugInfo, "Lcom/oracle/max/cri/ci/CiDebugInfo;") \ + oop_field(CiTargetMethod_Safepoint, debugInfo, "Lcom/oracle/max/cri/ci/CiDebugInfo;") \ end_class \ start_class(CiTargetMethod_ExceptionHandler) \ int_field(CiTargetMethod_ExceptionHandler, handlerPos) \ @@ -139,9 +139,9 @@ oop_field(CiTargetMethod_Mark, references, "[Lcom/oracle/max/cri/ci/CiTargetMethod$Mark;") \ 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, 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;") \ end_class \ start_class(GraalBitMap) \ int_field(GraalBitMap, size) \ @@ -149,30 +149,30 @@ 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/max/cri/ci/CiValue;") \ int_field(CiFrame, numLocals) \ int_field(CiFrame, numStack) \ int_field(CiFrame, numLocks) \ boolean_field(CiFrame, rethrowException) \ 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, caller, "Lcom/oracle/max/cri/ci/CiCodePos;") \ + oop_field(CiCodePos, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ 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/ci/CiKind;") \ 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/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;"); \ end_class \ start_class(CiRuntimeCall) \ static_oop_field(CiRuntimeCall, UnwindException, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ @@ -200,11 +200,11 @@ start_class(RiMethod) \ end_class \ start_class(CiValue) \ - oop_field(CiValue, kind, "Lcom/oracle/max/cri/ci/CiKind;") \ - static_oop_field(CiValue, IllegalValue, "Lcom/oracle/max/cri/ci/CiValue;"); \ + oop_field(CiValue, kind, "Lcom/oracle/max/cri/ci/CiKind;") \ + static_oop_field(CiValue, IllegalValue, "Lcom/oracle/max/cri/ci/CiValue;"); \ end_class \ start_class(CiRegisterValue) \ - oop_field(CiRegisterValue, reg, "Lcom/oracle/max/cri/ci/CiRegister;") \ + oop_field(CiRegisterValue, reg, "Lcom/oracle/max/cri/ci/CiRegister;") \ end_class \ start_class(CiRegister) \ int_field(CiRegister, number) \ @@ -215,19 +215,19 @@ 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/max/cri/ri/RiType;") \ + oop_field(CiVirtualObject, values, "[Lcom/oracle/max/cri/ci/CiValue;") \ 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/max/cri/ci/CiValue;") \ + oop_field(CiMonitorValue, lockData, "Lcom/oracle/max/cri/ci/CiValue;") \ boolean_field(CiMonitorValue, eliminated) \ end_class \ start_class(RiTypeProfile) \ int_field(RiTypeProfile, count) \ int_field(RiTypeProfile, morphism) \ oop_field(RiTypeProfile, probabilities, "[F") \ - oop_field(RiTypeProfile, types, "[Lcom/oracle/max/cri/ri/RiResolvedType;") \ + oop_field(RiTypeProfile, types, "[Lcom/oracle/max/cri/ri/RiResolvedType;") \ end_class \ /* end*/
--- a/src/share/vm/graal/graalVMToCompiler.cpp Wed Jan 04 21:13:44 2012 +0100 +++ b/src/share/vm/graal/graalVMToCompiler.cpp Wed Jan 04 22:08:17 2012 +0100 @@ -31,7 +31,7 @@ KlassHandle VMToCompiler::vmExitsKlass() { if (JNIHandles::resolve(_vmExitsPermKlass) == NULL) { - klassOop result = SystemDictionary::resolve_or_null(vmSymbols::com_sun_hotspot_graal_VMExits(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + klassOop result = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_graal_hotspot_bridge_VMToCompiler(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(result, "Couldn't find class com.oracle.max.graal.hotspot.bridge.VMToCompiler"); _vmExitsPermKlass = JNIHandles::make_global(result); } @@ -40,7 +40,7 @@ Handle VMToCompiler::compilerInstance() { if (JNIHandles::resolve(_compilerPermObject) == NULL) { - KlassHandle compilerImplKlass = SystemDictionary::resolve_or_null(vmSymbols::com_sun_hotspot_graal_CompilerImpl(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + KlassHandle compilerImplKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_graal_hotspot_CompilerImpl(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(compilerImplKlass(), "Couldn't find class com.sun.hotspot.graal.CompilerImpl"); JavaValue result(T_OBJECT); @@ -53,7 +53,7 @@ Handle VMToCompiler::instance() { if (JNIHandles::resolve(_vmExitsPermObject) == NULL) { - KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_sun_hotspot_graal_Compiler(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_graal_hotspot_Compiler(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(compilerKlass(), "Couldn't find class com.sun.hotspot.graal.Compiler"); JavaValue result(T_OBJECT); @@ -67,7 +67,7 @@ } void VMToCompiler::initializeCompiler() { - KlassHandle compilerImplKlass = SystemDictionary::resolve_or_null(vmSymbols::com_sun_hotspot_graal_CompilerImpl(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + KlassHandle compilerImplKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_graal_hotspot_CompilerImpl(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(compilerImplKlass(), "Couldn't find class com.sun.hotspot.graal.CompilerImpl"); JavaValue result(T_VOID); @@ -77,7 +77,7 @@ jboolean VMToCompiler::setOption(Handle option) { assert(!option.is_null(), ""); - KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_sun_hotspot_graal_HotSpotOptions(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_graal_hotspot_HotSpotOptions(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(compilerKlass(), "Couldn't find class com.sun.hotspot.graal.HotSpotOptions"); Thread* THREAD = Thread::current(); @@ -88,7 +88,7 @@ } void VMToCompiler::setDefaultOptions() { - KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_sun_hotspot_graal_HotSpotOptions(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_graal_hotspot_HotSpotOptions(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(compilerKlass(), "Couldn't find class com.sun.hotspot.graal.HotSpotOptions"); Thread* THREAD = Thread::current(); @@ -271,7 +271,7 @@ oop VMToCompiler::createCiConstantObject(Handle object, TRAPS) { JavaValue result(T_OBJECT); JavaCallArguments args; - KlassHandle klass = SystemDictionary::resolve_or_null(vmSymbols::com_sun_cri_ci_CiConstant(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + KlassHandle klass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_cri_ci_CiConstant(), SystemDictionary::java_system_loader(), NULL, Thread::current()); JavaCalls::call_static(&result, klass(), vmSymbols::forObject_name(), vmSymbols::createCiConstantObject_signature(), object, THREAD); check_pending_exception("Error while calling CiConstant.forObject"); return (oop) result.get_jobject();