src/cpu/x86/vm/x86_64.ad

rev 5190 : 8015107: NPG: Use consistent naming for metaspace concepts

*** 1389,1399 ****
  
  //=============================================================================
  #ifndef PRODUCT
  void MachUEPNode::format(PhaseRegAlloc* ra_, outputStream* st) const
  {
!   if (UseCompressedKlassPointers) {
      st->print_cr("movl    rscratch1, [j_rarg0 + oopDesc::klass_offset_in_bytes()]\t# compressed klass");
      st->print_cr("\tdecode_klass_not_null rscratch1, rscratch1");
      st->print_cr("\tcmpq    rax, rscratch1\t # Inline cache check");
    } else {
      st->print_cr("\tcmpq    rax, [j_rarg0 + oopDesc::klass_offset_in_bytes()]\t"
--- 1389,1399 ----
  
  //=============================================================================
  #ifndef PRODUCT
  void MachUEPNode::format(PhaseRegAlloc* ra_, outputStream* st) const
  {
!   if (UseCompressedClassPointers) {
      st->print_cr("movl    rscratch1, [j_rarg0 + oopDesc::klass_offset_in_bytes()]\t# compressed klass");
      st->print_cr("\tdecode_klass_not_null rscratch1, rscratch1");
      st->print_cr("\tcmpq    rax, rscratch1\t # Inline cache check");
    } else {
      st->print_cr("\tcmpq    rax, [j_rarg0 + oopDesc::klass_offset_in_bytes()]\t"
*** 1406,1416 ****
  
  void MachUEPNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const
  {
    MacroAssembler masm(&cbuf);
    uint insts_size = cbuf.insts_size();
!   if (UseCompressedKlassPointers) {
      masm.load_klass(rscratch1, j_rarg0);
      masm.cmpptr(rax, rscratch1);
    } else {
      masm.cmpptr(rax, Address(j_rarg0, oopDesc::klass_offset_in_bytes()));
    }
--- 1406,1416 ----
  
  void MachUEPNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const
  {
    MacroAssembler masm(&cbuf);
    uint insts_size = cbuf.insts_size();
!   if (UseCompressedClassPointers) {
      masm.load_klass(rscratch1, j_rarg0);
      masm.cmpptr(rax, rscratch1);
    } else {
      masm.cmpptr(rax, Address(j_rarg0, oopDesc::klass_offset_in_bytes()));
    }
*** 1555,1565 ****
    assert(UseCompressedOops, "only for compressed oops code");
    return (LogMinObjAlignmentInBytes <= 3);
  }
  
  bool Matcher::narrow_klass_use_complex_address() {
!   assert(UseCompressedKlassPointers, "only for compressed klass code");
    return (LogKlassAlignmentInBytes <= 3);
  }
  
  // Is it better to copy float constants, or load them directly from
  // memory?  Intel can load a float constant from a direct address,
--- 1555,1565 ----
    assert(UseCompressedOops, "only for compressed oops code");
    return (LogMinObjAlignmentInBytes <= 3);
  }
  
  bool Matcher::narrow_klass_use_complex_address() {
!   assert(UseCompressedClassPointers, "only for compressed klass code");
    return (LogKlassAlignmentInBytes <= 3);
  }
  
  // Is it better to copy float constants, or load them directly from
  // memory?  Intel can load a float constant from a direct address,