--- /dev/null	2017-03-07 11:44:12.271151064 +0100
+++ new/src/cpu/x86/vm/gc/shared/modRefBSCodeGen_x86.cpp	2017-04-25 16:46:09.731171893 +0200
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "gc/shared/modRefBSCodeGen.hpp"
+
+#define __ masm->
+
+void ModRefBSCodeGen::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                         Register src, Register dst, Register count) {
+  bool covariant = (decorators & DEST_COVARIANT) != 0;
+  bool conjoint = (decorators & DEST_CONJOINT) != 0;
+  bool disjoint = (decorators & DEST_DISJOINT) != 0;
+  bool obj_int = type == T_OBJECT LP64_ONLY(&& UseCompressedOops);
+
+  if (type == T_OBJECT || type == T_ARRAY) {
+    if (covariant && !obj_int) {
+      // Save count for barrier
+      __ movptr(r11, count);
+    } else if (covariant && disjoint && obj_int) {
+      // Save dst in r11 in the disjoint covariant case
+      __ movq(r11, dst);
+    }
+    gen_write_ref_array_pre_barrier(masm, decorators, dst, count);
+  }
+}
+
+void ModRefBSCodeGen::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                         Register src, Register dst, Register count) {
+  bool covariant = (decorators & DEST_COVARIANT) != 0;
+  bool contravariant = (decorators & DEST_CONTRAVARIANT) != 0;
+  bool disjoint = (decorators & DEST_DISJOINT) != 0;
+  bool obj_int = type == T_OBJECT LP64_ONLY(&& UseCompressedOops);
+  Register tmp = rax;
+
+  if (type == T_OBJECT || type == T_ARRAY) {
+    if (covariant && !obj_int) {
+      // Save count for barrier
+      count = r11;
+    } else if (covariant && disjoint && obj_int) {
+      // Use the saved dst in the disjoint covariant case
+      dst = r11;
+    } else if (contravariant && disjoint) {
+      tmp = rscratch1;
+    }
+    gen_write_ref_array_post_barrier(masm, decorators, dst, count, tmp);
+  }
+}
+
+void ModRefBSCodeGen::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                   Address dst, Register val, Register tmp1, Register tmp2) {
+  BarrierSetCodeGen::store_at(masm, decorators, type, dst, val, tmp1, tmp2);
+}
+
+void ModRefBSCodeGen::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                               Address dst, Register val, Register tmp1, Register tmp2) {
+  if (type == T_OBJECT || type == T_ARRAY) {
+    oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2);
+  } else {
+    BarrierSetCodeGen::store_at(masm, decorators, type, dst, val, tmp1, tmp2);
+  }
+}