src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp

*** 106,116 ****
    // save unlocked object header into the displaced header location on the stack
    st_ptr(Rmark, Rbox, BasicLock::displaced_header_offset_in_bytes());
  
    // compare object markOop with Rmark and if equal exchange Rscratch with object markOop
    assert(mark_addr.disp() == 0, "cas must take a zero displacement");
!   casx_under_lock(mark_addr.base(), Rmark, Rscratch, (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
    // if compare/exchange succeeded we found an unlocked object and we now have locked it
    // hence we are done
    cmp(Rmark, Rscratch);
    brx(Assembler::equal, false, Assembler::pt, done);
    delayed()->sub(Rscratch, SP, Rscratch);  //pull next instruction into delay slot
--- 106,116 ----
    // save unlocked object header into the displaced header location on the stack
    st_ptr(Rmark, Rbox, BasicLock::displaced_header_offset_in_bytes());
  
    // compare object markOop with Rmark and if equal exchange Rscratch with object markOop
    assert(mark_addr.disp() == 0, "cas must take a zero displacement");
!   cas_ptr(mark_addr.base(), Rmark, Rscratch);
    // if compare/exchange succeeded we found an unlocked object and we now have locked it
    // hence we are done
    cmp(Rmark, Rscratch);
    brx(Assembler::equal, false, Assembler::pt, done);
    delayed()->sub(Rscratch, SP, Rscratch);  //pull next instruction into delay slot
*** 147,157 ****
      verify_oop(Roop);
    }
  
    // Check if it is still a light weight lock, this is is true if we see
    // the stack address of the basicLock in the markOop of the object
!   casx_under_lock(mark_addr.base(), Rbox, Rmark, (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
    cmp(Rbox, Rmark);
  
    brx(Assembler::notEqual, false, Assembler::pn, slow_case);
    delayed()->nop();
    // Done
--- 147,157 ----
      verify_oop(Roop);
    }
  
    // Check if it is still a light weight lock, this is is true if we see
    // the stack address of the basicLock in the markOop of the object
!   cas_ptr(mark_addr.base(), Rbox, Rmark);
    cmp(Rbox, Rmark);
  
    brx(Assembler::notEqual, false, Assembler::pn, slow_case);
    delayed()->nop();
    // Done
*** 274,284 ****
      // use a loop
      add(obj, hdr_size_in_bytes, t1);               // compute address of first element
      sub(var_size_in_bytes, hdr_size_in_bytes, t2); // compute size of body
      initialize_body(t1, t2);
  #ifndef _LP64
!   } else if (VM_Version::v9_instructions_work() && con_size_in_bytes < threshold * 2) {
      // on v9 we can do double word stores to fill twice as much space.
      assert(hdr_size_in_bytes % 8 == 0, "double word aligned");
      assert(con_size_in_bytes % 8 == 0, "double word aligned");
      for (int i = hdr_size_in_bytes; i < con_size_in_bytes; i += 2 * HeapWordSize) stx(G0, obj, i);
  #endif
--- 274,284 ----
      // use a loop
      add(obj, hdr_size_in_bytes, t1);               // compute address of first element
      sub(var_size_in_bytes, hdr_size_in_bytes, t2); // compute size of body
      initialize_body(t1, t2);
  #ifndef _LP64
!   } else if (con_size_in_bytes < threshold * 2) {
      // on v9 we can do double word stores to fill twice as much space.
      assert(hdr_size_in_bytes % 8 == 0, "double word aligned");
      assert(con_size_in_bytes % 8 == 0, "double word aligned");
      for (int i = hdr_size_in_bytes; i < con_size_in_bytes; i += 2 * HeapWordSize) stx(G0, obj, i);
  #endif