src/cpu/sparc/vm/c1_Runtime1_sparc.cpp

rev 5363 : imported patch filtering.diff

*** 35,44 ****
--- 35,47 ----
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/signature.hpp"
  #include "runtime/vframeArray.hpp"
  #include "utilities/macros.hpp"
  #include "vmreg_sparc.inline.hpp"
+ #if INCLUDE_ALL_GCS
+ #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+ #endif
  
  // Implementation of StubAssembler
  
  int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry_point, int number_of_arguments) {
    // for sparc changing the number of arguments doesn't change
*** 910,920 ****
          Register cardtable = G5;
          Register tmp  = G1_scratch;
          Register tmp2 = G3_scratch;
          jbyte* byte_map_base = ((CardTableModRefBS*)bs)->byte_map_base;
  
!         Label not_already_dirty, restart, refill;
  
  #ifdef _LP64
          __ srlx(addr, CardTableModRefBS::card_shift, addr);
  #else
          __ srl(addr, CardTableModRefBS::card_shift, addr);
--- 913,923 ----
          Register cardtable = G5;
          Register tmp  = G1_scratch;
          Register tmp2 = G3_scratch;
          jbyte* byte_map_base = ((CardTableModRefBS*)bs)->byte_map_base;
  
!         Label not_already_dirty, restart, refill, young_card;
  
  #ifdef _LP64
          __ srlx(addr, CardTableModRefBS::card_shift, addr);
  #else
          __ srl(addr, CardTableModRefBS::card_shift, addr);
*** 922,934 ****
--- 925,943 ----
  
          AddressLiteral rs(byte_map_base);
          __ set(rs, cardtable);         // cardtable := <card table base>
          __ ldub(addr, cardtable, tmp); // tmp := [addr + cardtable]
  
+         __ cmp_and_br_short(tmp, G1SATBCardTableModRefBS::g1_young_card_val(), Assembler::equal, Assembler::pt, young_card);
+ 
+         __ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
+         __ ldub(addr, cardtable, tmp); // tmp := [addr + cardtable]
+ 
          assert(CardTableModRefBS::dirty_card_val() == 0, "otherwise check this code");
          __ cmp_and_br_short(tmp, G0, Assembler::notEqual, Assembler::pt, not_already_dirty);
  
+         __ bind(young_card);
          // We didn't take the branch, so we're already dirty: return.
          // Use return-from-leaf
          __ retl();
          __ delayed()->nop();