src/hotspot/cpu/sparc/macroAssembler_sparc.cpp

*** 342,352 ****
    }
  }
  
  
  void MacroAssembler::restore_thread(const Register thread_cache) {
!   if (UseLoadBarrier) {
      AddressLiteral bad_mask((intptr_t)&ZAddressBadMask);
      load_ptr_contents(bad_mask, G6);
    }
    if (thread_cache->is_valid()) {
      assert(thread_cache->is_local() || thread_cache->is_in(), "bad volatile");
--- 342,352 ----
    }
  }
  
  
  void MacroAssembler::restore_thread(const Register thread_cache) {
!   if (UseZGC) {
      AddressLiteral bad_mask((intptr_t)&ZAddressBadMask);
      load_ptr_contents(bad_mask, G6);
    }
    if (thread_cache->is_valid()) {
      assert(thread_cache->is_local() || thread_cache->is_in(), "bad volatile");
*** 1280,1290 ****
  
    // mark lower end of faulting range
    assert(_verify_oop_implicit_branch[0] == NULL, "set once");
    _verify_oop_implicit_branch[0] = pc();
  
!   if (UseLoadBarrier) {
      // Check if mask is good
      AddressLiteral bad_mask((intptr_t)&ZAddressBadMask);
      load_ptr_contents(bad_mask, O2);
      btst(O0_obj, O2);
      brx(notZero, false, pn, null_or_fail);
--- 1280,1290 ----
  
    // mark lower end of faulting range
    assert(_verify_oop_implicit_branch[0] == NULL, "set once");
    _verify_oop_implicit_branch[0] = pc();
  
!   if (UseZGC) {
      // Check if mask is good
      AddressLiteral bad_mask((intptr_t)&ZAddressBadMask);
      load_ptr_contents(bad_mask, O2);
      btst(O0_obj, O2);
      brx(notZero, false, pn, null_or_fail);
*** 3927,3937 ****
  void MacroAssembler::load_heap_oop(const Address& s, Register d, LoadBarrierOn on) {
    if (UseCompressedOops) {
      lduw(s, d);
      decode_heap_oop(d);
    } else {
!     if (UseLoadBarrier) {
        load_barrier(d, s, on);
      } else {
        ld_ptr(s, d);
      }
    }
--- 3927,3937 ----
  void MacroAssembler::load_heap_oop(const Address& s, Register d, LoadBarrierOn on) {
    if (UseCompressedOops) {
      lduw(s, d);
      decode_heap_oop(d);
    } else {
!     if (UseZGC) {
        load_barrier(d, s, on);
      } else {
        ld_ptr(s, d);
      }
    }
*** 3941,3951 ****
  void MacroAssembler::load_heap_oop(Register s1, Register s2, Register d, LoadBarrierOn on) {
    if (UseCompressedOops) {
      lduw(s1, s2, d);
      decode_heap_oop(d, d);
    } else {
!     if (UseLoadBarrier) {
        load_barrier(d, Address(s1, s2), on);
      } else {
        ld_ptr(s1, s2, d);
      }
    }
--- 3941,3951 ----
  void MacroAssembler::load_heap_oop(Register s1, Register s2, Register d, LoadBarrierOn on) {
    if (UseCompressedOops) {
      lduw(s1, s2, d);
      decode_heap_oop(d, d);
    } else {
!     if (UseZGC) {
        load_barrier(d, Address(s1, s2), on);
      } else {
        ld_ptr(s1, s2, d);
      }
    }
*** 3954,3964 ****
  void MacroAssembler::load_heap_oop(Register s1, int simm13a, Register d, LoadBarrierOn on) {
    if (UseCompressedOops) {
      lduw(s1, simm13a, d);
      decode_heap_oop(d, d);
    } else {
!     if (UseLoadBarrier) {
        load_barrier(d, Address(s1, simm13a), on);
      } else {
        ld_ptr(s1, simm13a, d);
      }
    }
--- 3954,3964 ----
  void MacroAssembler::load_heap_oop(Register s1, int simm13a, Register d, LoadBarrierOn on) {
    if (UseCompressedOops) {
      lduw(s1, simm13a, d);
      decode_heap_oop(d, d);
    } else {
!     if (UseZGC) {
        load_barrier(d, Address(s1, simm13a), on);
      } else {
        ld_ptr(s1, simm13a, d);
      }
    }
*** 4189,4199 ****
      }
    }
  }
  
  void MacroAssembler::reinit_heapbase() {
!   if (UseLoadBarrier) {
      AddressLiteral bad_mask((intptr_t)&ZAddressBadMask);
      load_ptr_contents(bad_mask, G6);
    } else if (UseCompressedOops || UseCompressedClassPointers) {
      if (Universe::heap() != NULL) {
        set((intptr_t)Universe::narrow_ptrs_base(), G6_heapbase);
--- 4189,4199 ----
      }
    }
  }
  
  void MacroAssembler::reinit_heapbase() {
!   if (UseZGC) {
      AddressLiteral bad_mask((intptr_t)&ZAddressBadMask);
      load_ptr_contents(bad_mask, G6);
    } else if (UseCompressedOops || UseCompressedClassPointers) {
      if (Universe::heap() != NULL) {
        set((intptr_t)Universe::narrow_ptrs_base(), G6_heapbase);