src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp

rev 49244 : 8199243: aarch32: ARM 32 build broken after 8165929
Reviewed-by: duke

*** 24,47 ****
  
  #ifndef OS_CPU_LINUX_ARM_VM_COPY_LINUX_ARM_INLINE_HPP
  #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) {
    pd_disjoint_words(from, to, count);
  }
--- 24,38 ----
*** 61,75 ****
  static void pd_conjoint_bytes_atomic(const void* from, void* to, size_t count) {
    pd_conjoint_bytes(from, to, count);
  }
  
  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) {
  #ifdef AARCH64
    _Copy_conjoint_jints_atomic(from, to, count * BytesPerInt);
--- 52,62 ----
*** 83,93 ****
  static void pd_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) {
  #ifdef AARCH64
    assert(HeapWordSize == BytesPerLong, "64-bit architecture");
    pd_conjoint_words((const HeapWord*)from, (HeapWord*)to, count);
  #else
!   _Copy_conjoint_jlongs_atomic(to, from, count * BytesPerLong);
  #endif
  }
  
  static void pd_conjoint_oops_atomic(const oop* from, oop* to, size_t count) {
  #ifdef AARCH64
--- 70,80 ----
  static void pd_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) {
  #ifdef AARCH64
    assert(HeapWordSize == BytesPerLong, "64-bit architecture");
    pd_conjoint_words((const HeapWord*)from, (HeapWord*)to, count);
  #else
!   _Copy_conjoint_jlongs_atomic(from, to, count * BytesPerLong);
  #endif
  }
  
  static void pd_conjoint_oops_atomic(const oop* from, oop* to, size_t count) {
  #ifdef AARCH64