Mercurial > hg > truffle

comparison src/cpu/x86/vm/compiledIC_x86.cpp @ 10409:36bcc10e01c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge fixes
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 15:37:32 +0200
parents a6e09d6dd8e5
children 359f7e70ae7f
comparison
equal deleted inserted replaced
10408:836a62f43af9 10409:36bcc10e01c0
115 return 4; // 3 in emit_to_interp_stub + 1 in emit_call 115 return 4; // 3 in emit_to_interp_stub + 1 in emit_call
116 } 116 }
117 117
118 void CompiledStaticCall::set_to_interpreted(methodHandle callee, address entry) { 118 void CompiledStaticCall::set_to_interpreted(methodHandle callee, address entry) {
119 address stub = find_stub(); 119 address stub = find_stub();
120 #ifdef GRAAL
121 if (stub == NULL) {
122 set_destination_mt_safe(entry);
123 return;
124 }
125 #endif
120 guarantee(stub != NULL, "stub not found"); 126 guarantee(stub != NULL, "stub not found");
121 127
122 if (TraceICs) { 128 if (TraceICs) {
123 ResourceMark rm; 129 ResourceMark rm;
124 tty->print_cr("CompiledStaticCall@" INTPTR_FORMAT ": set_to_interpreted %s", 130 tty->print_cr("CompiledStaticCall@" INTPTR_FORMAT ": set_to_interpreted %s",
166 verify_alignment(); 172 verify_alignment();
167 } 173 }
168 174
169 // Verify stub. 175 // Verify stub.
170 address stub = find_stub(); 176 address stub = find_stub();
177 #ifndef GRAAL
171 assert(stub != NULL, "no stub found for static call"); 178 assert(stub != NULL, "no stub found for static call");
172 // Creation also verifies the object. 179 // Creation also verifies the object.
173 NativeMovConstReg* method_holder = nativeMovConstReg_at(stub); 180 NativeMovConstReg* method_holder = nativeMovConstReg_at(stub);
174 NativeJump* jump = nativeJump_at(method_holder->next_instruction_address()); 181 NativeJump* jump = nativeJump_at(method_holder->next_instruction_address());
182 #endif
175 183
176 // Verify state. 184 // Verify state.
177 assert(is_clean() || is_call_to_compiled() || is_call_to_interpreted(), "sanity check"); 185 assert(is_clean() || is_call_to_compiled() || is_call_to_interpreted(), "sanity check");
178 } 186 }
179 187