Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/c1/c1_LIRGenerator.cpp	Fri Jan 18 05:33:32 2013 -0800
     1.2 +++ b/src/share/vm/c1/c1_LIRGenerator.cpp	Wed Jan 23 13:02:39 2013 -0500
     1.3 @@ -35,9 +35,10 @@
     1.4  #include "runtime/sharedRuntime.hpp"
     1.5  #include "runtime/stubRoutines.hpp"
     1.6  #include "utilities/bitMap.inline.hpp"
     1.7 -#ifndef SERIALGC
     1.8 +#include "utilities/macros.hpp"
     1.9 +#if INCLUDE_ALL_GCS
    1.10  #include "gc_implementation/g1/heapRegion.hpp"
    1.11 -#endif
    1.12 +#endif // INCLUDE_ALL_GCS
    1.13  
    1.14  #ifdef ASSERT
    1.15  #define __ gen()->lir(__FILE__, __LINE__)->
    1.16 @@ -1417,12 +1418,12 @@
    1.17                                 bool do_load, bool patch, CodeEmitInfo* info) {
    1.18    // Do the pre-write barrier, if any.
    1.19    switch (_bs->kind()) {
    1.20 -#ifndef SERIALGC
    1.21 +#if INCLUDE_ALL_GCS
    1.22      case BarrierSet::G1SATBCT:
    1.23      case BarrierSet::G1SATBCTLogging:
    1.24        G1SATBCardTableModRef_pre_barrier(addr_opr, pre_val, do_load, patch, info);
    1.25        break;
    1.26 -#endif // SERIALGC
    1.27 +#endif // INCLUDE_ALL_GCS
    1.28      case BarrierSet::CardTableModRef:
    1.29      case BarrierSet::CardTableExtension:
    1.30        // No pre barriers
    1.31 @@ -1439,12 +1440,12 @@
    1.32  
    1.33  void LIRGenerator::post_barrier(LIR_OprDesc* addr, LIR_OprDesc* new_val) {
    1.34    switch (_bs->kind()) {
    1.35 -#ifndef SERIALGC
    1.36 +#if INCLUDE_ALL_GCS
    1.37      case BarrierSet::G1SATBCT:
    1.38      case BarrierSet::G1SATBCTLogging:
    1.39        G1SATBCardTableModRef_post_barrier(addr,  new_val);
    1.40        break;
    1.41 -#endif // SERIALGC
    1.42 +#endif // INCLUDE_ALL_GCS
    1.43      case BarrierSet::CardTableModRef:
    1.44      case BarrierSet::CardTableExtension:
    1.45        CardTableModRef_post_barrier(addr,  new_val);
    1.46 @@ -1459,7 +1460,7 @@
    1.47  }
    1.48  
    1.49  ////////////////////////////////////////////////////////////////////////
    1.50 -#ifndef SERIALGC
    1.51 +#if INCLUDE_ALL_GCS
    1.52  
    1.53  void LIRGenerator::G1SATBCardTableModRef_pre_barrier(LIR_Opr addr_opr, LIR_Opr pre_val,
    1.54                                                       bool do_load, bool patch, CodeEmitInfo* info) {
    1.55 @@ -1575,7 +1576,7 @@
    1.56    __ branch_destination(slow->continuation());
    1.57  }
    1.58  
    1.59 -#endif // SERIALGC
    1.60 +#endif // INCLUDE_ALL_GCS
    1.61  ////////////////////////////////////////////////////////////////////////
    1.62  
    1.63  void LIRGenerator::CardTableModRef_post_barrier(LIR_OprDesc* addr, LIR_OprDesc* new_val) {
    1.64 @@ -2181,7 +2182,7 @@
    1.65  
    1.66    get_Object_unsafe(value, src.result(), off.result(), type, x->is_volatile());
    1.67  
    1.68 -#ifndef SERIALGC
    1.69 +#if INCLUDE_ALL_GCS
    1.70    // We might be reading the value of the referent field of a
    1.71    // Reference object in order to attach it back to the live
    1.72    // object graph. If G1 is enabled then we need to record
    1.73 @@ -2311,7 +2312,7 @@
    1.74        __ branch_destination(Lcont->label());
    1.75      }
    1.76    }
    1.77 -#endif // SERIALGC
    1.78 +#endif // INCLUDE_ALL_GCS
    1.79  
    1.80    if (x->is_volatile() && os::is_MP()) __ membar_acquire();
    1.81  }