# HG changeset patch
# User jingtian
# Date 1554202875 -28800
# Node ID 1556c6d89036f2797884c2adc4800a2af70abe5b
# Parent  117cf4377bf4b54e9a4af77209a97ae0fc3e417a
#8565 UseSyncLevel is not declared in zero/mips
Reviewed-by: aoqi

diff -r 117cf4377bf4 -r 1556c6d89036 src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp	Mon Apr 01 14:52:38 2019 +0800
+++ b/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp	Tue Apr 02 19:01:15 2019 +0800
@@ -86,7 +86,7 @@
   void inline_write_ref_field_gc(void* field, oop new_val) {
     jbyte* byte = byte_for(field);
     *byte = youngergen_card;
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
       if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
   }
diff -r 117cf4377bf4 -r 1556c6d89036 src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp	Mon Apr 01 14:52:38 2019 +0800
+++ b/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp	Tue Apr 02 19:01:15 2019 +0800
@@ -105,7 +105,7 @@
     assert(end_bit_ok, "concurrency problem");
     DEBUG_ONLY(Atomic::inc_ptr(&mark_bitmap_count));
     DEBUG_ONLY(Atomic::add_ptr(size, &mark_bitmap_size));
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
     return true;
diff -r 117cf4377bf4 -r 1556c6d89036 src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp	Mon Apr 01 14:52:38 2019 +0800
+++ b/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp	Tue Apr 02 19:01:15 2019 +0800
@@ -33,7 +33,7 @@
   ObjArrayTask task(obj, index);
   assert(task.is_valid(), "bad ObjArrayTask");
   _objarray_stack.push(task);
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
   if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
 }
@@ -47,7 +47,7 @@
   assert(region_ptr->_pushed++ == 0, "should only be pushed once");
 #endif
   region_stack()->push(index);
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
   if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
 }
diff -r 117cf4377bf4 -r 1556c6d89036 src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Mon Apr 01 14:52:38 2019 +0800
+++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Tue Apr 02 19:01:15 2019 +0800
@@ -496,7 +496,7 @@
   if (beg_region == end_region) {
     // All in one region.
     _region_data[beg_region].add_live_obj(len);
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
     return;
@@ -517,7 +517,7 @@
   const size_t end_ofs = region_offset(addr + len - 1);
   _region_data[end_region].set_partial_obj_size(end_ofs + 1);
   _region_data[end_region].set_partial_obj_addr(addr);
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
 }
@@ -3238,7 +3238,7 @@
     if (new_block != cur_block) {
       cur_block = new_block;
       sd.block(cur_block)->set_offset(bitmap->bits_to_words(live_bits));
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
       if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
     }
diff -r 117cf4377bf4 -r 1556c6d89036 src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp	Mon Apr 01 14:52:38 2019 +0800
+++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp	Tue Apr 02 19:01:15 2019 +0800
@@ -1329,7 +1329,7 @@
   const int obj_size = obj->size();
   if (mark_bitmap()->mark_obj(obj, obj_size)) {
     _summary_data.add_obj(obj, obj_size);
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
     return true;
@@ -1366,7 +1366,7 @@
     oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
     if (mark_bitmap()->is_unmarked(obj) && mark_obj(obj)) {
       cm->push(obj);
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
       if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
     }
diff -r 117cf4377bf4 -r 1556c6d89036 src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp	Mon Apr 01 14:52:38 2019 +0800
+++ b/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp	Tue Apr 02 19:01:15 2019 +0800
@@ -75,7 +75,7 @@
 
   oop new_obj = NULL;
 
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
   if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
 
@@ -84,7 +84,7 @@
   // at any time. Do not use oop methods for accessing the mark!
   markOop test_mark = o->mark();
 
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
   if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
 
@@ -121,7 +121,7 @@
           }
         }
 
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
         if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
       }
@@ -181,7 +181,7 @@
 
     // Copy obj
     Copy::aligned_disjoint_words((HeapWord*)o, (HeapWord*)new_obj, new_obj_size);
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
 
@@ -232,7 +232,7 @@
       new_obj = o->forwardee();
     }
 
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
   } else {
diff -r 117cf4377bf4 -r 1556c6d89036 src/share/vm/memory/barrierSet.hpp
--- a/src/share/vm/memory/barrierSet.hpp	Mon Apr 01 14:52:38 2019 +0800
+++ b/src/share/vm/memory/barrierSet.hpp	Tue Apr 02 19:01:15 2019 +0800
@@ -97,12 +97,12 @@
   virtual void write_ref_field_pre_work(     void* field, oop new_val) { guarantee(false, "Not needed"); };
 protected:
   virtual void write_ref_field_pre_work(      oop* field, oop new_val) {
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
       if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
   };
   virtual void write_ref_field_pre_work(narrowOop* field, oop new_val) {
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
       if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
   };
@@ -142,13 +142,13 @@
   // Below length is the # array elements being written
   virtual void write_ref_array_pre(oop* dst, int length,
                                    bool dest_uninitialized = false) {
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
       if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
   }
   virtual void write_ref_array_pre(narrowOop* dst, int length,
                                    bool dest_uninitialized = false) {
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
       if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
 }
diff -r 117cf4377bf4 -r 1556c6d89036 src/share/vm/memory/cardTableModRefBS.hpp
--- a/src/share/vm/memory/cardTableModRefBS.hpp	Mon Apr 01 14:52:38 2019 +0800
+++ b/src/share/vm/memory/cardTableModRefBS.hpp	Tue Apr 02 19:01:15 2019 +0800
@@ -316,7 +316,7 @@
 
   inline void inline_write_ref_array(MemRegion mr) {
     dirty_MemRegion(mr);
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
   }
@@ -333,7 +333,7 @@
   // *** Card-table-barrier-specific things.
 
   template <class T> inline void inline_write_ref_field_pre(T* field, oop newVal) {
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
   }
@@ -346,7 +346,7 @@
     } else {
       *byte = dirty_card;
     }
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
   }
diff -r 117cf4377bf4 -r 1556c6d89036 src/share/vm/memory/cardTableRS.cpp
--- a/src/share/vm/memory/cardTableRS.cpp	Mon Apr 01 14:52:38 2019 +0800
+++ b/src/share/vm/memory/cardTableRS.cpp	Tue Apr 02 19:01:15 2019 +0800
@@ -252,7 +252,7 @@
 // cur_youngergen_and_prev_nonclean_card ==> no change.
 void CardTableRS::write_ref_field_gc_par(void* field, oop new_val) {
   jbyte* entry = ct_bs()->byte_for(field);
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
   if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
   do {
@@ -270,9 +270,9 @@
       jbyte res = Atomic::cmpxchg(new_val, entry, entry_val);
       // Did the CAS succeed?
       if (res == entry_val) {
-      #ifdef MIPS
+#if defined MIPS && !defined ZERO
          if (UseSyncLevel >= 2000) OrderAccess::fence();
-      #endif
+#endif
          return;
       }
       // Otherwise, retry, to see the new value.
diff -r 117cf4377bf4 -r 1556c6d89036 src/share/vm/memory/cardTableRS.hpp
--- a/src/share/vm/memory/cardTableRS.hpp	Mon Apr 01 14:52:38 2019 +0800
+++ b/src/share/vm/memory/cardTableRS.hpp	Tue Apr 02 19:01:15 2019 +0800
@@ -121,11 +121,11 @@
 
   void inline_write_ref_field_gc(void* field, oop new_val) {
     jbyte* byte = _ct_bs->byte_for(field);
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
    *byte = youngergen_card;
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
    if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
 
diff -r 117cf4377bf4 -r 1556c6d89036 src/share/vm/oops/klass.hpp
--- a/src/share/vm/oops/klass.hpp	Mon Apr 01 14:52:38 2019 +0800
+++ b/src/share/vm/oops/klass.hpp	Tue Apr 02 19:01:15 2019 +0800
@@ -292,13 +292,13 @@
   // The CT and MUT bits saves this information for the individual Klasses.
   void record_modified_oops()            {
     _modified_oops = 1;
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
   }
   void clear_modified_oops()             {
     _modified_oops = 0;
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) OrderAccess::fence();
 #endif
   }
diff -r 117cf4377bf4 -r 1556c6d89036 src/share/vm/oops/oop.hpp
--- a/src/share/vm/oops/oop.hpp	Mon Apr 01 14:52:38 2019 +0800
+++ b/src/share/vm/oops/oop.hpp	Tue Apr 02 19:01:15 2019 +0800
@@ -73,7 +73,7 @@
   markOop* mark_addr() const    { return (markOop*) &_mark; }
 
   void set_mark(volatile markOop m)      {
-#ifdef MIPS
+#if defined MIPS && !defined ZERO
     if (UseSyncLevel >= 2000) release_set_mark(m);
     else
 #endif