Mercurial > hg > truffle
changeset 3028:1305cb3809c1
Performed folder and class name changes in native code.
| author | Thomas Wuerthinger <thomas@wuerthinger.net> |
|---|---|
| date | Mon, 20 Jun 2011 14:07:11 +0200 |
| parents | d5e9eff55773 |
| children | 0ef7a8219b45 |
| files | src/share/vm/classfile/systemDictionary.hpp src/share/vm/classfile/vmSymbols.hpp src/share/vm/graal/graalCodeInstaller.cpp src/share/vm/graal/graalJavaAccess.hpp src/share/vm/runtime/arguments.cpp |
| diffstat | 5 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.hpp Mon Jun 20 13:54:44 2011 +0200 +++ b/src/share/vm/classfile/systemDictionary.hpp Mon Jun 20 14:07:11 2011 +0200 @@ -200,7 +200,7 @@ 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(CiBitMap_klass, com_sun_cri_ci_CiBitMap, Opt) \ + template(GraalBitMap_klass, com_oracle_max_graal_graph_BitMap, 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) \
--- a/src/share/vm/classfile/vmSymbols.hpp Mon Jun 20 13:54:44 2011 +0200 +++ b/src/share/vm/classfile/vmSymbols.hpp Mon Jun 20 14:07:11 2011 +0200 @@ -286,7 +286,7 @@ template(com_sun_cri_ci_CiTargetMethod_Safepoint, "com/sun/cri/ci/CiTargetMethod$Safepoint") \ template(com_sun_cri_ci_CiTargetMethod_ExceptionHandler, "com/sun/cri/ci/CiTargetMethod$ExceptionHandler") \ template(com_sun_cri_ci_CiTargetMethod_Mark, "com/sun/cri/ci/CiTargetMethod$Mark") \ - template(com_sun_cri_ci_CiBitMap, "com/sun/cri/ci/CiBitMap") \ + template(com_oracle_max_graal_graph_BitMap, "com/oracle/max/graal/graph/BitMap") \ template(com_sun_cri_ci_CiDebugInfo, "com/sun/cri/ci/CiDebugInfo") \ template(com_sun_cri_ci_CiFrame, "com/sun/cri/ci/CiFrame") \ template(com_sun_cri_ci_CiValue, "com/sun/cri/ci/CiValue") \
--- a/src/share/vm/graal/graalCodeInstaller.cpp Mon Jun 20 13:54:44 2011 +0200 +++ b/src/share/vm/graal/graalCodeInstaller.cpp Mon Jun 20 14:07:11 2011 +0200 @@ -55,11 +55,11 @@ static bool is_bit_set(oop bit_map, int i) { const int MapWordBits = 64; if (i < MapWordBits) { - jlong low = CiBitMap::low(bit_map); + jlong low = GraalBitMap::low(bit_map); return (low & (1LL << i)) != 0; } else { jint extra_idx = (i - MapWordBits) / MapWordBits; - arrayOop extra = (arrayOop) CiBitMap::extra(bit_map); + arrayOop extra = (arrayOop) GraalBitMap::extra(bit_map); assert(extra_idx >= 0 && extra_idx < extra->length(), "unexpected index"); jlong word = ((jlong*) extra->base(T_LONG))[extra_idx]; return (word & (1LL << (i % MapWordBits))) != 0; @@ -73,7 +73,7 @@ oop frame_map = (oop) CiDebugInfo::frameRefMap(debug_info); if (register_map != NULL) { - assert(CiBitMap::size(register_map) == (unsigned) NUM_CPU_REGS, "unexpected register_map length"); + assert(BitMap::size(register_map) == (unsigned) NUM_CPU_REGS, "unexpected register_map length"); for (jint i = 0; i < NUM_CPU_REGS; i++) { bool is_oop = is_bit_set(register_map, i); VMReg reg = get_hotspot_reg(i); @@ -87,7 +87,7 @@ } if (frame_size > 0) { - assert(CiBitMap::size(frame_map) == frame_size / HeapWordSize, "unexpected frame_map length"); + assert(BitMap::size(frame_map) == frame_size / HeapWordSize, "unexpected frame_map length"); for (jint i = 0; i < frame_size / HeapWordSize; i++) { bool is_oop = is_bit_set(frame_map, i); @@ -100,7 +100,7 @@ } } } else { - assert(frame_map == NULL || CiBitMap::size(frame_map) == 0, "cannot have frame_map for frames with size 0"); + assert(frame_map == NULL || BitMap::size(frame_map) == 0, "cannot have frame_map for frames with size 0"); } return map;
--- a/src/share/vm/graal/graalJavaAccess.hpp Mon Jun 20 13:54:44 2011 +0200 +++ b/src/share/vm/graal/graalJavaAccess.hpp Mon Jun 20 14:07:11 2011 +0200 @@ -140,13 +140,13 @@ end_class \ start_class(CiDebugInfo) \ oop_field(CiDebugInfo, codePos, "Lcom/sun/cri/ci/CiCodePos;") \ - oop_field(CiDebugInfo, registerRefMap, "Lcom/sun/cri/ci/CiBitMap;") \ - oop_field(CiDebugInfo, frameRefMap, "Lcom/sun/cri/ci/CiBitMap;") \ + oop_field(CiDebugInfo, registerRefMap, "Lcom/oracle/max/graal/graph/BitMap;") \ + oop_field(CiDebugInfo, frameRefMap, "Lcom/oracle/max/graal/graph/BitMap;") \ end_class \ - start_class(CiBitMap) \ - int_field(CiBitMap, size) \ - long_field(CiBitMap, low) \ - oop_field(CiBitMap, extra, "[J") \ + start_class(GraalBitMap) \ + int_field(GraalBitMap, size) \ + long_field(GraalBitMap, low) \ + oop_field(GraalBitMap, extra, "[J") \ end_class \ start_class(CiFrame) \ oop_field(CiFrame, values, "[Lcom/sun/cri/ci/CiValue;") \ @@ -217,7 +217,7 @@ /* end*/ #define START_CLASS(name) \ - class name : AllStatic { \ +class name : AllStatic { \ private: \ friend class GraalCompiler; \ static void check(oop obj) { assert(obj != NULL, "NULL field access of class " #name); assert(obj->is_a(SystemDictionary::name##_klass()), "wrong class, " #name " expected"); } \
--- a/src/share/vm/runtime/arguments.cpp Mon Jun 20 13:54:44 2011 +0200 +++ b/src/share/vm/runtime/arguments.cpp Mon Jun 20 14:07:11 2011 +0200 @@ -2690,12 +2690,12 @@ scp_p->add_prefix(temp); sprintf(temp, "%s/com.oracle.max.asm/bin", maxine_dir); scp_p->add_prefix(temp); + sprintf(temp, "%s/com.oracle.max.graal.graph/bin", maxine_dir); + scp_p->add_prefix(temp); sprintf(temp, "%s/graal/com.oracle.max.graal.compiler/bin", graal_dir); scp_p->add_prefix(temp); sprintf(temp, "%s/graal/com.oracle.max.graal.runtime/bin", graal_dir); scp_p->add_prefix(temp); - sprintf(temp, "%s/graal/com.oracle.max.graal.graph/bin", graal_dir); - scp_p->add_prefix(temp); sprintf(temp, "%s/graal/com.oracle.max.graal.graphviz/bin", graal_dir); scp_p->add_prefix(temp); *scp_assembly_required_p = true;