Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp	Mon Apr 01 14:52:38 2019 +0800
     1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp	Tue Apr 02 19:01:15 2019 +0800
     1.3 @@ -86,7 +86,7 @@
     1.4    void inline_write_ref_field_gc(void* field, oop new_val) {
     1.5      jbyte* byte = byte_for(field);
     1.6      *byte = youngergen_card;
     1.7 -#ifdef MIPS
     1.8 +#if defined MIPS && !defined ZERO
     1.9        if (UseSyncLevel >= 2000) OrderAccess::fence();
    1.10  #endif
    1.11    }

     2.1 --- a/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp	Mon Apr 01 14:52:38 2019 +0800
     2.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp	Tue Apr 02 19:01:15 2019 +0800
     2.3 @@ -105,7 +105,7 @@
     2.4      assert(end_bit_ok, "concurrency problem");
     2.5      DEBUG_ONLY(Atomic::inc_ptr(&mark_bitmap_count));
     2.6      DEBUG_ONLY(Atomic::add_ptr(size, &mark_bitmap_size));
     2.7 -#ifdef MIPS
     2.8 +#if defined MIPS && !defined ZERO
     2.9      if (UseSyncLevel >= 2000) OrderAccess::fence();
    2.10  #endif
    2.11      return true;

     3.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp	Mon Apr 01 14:52:38 2019 +0800
     3.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp	Tue Apr 02 19:01:15 2019 +0800
     3.3 @@ -33,7 +33,7 @@
     3.4    ObjArrayTask task(obj, index);
     3.5    assert(task.is_valid(), "bad ObjArrayTask");
     3.6    _objarray_stack.push(task);
     3.7 -#ifdef MIPS
     3.8 +#if defined MIPS && !defined ZERO
     3.9    if (UseSyncLevel >= 2000) OrderAccess::fence();
    3.10  #endif
    3.11  }
    3.12 @@ -47,7 +47,7 @@
    3.13    assert(region_ptr->_pushed++ == 0, "should only be pushed once");
    3.14  #endif
    3.15    region_stack()->push(index);
    3.16 -#ifdef MIPS
    3.17 +#if defined MIPS && !defined ZERO
    3.18    if (UseSyncLevel >= 2000) OrderAccess::fence();
    3.19  #endif
    3.20  }

     4.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Mon Apr 01 14:52:38 2019 +0800
     4.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Tue Apr 02 19:01:15 2019 +0800
     4.3 @@ -496,7 +496,7 @@
     4.4    if (beg_region == end_region) {
     4.5      // All in one region.
     4.6      _region_data[beg_region].add_live_obj(len);
     4.7 -#ifdef MIPS
     4.8 +#if defined MIPS && !defined ZERO
     4.9      if (UseSyncLevel >= 2000) OrderAccess::fence();
    4.10  #endif
    4.11      return;
    4.12 @@ -517,7 +517,7 @@
    4.13    const size_t end_ofs = region_offset(addr + len - 1);
    4.14    _region_data[end_region].set_partial_obj_size(end_ofs + 1);
    4.15    _region_data[end_region].set_partial_obj_addr(addr);
    4.16 -#ifdef MIPS
    4.17 +#if defined MIPS && !defined ZERO
    4.18      if (UseSyncLevel >= 2000) OrderAccess::fence();
    4.19  #endif
    4.20  }
    4.21 @@ -3238,7 +3238,7 @@
    4.22      if (new_block != cur_block) {
    4.23        cur_block = new_block;
    4.24        sd.block(cur_block)->set_offset(bitmap->bits_to_words(live_bits));
    4.25 -#ifdef MIPS
    4.26 +#if defined MIPS && !defined ZERO
    4.27        if (UseSyncLevel >= 2000) OrderAccess::fence();
    4.28  #endif
    4.29      }

     5.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp	Mon Apr 01 14:52:38 2019 +0800
     5.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp	Tue Apr 02 19:01:15 2019 +0800
     5.3 @@ -1329,7 +1329,7 @@
     5.4    const int obj_size = obj->size();
     5.5    if (mark_bitmap()->mark_obj(obj, obj_size)) {
     5.6      _summary_data.add_obj(obj, obj_size);
     5.7 -#ifdef MIPS
     5.8 +#if defined MIPS && !defined ZERO
     5.9      if (UseSyncLevel >= 2000) OrderAccess::fence();
    5.10  #endif
    5.11      return true;
    5.12 @@ -1366,7 +1366,7 @@
    5.13      oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
    5.14      if (mark_bitmap()->is_unmarked(obj) && mark_obj(obj)) {
    5.15        cm->push(obj);
    5.16 -#ifdef MIPS
    5.17 +#if defined MIPS && !defined ZERO
    5.18        if (UseSyncLevel >= 2000) OrderAccess::fence();
    5.19  #endif
    5.20      }

     6.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp	Mon Apr 01 14:52:38 2019 +0800
     6.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp	Tue Apr 02 19:01:15 2019 +0800
     6.3 @@ -75,7 +75,7 @@
     6.4  
     6.5    oop new_obj = NULL;
     6.6  
     6.7 -#ifdef MIPS
     6.8 +#if defined MIPS && !defined ZERO
     6.9    if (UseSyncLevel >= 2000) OrderAccess::fence();
    6.10  #endif
    6.11  
    6.12 @@ -84,7 +84,7 @@
    6.13    // at any time. Do not use oop methods for accessing the mark!
    6.14    markOop test_mark = o->mark();
    6.15  
    6.16 -#ifdef MIPS
    6.17 +#if defined MIPS && !defined ZERO
    6.18    if (UseSyncLevel >= 2000) OrderAccess::fence();
    6.19  #endif
    6.20  
    6.21 @@ -121,7 +121,7 @@
    6.22            }
    6.23          }
    6.24  
    6.25 -#ifdef MIPS
    6.26 +#if defined MIPS && !defined ZERO
    6.27          if (UseSyncLevel >= 2000) OrderAccess::fence();
    6.28  #endif
    6.29        }
    6.30 @@ -181,7 +181,7 @@
    6.31  
    6.32      // Copy obj
    6.33      Copy::aligned_disjoint_words((HeapWord*)o, (HeapWord*)new_obj, new_obj_size);
    6.34 -#ifdef MIPS
    6.35 +#if defined MIPS && !defined ZERO
    6.36      if (UseSyncLevel >= 2000) OrderAccess::fence();
    6.37  #endif
    6.38  
    6.39 @@ -232,7 +232,7 @@
    6.40        new_obj = o->forwardee();
    6.41      }
    6.42  
    6.43 -#ifdef MIPS
    6.44 +#if defined MIPS && !defined ZERO
    6.45      if (UseSyncLevel >= 2000) OrderAccess::fence();
    6.46  #endif
    6.47    } else {

     7.1 --- a/src/share/vm/memory/barrierSet.hpp	Mon Apr 01 14:52:38 2019 +0800
     7.2 +++ b/src/share/vm/memory/barrierSet.hpp	Tue Apr 02 19:01:15 2019 +0800
     7.3 @@ -97,12 +97,12 @@
     7.4    virtual void write_ref_field_pre_work(     void* field, oop new_val) { guarantee(false, "Not needed"); };
     7.5  protected:
     7.6    virtual void write_ref_field_pre_work(      oop* field, oop new_val) {
     7.7 -#ifdef MIPS
     7.8 +#if defined MIPS && !defined ZERO
     7.9        if (UseSyncLevel >= 2000) OrderAccess::fence();
    7.10  #endif
    7.11    };
    7.12    virtual void write_ref_field_pre_work(narrowOop* field, oop new_val) {
    7.13 -#ifdef MIPS
    7.14 +#if defined MIPS && !defined ZERO
    7.15        if (UseSyncLevel >= 2000) OrderAccess::fence();
    7.16  #endif
    7.17    };
    7.18 @@ -142,13 +142,13 @@
    7.19    // Below length is the # array elements being written
    7.20    virtual void write_ref_array_pre(oop* dst, int length,
    7.21                                     bool dest_uninitialized = false) {
    7.22 -#ifdef MIPS
    7.23 +#if defined MIPS && !defined ZERO
    7.24        if (UseSyncLevel >= 2000) OrderAccess::fence();
    7.25  #endif
    7.26    }
    7.27    virtual void write_ref_array_pre(narrowOop* dst, int length,
    7.28                                     bool dest_uninitialized = false) {
    7.29 -#ifdef MIPS
    7.30 +#if defined MIPS && !defined ZERO
    7.31        if (UseSyncLevel >= 2000) OrderAccess::fence();
    7.32  #endif
    7.33  }

     8.1 --- a/src/share/vm/memory/cardTableModRefBS.hpp	Mon Apr 01 14:52:38 2019 +0800
     8.2 +++ b/src/share/vm/memory/cardTableModRefBS.hpp	Tue Apr 02 19:01:15 2019 +0800
     8.3 @@ -316,7 +316,7 @@
     8.4  
     8.5    inline void inline_write_ref_array(MemRegion mr) {
     8.6      dirty_MemRegion(mr);
     8.7 -#ifdef MIPS
     8.8 +#if defined MIPS && !defined ZERO
     8.9      if (UseSyncLevel >= 2000) OrderAccess::fence();
    8.10  #endif
    8.11    }
    8.12 @@ -333,7 +333,7 @@
    8.13    // *** Card-table-barrier-specific things.
    8.14  
    8.15    template <class T> inline void inline_write_ref_field_pre(T* field, oop newVal) {
    8.16 -#ifdef MIPS
    8.17 +#if defined MIPS && !defined ZERO
    8.18      if (UseSyncLevel >= 2000) OrderAccess::fence();
    8.19  #endif
    8.20    }
    8.21 @@ -346,7 +346,7 @@
    8.22      } else {
    8.23        *byte = dirty_card;
    8.24      }
    8.25 -#ifdef MIPS
    8.26 +#if defined MIPS && !defined ZERO
    8.27      if (UseSyncLevel >= 2000) OrderAccess::fence();
    8.28  #endif
    8.29    }

     9.1 --- a/src/share/vm/memory/cardTableRS.cpp	Mon Apr 01 14:52:38 2019 +0800
     9.2 +++ b/src/share/vm/memory/cardTableRS.cpp	Tue Apr 02 19:01:15 2019 +0800
     9.3 @@ -252,7 +252,7 @@
     9.4  // cur_youngergen_and_prev_nonclean_card ==> no change.
     9.5  void CardTableRS::write_ref_field_gc_par(void* field, oop new_val) {
     9.6    jbyte* entry = ct_bs()->byte_for(field);
     9.7 -#ifdef MIPS
     9.8 +#if defined MIPS && !defined ZERO
     9.9    if (UseSyncLevel >= 2000) OrderAccess::fence();
    9.10  #endif
    9.11    do {
    9.12 @@ -270,9 +270,9 @@
    9.13        jbyte res = Atomic::cmpxchg(new_val, entry, entry_val);
    9.14        // Did the CAS succeed?
    9.15        if (res == entry_val) {
    9.16 -      #ifdef MIPS
    9.17 +#if defined MIPS && !defined ZERO
    9.18           if (UseSyncLevel >= 2000) OrderAccess::fence();
    9.19 -      #endif
    9.20 +#endif
    9.21           return;
    9.22        }
    9.23        // Otherwise, retry, to see the new value.

    10.1 --- a/src/share/vm/memory/cardTableRS.hpp	Mon Apr 01 14:52:38 2019 +0800
    10.2 +++ b/src/share/vm/memory/cardTableRS.hpp	Tue Apr 02 19:01:15 2019 +0800
    10.3 @@ -121,11 +121,11 @@
    10.4  
    10.5    void inline_write_ref_field_gc(void* field, oop new_val) {
    10.6      jbyte* byte = _ct_bs->byte_for(field);
    10.7 -#ifdef MIPS
    10.8 +#if defined MIPS && !defined ZERO
    10.9      if (UseSyncLevel >= 2000) OrderAccess::fence();
   10.10  #endif
   10.11     *byte = youngergen_card;
   10.12 -#ifdef MIPS
   10.13 +#if defined MIPS && !defined ZERO
   10.14     if (UseSyncLevel >= 2000) OrderAccess::fence();
   10.15  #endif
   10.16  

    11.1 --- a/src/share/vm/oops/klass.hpp	Mon Apr 01 14:52:38 2019 +0800
    11.2 +++ b/src/share/vm/oops/klass.hpp	Tue Apr 02 19:01:15 2019 +0800
    11.3 @@ -292,13 +292,13 @@
    11.4    // The CT and MUT bits saves this information for the individual Klasses.
    11.5    void record_modified_oops()            {
    11.6      _modified_oops = 1;
    11.7 -#ifdef MIPS
    11.8 +#if defined MIPS && !defined ZERO
    11.9      if (UseSyncLevel >= 2000) OrderAccess::fence();
   11.10  #endif
   11.11    }
   11.12    void clear_modified_oops()             {
   11.13      _modified_oops = 0;
   11.14 -#ifdef MIPS
   11.15 +#if defined MIPS && !defined ZERO
   11.16      if (UseSyncLevel >= 2000) OrderAccess::fence();
   11.17  #endif
   11.18    }

    12.1 --- a/src/share/vm/oops/oop.hpp	Mon Apr 01 14:52:38 2019 +0800
    12.2 +++ b/src/share/vm/oops/oop.hpp	Tue Apr 02 19:01:15 2019 +0800
    12.3 @@ -73,7 +73,7 @@
    12.4    markOop* mark_addr() const    { return (markOop*) &_mark; }
    12.5  
    12.6    void set_mark(volatile markOop m)      {
    12.7 -#ifdef MIPS
    12.8 +#if defined MIPS && !defined ZERO
    12.9      if (UseSyncLevel >= 2000) release_set_mark(m);
   12.10      else
   12.11  #endif