*** old/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Thu Feb  5 10:54:03 2015
--- new/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Thu Feb  5 10:54:03 2015

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 1205,1215 ****
--- 1205,1214 ----
    //     Destroy no registers!
    //
    void  gen_write_ref_array_pre_barrier(Register addr, Register count, bool dest_uninitialized) {
      BarrierSet* 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) {
             __ pusha();                      // push registers
             if (count == c_rarg0) {

*** 1250,1260 ****
--- 1249,1258 ----
    //
    void  gen_write_ref_array_post_barrier(Register start, Register count, Register scratch) {
      assert_different_registers(start, count, scratch);
      BarrierSet* bs = Universe::heap()->barrier_set();
      switch (bs->kind()) {
        case BarrierSet::G1SATBCT:
        case BarrierSet::G1SATBCTLogging:
          {
            __ pusha();             // push registers (overkill)
            if (c_rarg0 == count) { // On win64 c_rarg0 == rcx
              assert_different_registers(c_rarg1, start);