Mercurial > hg > truffle

comparison src/cpu/x86/vm/templateInterpreter_x86_64.cpp @ 10641:4b88e5c93f04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor C++ compilation fixes.
author Christian Haeubl <haeubl@ssw.jku.at>
date Mon, 08 Jul 2013 17:14:25 +0200
parents 88672775a26c
children e7d07c9bb779
comparison
equal deleted inserted replaced
10640:88672775a26c 10641:4b88e5c93f04
302 302
303 303
304 // Helpers for commoning out cases in the various type of method entries. 304 // Helpers for commoning out cases in the various type of method entries.
305 // 305 //
306 306
307 #ifdef GRAAL 307 #ifdef GRAALVM
308 308
309 void graal_initialize_time(JavaThread* thread) { 309 void graal_initialize_time(JavaThread* thread) {
310 assert(ProfileInterpreter, "must be profiling interpreter"); 310 assert(ProfileInterpreter, "must be profiling interpreter");
311 frame fr = thread->last_frame(); 311 frame fr = thread->last_frame();
312 assert(fr.is_interpreted_frame(), "must come from interpreter"); 312 assert(fr.is_interpreted_frame(), "must come from interpreter");
313 assert(fr.interpreter_frame_method()->method_counters() != NULL, "need to initialize method counters"); 313 assert(fr.interpreter_frame_method()->method_counters() != NULL, "need to initialize method counters");
314 fr.interpreter_frame_method()->method_counters()->set_graal_invocation_time(os::javaTimeNanos()); 314 fr.interpreter_frame_method()->method_counters()->set_graal_invocation_time(os::javaTimeNanos());
315 } 315 }
316 316
317 #endif // GRAAL 317 #endif // GRAALVM
318 318
319 // increment invocation count & check for overflow 319 // increment invocation count & check for overflow
320 // 320 //
321 // Note: checking for negative value instead of overflow 321 // Note: checking for negative value instead of overflow
322 // so we have a 'sticky' overflow test 322 // so we have a 'sticky' overflow test
367 if (ProfileInterpreter) { 367 if (ProfileInterpreter) {
368 __ incrementl(Address(rax, 368 __ incrementl(Address(rax,
369 MethodCounters::interpreter_invocation_counter_offset())); 369 MethodCounters::interpreter_invocation_counter_offset()));
370 } 370 }
371 371
372 #ifdef GRAAL 372 #ifdef GRAALVM
373 if (CompilationPolicyChoice == 4) { 373 if (CompilationPolicyChoice == 4) {
374 Label not_zero; 374 Label not_zero;
375 __ testl(rcx, InvocationCounter::count_mask_value); 375 __ testl(rcx, InvocationCounter::count_mask_value);
376 __ jcc(Assembler::notZero, not_zero); 376 __ jcc(Assembler::notZero, not_zero);
377 377
389 __ stop("unexpected counter value in rcx"); 389 __ stop("unexpected counter value in rcx");
390 #endif 390 #endif
391 391
392 __ bind(not_zero); 392 __ bind(not_zero);
393 } 393 }
394 #endif // GRAAL 394 #endif // GRAALVM
395 395
396 // Update standard invocation counters 396 // Update standard invocation counters
397 __ movl(rcx, invocation_counter); 397 __ movl(rcx, invocation_counter);
398 __ incrementl(rcx, InvocationCounter::count_increment); 398 __ incrementl(rcx, InvocationCounter::count_increment);
399 __ movl(invocation_counter, rcx); // save invocation count 399 __ movl(invocation_counter, rcx); // save invocation count