comparison src/share/vm/graal/graalEnv.cpp @ 7126:ce248dc0a656

removed all Graal modifications to ci and c1
author Doug Simon <doug.simon@oracle.com>
date Mon, 03 Dec 2012 17:54:05 +0100
parents 1baf7f1e3f23
children 5d0bb7d52783
comparison
equal deleted inserted replaced
7125:1baf7f1e3f23 7126:ce248dc0a656
68 // ------------------------------------------------------------------ 68 // ------------------------------------------------------------------
69 KlassHandle GraalEnv::get_klass_by_name_impl(KlassHandle& accessing_klass, 69 KlassHandle GraalEnv::get_klass_by_name_impl(KlassHandle& accessing_klass,
70 constantPoolHandle& cpool, 70 constantPoolHandle& cpool,
71 Symbol* sym, 71 Symbol* sym,
72 bool require_local) { 72 bool require_local) {
73 EXCEPTION_CONTEXT; 73 GRAAL_EXCEPTION_CONTEXT;
74 74
75 // Now we need to check the SystemDictionary 75 // Now we need to check the SystemDictionary
76 if (sym->byte_at(0) == 'L' && 76 if (sym->byte_at(0) == 'L' &&
77 sym->byte_at(sym->utf8_length()-1) == ';') { 77 sym->byte_at(sym->utf8_length()-1) == ';') {
78 // This is a name from a signature. Strip off the trimmings. 78 // This is a name from a signature. Strip off the trimmings.
160 // Implementation of get_klass_by_index. 160 // Implementation of get_klass_by_index.
161 KlassHandle GraalEnv::get_klass_by_index_impl(constantPoolHandle& cpool, 161 KlassHandle GraalEnv::get_klass_by_index_impl(constantPoolHandle& cpool,
162 int index, 162 int index,
163 bool& is_accessible, 163 bool& is_accessible,
164 KlassHandle& accessor) { 164 KlassHandle& accessor) {
165 EXCEPTION_CONTEXT; 165 GRAAL_EXCEPTION_CONTEXT;
166 KlassHandle klass (THREAD, ConstantPool::klass_at_if_loaded(cpool, index)); 166 KlassHandle klass (THREAD, ConstantPool::klass_at_if_loaded(cpool, index));
167 Symbol* klass_name = NULL; 167 Symbol* klass_name = NULL;
168 if (klass.is_null()) { 168 if (klass.is_null()) {
169 // The klass has not been inserted into the constant pool. 169 // The klass has not been inserted into the constant pool.
170 // Try to look it up by name. 170 // Try to look it up by name.
231 // 231 //
232 // Implementation note: the results of field lookups are cached 232 // Implementation note: the results of field lookups are cached
233 // in the accessor klass. 233 // in the accessor klass.
234 void GraalEnv::get_field_by_index_impl(instanceKlassHandle& klass, fieldDescriptor& field_desc, 234 void GraalEnv::get_field_by_index_impl(instanceKlassHandle& klass, fieldDescriptor& field_desc,
235 int index) { 235 int index) {
236 EXCEPTION_CONTEXT; 236 GRAAL_EXCEPTION_CONTEXT;
237 237
238 assert(klass->is_linked(), "must be linked before using its constant-pool"); 238 assert(klass->is_linked(), "must be linked before using its constant-pool");
239 239
240 constantPoolHandle cpool(thread, klass->constants()); 240 constantPoolHandle cpool(thread, klass->constants());
241 241
283 methodHandle GraalEnv::lookup_method(instanceKlassHandle& h_accessor, 283 methodHandle GraalEnv::lookup_method(instanceKlassHandle& h_accessor,
284 instanceKlassHandle& h_holder, 284 instanceKlassHandle& h_holder,
285 Symbol* name, 285 Symbol* name,
286 Symbol* sig, 286 Symbol* sig,
287 Bytecodes::Code bc) { 287 Bytecodes::Code bc) {
288 EXCEPTION_CONTEXT; 288 GRAAL_EXCEPTION_CONTEXT;
289 LinkResolver::check_klass_accessability(h_accessor, h_holder, KILL_COMPILE_ON_FATAL_(NULL)); 289 LinkResolver::check_klass_accessability(h_accessor, h_holder, KILL_COMPILE_ON_FATAL_(NULL));
290 methodHandle dest_method; 290 methodHandle dest_method;
291 switch (bc) { 291 switch (bc) {
292 case Bytecodes::_invokestatic: 292 case Bytecodes::_invokestatic:
293 dest_method = 293 dest_method =
419 CompileTask* task, 419 CompileTask* task,
420 int compile_id, 420 int compile_id,
421 bool has_debug_info, 421 bool has_debug_info,
422 bool has_unsafe_access, 422 bool has_unsafe_access,
423 Handle installed_code) { 423 Handle installed_code) {
424 EXCEPTION_CONTEXT; 424 GRAAL_EXCEPTION_CONTEXT;
425 NMethodSweeper::possibly_sweep(); 425 NMethodSweeper::possibly_sweep();
426 nm = NULL; 426 nm = NULL;
427 int comp_level = CompLevel_simple; 427 int comp_level = CompLevel_simple;
428 { 428 {
429 // To prevent compile queue updates. 429 // To prevent compile queue updates.