comparison src/share/vm/graal/graalCompiler.hpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents fd71ca8c5f88
children a0f4001cf53c
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
68 oop dump_deopted_leaf_graphs(TRAPS); 68 oop dump_deopted_leaf_graphs(TRAPS);
69 69
70 // Print compilation timers and statistics 70 // Print compilation timers and statistics
71 virtual void print_timers(); 71 virtual void print_timers();
72 72
73 static Handle get_JavaTypeFromSignature(constantPoolHandle cp, int index, KlassHandle accessor, TRAPS); 73 static Handle get_JavaTypeFromSignature(Symbol* signature, KlassHandle accessor, TRAPS);
74 static Handle get_JavaType(constantPoolHandle cp, int index, KlassHandle accessor, TRAPS); 74 static Handle get_JavaType(constantPoolHandle cp, int index, KlassHandle accessor, TRAPS);
75 static Handle get_JavaType(Symbol* klass_name, TRAPS); 75 static Handle get_JavaType(Symbol* klass_name, TRAPS);
76 static Handle get_JavaTypeFromClass(Handle javaClassHandle, TRAPS); 76 static Handle get_JavaTypeFromClass(Handle javaClassHandle, TRAPS);
77 static Handle get_JavaType(KlassHandle klass, TRAPS); 77 static Handle get_JavaType(KlassHandle klass, TRAPS);
78 static Handle get_JavaField(int offset, int flags, Symbol* field_name, Handle field_holder, Handle field_type, TRAPS); 78 static Handle get_JavaField(int offset, int flags, Symbol* field_name, Handle field_holder, Handle field_type, TRAPS);
79 79
80 static Handle createHotSpotResolvedJavaType(KlassHandle klass, Handle name, TRAPS); 80 static Handle createHotSpotResolvedJavaType(KlassHandle klass, Handle name, TRAPS);
81 static Handle createHotSpotResolvedJavaMethod(methodHandle method, TRAPS); 81 static Handle createHotSpotResolvedJavaType(methodHandle method, TRAPS);
82 static Handle createHotSpotMethodData(methodDataHandle method_data, TRAPS);
83 82
84 void exit(); 83 void exit();
85 84
86 static BasicType kindToBasicType(jchar ch); 85 static BasicType kindToBasicType(jchar ch);
87 86
88 static int to_cp_index_u2(int index) { 87 static int to_cp_index_u2(int index) {
89 // Tag. 88 // Tag.
90 return to_index_u2(index) + constantPoolOopDesc::CPCACHE_INDEX_TAG; 89 return to_index_u2(index) + ConstantPool::CPCACHE_INDEX_TAG;
91 } 90 }
92 91
93 static int to_index_u2(int index) { 92 static int to_index_u2(int index) {
94 // Swap. 93 // Swap.
95 return ((index & 0xFF) << 8) | (index >> 8); 94 return ((index & 0xFF) << 8) | (index >> 8);