--- a/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp Fri Mar 16 09:12:13 2018 -0400
+++ b/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp Fri Mar 16 11:26:05 2018 +0000
@@ -26,20 +26,11 @@
#define OS_CPU_LINUX_ARM_VM_COPY_LINUX_ARM_INLINE_HPP
static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
-#ifdef AARCH64
_Copy_conjoint_words(from, to, count * HeapWordSize);
-#else
- // NOTE: _Copy_* functions on 32-bit ARM expect "to" and "from" arguments in reversed order
- _Copy_conjoint_words(to, from, count * HeapWordSize);
-#endif
}
static void pd_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
-#ifdef AARCH64
_Copy_disjoint_words(from, to, count * HeapWordSize);
-#else
- _Copy_disjoint_words(to, from, count * HeapWordSize);
-#endif // AARCH64
}
static void pd_disjoint_words_atomic(const HeapWord* from, HeapWord* to, size_t count) {
@@ -63,11 +54,7 @@
}
static void pd_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) {
-#ifdef AARCH64
_Copy_conjoint_jshorts_atomic(from, to, count * BytesPerShort);
-#else
- _Copy_conjoint_jshorts_atomic(to, from, count * BytesPerShort);
-#endif
}
static void pd_conjoint_jints_atomic(const jint* from, jint* to, size_t count) {
@@ -85,7 +72,7 @@
assert(HeapWordSize == BytesPerLong, "64-bit architecture");
pd_conjoint_words((const HeapWord*)from, (HeapWord*)to, count);
#else
- _Copy_conjoint_jlongs_atomic(to, from, count * BytesPerLong);
+ _Copy_conjoint_jlongs_atomic(from, to, count * BytesPerLong);
#endif
}