*** old/src/share/vm/memory/collectorPolicy.hpp	Fri Oct 25 15:28:58 2013
--- new/src/share/vm/memory/collectorPolicy.hpp	Fri Oct 25 15:28:58 2013

*** 77,86 ****
--- 77,87 ----
    AdaptiveSizePolicy* _size_policy;
  
    // Set to true when policy wants soft refs cleared.
    // Reset to false by gc after it clears all soft refs.
    bool _should_clear_all_soft_refs;
+ 
    // Set to true by the GC if the just-completed gc cleared all
    // softrefs.  This is set to true whenever a gc clears all softrefs, and
    // set to false each time gc returns to the mutator.  For example, in the
    // ParallelScavengeHeap case the latter would be done toward the end of
    // mem_allocate() where it returns op.result()

*** 149,159 ****
--- 150,159 ----
    bool is_g1_policy()                    { return false; }
  #endif // INCLUDE_ALL_GCS
  
  
    virtual BarrierSet::Name barrier_set_name() = 0;
    virtual GenRemSet::Name  rem_set_name() = 0;
  
    // Create the remembered set (to cover the given reserved region,
    // allowing breaking up into at most "max_covered_regions").
    virtual GenRemSet* create_rem_set(MemRegion reserved,
                                      int max_covered_regions);

*** 272,281 ****
--- 272,287 ----
  
    // Adaptive size policy
    virtual void initialize_size_policy(size_t init_eden_size,
                                        size_t init_promo_size,
                                        size_t init_survivor_size);
+ 
+   // The alignment used for eden and survivors within the young gen
+   // and for boundary between young gen and old gen.
+   static size_t intra_heap_alignment() {
+     return 64 * K * HeapWordSize;
+   }
  };
  
  // All of hotspot's current collectors are subtypes of this
  // class. Currently, these collectors all use the same gen[0],
  // but have different gen[1] types. If we add another subtype

*** 301,311 ****
--- 307,316 ----
    // Inherited methods
    TwoGenerationCollectorPolicy* as_two_generation_policy() { return this; }
  
    int number_of_generations()                  { return 2; }
    BarrierSet::Name barrier_set_name()          { return BarrierSet::CardTableModRef; }
    GenRemSet::Name rem_set_name()               { return GenRemSet::CardTable; }
  
    virtual CollectorPolicy::Name kind() {
      return CollectorPolicy::TwoGenerationCollectorPolicyKind;
    }