comparison src/share/vm/graal/graalCompiler.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 5a95c784febf
comparison
equal deleted inserted replaced
7125:1baf7f1e3f23 7126:ce248dc0a656
68 env->RegisterNatives(klass, CompilerToVM_methods, CompilerToVM_methods_count()); 68 env->RegisterNatives(klass, CompilerToVM_methods, CompilerToVM_methods_count());
69 69
70 ResourceMark rm; 70 ResourceMark rm;
71 HandleMark hm; 71 HandleMark hm;
72 { 72 {
73 VM_ENTRY_MARK; 73 GRAAL_VM_ENTRY_MARK;
74 check_pending_exception("Could not register natives"); 74 check_pending_exception("Could not register natives");
75 } 75 }
76 76
77 graal_compute_offsets(); 77 graal_compute_offsets();
78 78
79 { 79 {
80 VM_ENTRY_MARK; 80 GRAAL_VM_ENTRY_MARK;
81 HandleMark hm; 81 HandleMark hm;
82 VMToCompiler::setDefaultOptions(); 82 VMToCompiler::setDefaultOptions();
83 for (int i = 0; i < Arguments::num_graal_args(); ++i) { 83 for (int i = 0; i < Arguments::num_graal_args(); ++i) {
84 const char* arg = Arguments::graal_args_array()[i]; 84 const char* arg = Arguments::graal_args_array()[i];
85 Handle option = java_lang_String::create_from_str(arg, THREAD); 85 Handle option = java_lang_String::create_from_str(arg, THREAD);
149 THREAD->set_buffer_blob(blob); 149 THREAD->set_buffer_blob(blob);
150 } 150 }
151 } 151 }
152 152
153 void GraalCompiler::compile_method(methodHandle method, int entry_bci, jboolean blocking) { 153 void GraalCompiler::compile_method(methodHandle method, int entry_bci, jboolean blocking) {
154 EXCEPTION_CONTEXT 154 GRAAL_EXCEPTION_CONTEXT
155 if (!_initialized) { 155 if (!_initialized) {
156 method->clear_queued_for_compilation(); 156 method->clear_queued_for_compilation();
157 method->invocation_counter()->reset(); 157 method->invocation_counter()->reset();
158 method->backedge_counter()->reset(); 158 method->backedge_counter()->reset();
159 return; 159 return;