src/hotspot/cpu/x86/templateTable_x86.cpp

*** 2712,2722 ****
  // volatile-stores although it could just as well go before
  // volatile-loads.
  
  void TemplateTable::volatile_barrier(Assembler::Membar_mask_bits order_constraint ) {
    // Helper function to insert a is-volatile test and memory barrier
-   if(!os::is_MP()) return;    // Not needed on single CPU
    __ membar(order_constraint);
  }
  
  void TemplateTable::resolve_cache_and_index(int byte_no,
                                              Register Rcache,
--- 2712,2721 ----
*** 3491,3507 ****
  
    // access constant pool cache
    __ get_cache_and_index_at_bcp(rcx, rbx, 1);
    // replace index with field offset from cache entry
    // [jk] not needed currently
-   // if (os::is_MP()) {
    //   __ movl(rdx, Address(rcx, rbx, Address::times_8,
    //                        in_bytes(ConstantPoolCache::base_offset() +
    //                                 ConstantPoolCacheEntry::flags_offset())));
    //   __ shrl(rdx, ConstantPoolCacheEntry::is_volatile_shift);
    //   __ andl(rdx, 0x1);
!   // }
    __ movptr(rbx, Address(rcx, rbx, Address::times_ptr,
                           in_bytes(ConstantPoolCache::base_offset() +
                                    ConstantPoolCacheEntry::f2_offset())));
  
    // rax: object
--- 3490,3505 ----
  
    // access constant pool cache
    __ get_cache_and_index_at_bcp(rcx, rbx, 1);
    // replace index with field offset from cache entry
    // [jk] not needed currently
    // __ movl(rdx, Address(rcx, rbx, Address::times_8,
    //                      in_bytes(ConstantPoolCache::base_offset() +
    //                               ConstantPoolCacheEntry::flags_offset())));
    // __ shrl(rdx, ConstantPoolCacheEntry::is_volatile_shift);
    // __ andl(rdx, 0x1);
!   //
    __ movptr(rbx, Address(rcx, rbx, Address::times_ptr,
                           in_bytes(ConstantPoolCache::base_offset() +
                                    ConstantPoolCacheEntry::f2_offset())));
  
    // rax: object
*** 3542,3558 ****
      break;
    default:
      ShouldNotReachHere();
    }
    // [jk] not needed currently
-   // if (os::is_MP()) {
    //   Label notVolatile;
    //   __ testl(rdx, rdx);
    //   __ jcc(Assembler::zero, notVolatile);
    //   __ membar(Assembler::LoadLoad);
    //   __ bind(notVolatile);
-   //};
  }
  
  void TemplateTable::fast_xaccess(TosState state) {
    transition(vtos, state);
  
--- 3540,3554 ----
*** 3583,3603 ****
    default:
      ShouldNotReachHere();
    }
  
    // [jk] not needed currently
-   // if (os::is_MP()) {
    //   Label notVolatile;
    //   __ movl(rdx, Address(rcx, rdx, Address::times_8,
    //                        in_bytes(ConstantPoolCache::base_offset() +
    //                                 ConstantPoolCacheEntry::flags_offset())));
    //   __ shrl(rdx, ConstantPoolCacheEntry::is_volatile_shift);
    //   __ testl(rdx, 0x1);
    //   __ jcc(Assembler::zero, notVolatile);
    //   __ membar(Assembler::LoadLoad);
    //   __ bind(notVolatile);
-   // }
  
    __ decrement(rbcp);
  }
  
  //-----------------------------------------------------------------------------
--- 3579,3597 ----