Mercurial > hg > truffle

comparison src/share/vm/compiler/oopMap.cpp @ 21559:be896a1983c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Thu, 28 May 2015 15:36:48 +0200
parents 534f0dde2810
children
comparison
equal deleted inserted replaced
21558:d563baeca9df 21559:be896a1983c0
315 static DoNothingClosure do_nothing; 315 static DoNothingClosure do_nothing;
316 316
317 static void add_derived_oop(oop* base, oop* derived) { 317 static void add_derived_oop(oop* base, oop* derived) {
318 #ifndef TIERED 318 #ifndef TIERED
319 COMPILER1_PRESENT(ShouldNotReachHere();) 319 COMPILER1_PRESENT(ShouldNotReachHere();)
320 COMPILERGRAAL_PRESENT(ShouldNotReachHere();) 320 COMPILERJVMCI_PRESENT(ShouldNotReachHere();)
321 #endif // TIERED 321 #endif // TIERED
322 #ifdef COMPILER2 322 #ifdef COMPILER2
323 DerivedPointerTable::add(derived, base); 323 DerivedPointerTable::add(derived, base);
324 #endif // COMPILER2 324 #endif // COMPILER2
325 } 325 }
377 { 377 {
378 OopMapStream oms(map,OopMapValue::derived_oop_value); 378 OopMapStream oms(map,OopMapValue::derived_oop_value);
379 if (!oms.is_done()) { 379 if (!oms.is_done()) {
380 #ifndef TIERED 380 #ifndef TIERED
381 COMPILER1_PRESENT(ShouldNotReachHere();) 381 COMPILER1_PRESENT(ShouldNotReachHere();)
382 COMPILERGRAAL_PRESENT(ShouldNotReachHere();) 382 COMPILERJVMCI_PRESENT(ShouldNotReachHere();)
383 #endif // !TIERED 383 #endif // !TIERED
384 // Protect the operation on the derived pointers. This 384 // Protect the operation on the derived pointers. This
385 // protects the addition of derived pointers to the shared 385 // protects the addition of derived pointers to the shared
386 // derived pointer table in DerivedPointerTable::add(). 386 // derived pointer table in DerivedPointerTable::add().
387 MutexLockerEx x(DerivedPointerTableGC_lock, Mutex::_no_safepoint_check_flag); 387 MutexLockerEx x(DerivedPointerTableGC_lock, Mutex::_no_safepoint_check_flag);
491 DEBUG_ONLY(nof_callee++;) 491 DEBUG_ONLY(nof_callee++;)
492 } 492 }
493 493
494 // Check that runtime stubs save all callee-saved registers 494 // Check that runtime stubs save all callee-saved registers
495 #ifdef COMPILER2 495 #ifdef COMPILER2
496 assert(cb->is_compiled_by_c1() || cb->is_compiled_by_graal() || !cb->is_runtime_stub() || 496 assert(cb->is_compiled_by_c1() || cb->is_compiled_by_jvmci() || !cb->is_runtime_stub() ||
497 (nof_callee >= SAVED_ON_ENTRY_REG_COUNT || nof_callee >= C_SAVED_ON_ENTRY_REG_COUNT), 497 (nof_callee >= SAVED_ON_ENTRY_REG_COUNT || nof_callee >= C_SAVED_ON_ENTRY_REG_COUNT),
498 "must save all"); 498 "must save all");
499 #endif // COMPILER2 499 #endif // COMPILER2
500 } 500 }
501 501
505 #ifndef PRODUCT 505 #ifndef PRODUCT
506 506
507 bool OopMap::has_derived_pointer() const { 507 bool OopMap::has_derived_pointer() const {
508 #ifndef TIERED 508 #ifndef TIERED
509 COMPILER1_PRESENT(return false); 509 COMPILER1_PRESENT(return false);
510 COMPILERGRAAL_PRESENT(return false); 510 COMPILERJVMCI_PRESENT(return false);
511 #endif // !TIERED 511 #endif // !TIERED
512 #ifdef COMPILER2 512 #ifdef COMPILER2
513 OopMapStream oms((OopMap*)this,OopMapValue::derived_oop_value); 513 OopMapStream oms((OopMap*)this,OopMapValue::derived_oop_value);
514 return oms.is_done(); 514 return oms.is_done();
515 #else 515 #else