src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp

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

*** 103,113 ****
        if (UseCompressedOops) {
          if (dst->is_address() && !dst->is_stack() && (dst->type() == T_OBJECT || dst->type() == T_ARRAY)) return false;
          if (src->is_address() && !src->is_stack() && (src->type() == T_OBJECT || src->type() == T_ARRAY)) return false;
        }
  
!       if (UseCompressedKlassPointers) {
          if (src->is_address() && !src->is_stack() && src->type() == T_ADDRESS &&
              src->as_address_ptr()->disp() == oopDesc::klass_offset_in_bytes()) return false;
        }
  
        if (dst->is_register()) {
--- 103,113 ----
        if (UseCompressedOops) {
          if (dst->is_address() && !dst->is_stack() && (dst->type() == T_OBJECT || dst->type() == T_ARRAY)) return false;
          if (src->is_address() && !src->is_stack() && (src->type() == T_OBJECT || src->type() == T_ARRAY)) return false;
        }
  
!       if (UseCompressedClassPointers) {
          if (src->is_address() && !src->is_stack() && src->type() == T_ADDRESS &&
              src->as_address_ptr()->disp() == oopDesc::klass_offset_in_bytes()) return false;
        }
  
        if (dst->is_register()) {
*** 961,971 ****
          }
          break;
        case T_METADATA:  __ ld_ptr(base, offset, to_reg->as_register()); break;
        case T_ADDRESS:
  #ifdef _LP64
!         if (offset == oopDesc::klass_offset_in_bytes() && UseCompressedKlassPointers) {
            __ lduw(base, offset, to_reg->as_register());
            __ decode_klass_not_null(to_reg->as_register());
          } else
  #endif
          {
--- 961,971 ----
          }
          break;
        case T_METADATA:  __ ld_ptr(base, offset, to_reg->as_register()); break;
        case T_ADDRESS:
  #ifdef _LP64
!         if (offset == oopDesc::klass_offset_in_bytes() && UseCompressedClassPointers) {
            __ lduw(base, offset, to_reg->as_register());
            __ decode_klass_not_null(to_reg->as_register());
          } else
  #endif
          {
*** 2206,2216 ****
  
    if (flags & LIR_OpArrayCopy::type_check) {
      // We don't know the array types are compatible
      if (basic_type != T_OBJECT) {
        // Simple test for basic type arrays
!       if (UseCompressedKlassPointers) {
          // We don't need decode because we just need to compare
          __ lduw(src, oopDesc::klass_offset_in_bytes(), tmp);
          __ lduw(dst, oopDesc::klass_offset_in_bytes(), tmp2);
          __ cmp(tmp, tmp2);
          __ br(Assembler::notEqual, false, Assembler::pt, *stub->entry());
--- 2206,2216 ----
  
    if (flags & LIR_OpArrayCopy::type_check) {
      // We don't know the array types are compatible
      if (basic_type != T_OBJECT) {
        // Simple test for basic type arrays
!       if (UseCompressedClassPointers) {
          // We don't need decode because we just need to compare
          __ lduw(src, oopDesc::klass_offset_in_bytes(), tmp);
          __ lduw(dst, oopDesc::klass_offset_in_bytes(), tmp2);
          __ cmp(tmp, tmp2);
          __ br(Assembler::notEqual, false, Assembler::pt, *stub->entry());
*** 2340,2350 ****
      // dst type is exactly the expected type and the src type is a
      // subtype which we can't check or src is the same array as dst
      // but not necessarily exactly of type default_type.
      Label known_ok, halt;
      metadata2reg(op->expected_type()->constant_encoding(), tmp);
!     if (UseCompressedKlassPointers) {
        // tmp holds the default type. It currently comes uncompressed after the
        // load of a constant, so encode it.
        __ encode_klass_not_null(tmp);
        // load the raw value of the dst klass, since we will be comparing
        // uncompressed values directly.
--- 2340,2350 ----
      // dst type is exactly the expected type and the src type is a
      // subtype which we can't check or src is the same array as dst
      // but not necessarily exactly of type default_type.
      Label known_ok, halt;
      metadata2reg(op->expected_type()->constant_encoding(), tmp);
!     if (UseCompressedClassPointers) {
        // tmp holds the default type. It currently comes uncompressed after the
        // load of a constant, so encode it.
        __ encode_klass_not_null(tmp);
        // load the raw value of the dst klass, since we will be comparing
        // uncompressed values directly.