*** old/src/cpu/ppc/vm/stubGenerator_ppc.cpp	Thu Feb  5 10:53:57 2015
--- new/src/cpu/ppc/vm/stubGenerator_ppc.cpp	Thu Feb  5 10:53:57 2015

*** 606,616 ****
--- 606,615 ----
    //     nothing
    //
    void gen_write_ref_array_pre_barrier(Register from, Register to, Register count, bool dest_uninitialized, Register Rtmp1) {
      BarrierSet* const bs = Universe::heap()->barrier_set();
      switch (bs->kind()) {
        case BarrierSet::G1SATBCT:
        case BarrierSet::G1SATBCTLogging:
          // With G1, don't generate the call if we statically know that the target in uninitialized
          if (!dest_uninitialized) {
            const int spill_slots = 4 * wordSize;
            const int frame_size  = frame::abi_reg_args_size + spill_slots;

*** 663,673 ****
--- 662,671 ----
    //
    void gen_write_ref_array_post_barrier(Register addr, Register count, Register tmp, bool branchToEnd) {
      BarrierSet* const bs = Universe::heap()->barrier_set();
  
      switch (bs->kind()) {
        case BarrierSet::G1SATBCT:
        case BarrierSet::G1SATBCTLogging:
          {
            if (branchToEnd) {
              __ save_LR_CR(R0);
              // We need this frame only to spill LR.