Skip to content
Permalink
Browse files
8268118: Rename bytes_os_cpu.inline.hpp files to bytes_os_cpu.hpp
Reviewed-by: coleenp, dholmes
  • Loading branch information
stefank committed Jun 3, 2021
1 parent 1296a6c commit c8f4c02bf005ee1531193535632a5ece768916d0
@@ -61,6 +61,6 @@ class Bytes: AllStatic {


// The following header contains the implementations of swap_u2, swap_u4, and swap_u8[_base]
#include OS_CPU_HEADER_INLINE(bytes)
#include OS_CPU_HEADER(bytes)

#endif // CPU_AARCH64_BYTES_AARCH64_HPP
@@ -184,6 +184,6 @@ class Bytes: AllStatic {


// The following header contains the implementations of swap_u2, swap_u4, and swap_u8
#include OS_CPU_HEADER_INLINE(bytes)
#include OS_CPU_HEADER(bytes)

#endif // CPU_ARM_BYTES_ARM_HPP
@@ -266,6 +266,6 @@ class Bytes: AllStatic {
#endif // VM_LITTLE_ENDIAN
};

#include OS_CPU_HEADER_INLINE(bytes)
#include OS_CPU_HEADER(bytes)

#endif // CPU_PPC_BYTES_PPC_HPP
@@ -51,7 +51,7 @@ class Bytes: AllStatic {
static inline void put_native_u8(address p, u8 x) { *(u8*)p = x; }

// The following header contains the implementations of swap_u2, swap_u4, and swap_u8.
#include OS_CPU_HEADER_INLINE(bytes)
#include OS_CPU_HEADER(bytes)

// Efficient reading and writing of unaligned unsigned data in Java byte ordering (i.e. big-endian ordering)
static inline u2 get_Java_u2(address p) { return get_native_u2(p); }
@@ -122,6 +122,6 @@ class Bytes: AllStatic {
};

// The following header contains the implementations of swap_u2, swap_u4, and swap_u8[_base]
#include OS_CPU_HEADER_INLINE(bytes)
#include OS_CPU_HEADER(bytes)

#endif // CPU_X86_BYTES_X86_HPP
@@ -156,7 +156,7 @@ class Bytes: AllStatic {
// The following header contains the implementations of swap_u2,
// swap_u4, and swap_u8

#include OS_CPU_HEADER_INLINE(bytes)
#include OS_CPU_HEADER(bytes)

#endif // VM_LITTLE_ENDIAN

@@ -22,11 +22,11 @@
*
*/

#ifndef OS_CPU_AIX_PPC_BYTES_AIX_PPC_INLINE_HPP
#define OS_CPU_AIX_PPC_BYTES_AIX_PPC_INLINE_HPP
#ifndef OS_CPU_AIX_PPC_BYTES_AIX_PPC_HPP
#define OS_CPU_AIX_PPC_BYTES_AIX_PPC_HPP

#if defined(VM_LITTLE_ENDIAN)
// Aix is not little endian.
#endif // VM_LITTLE_ENDIAN

#endif // OS_CPU_AIX_PPC_BYTES_AIX_PPC_INLINE_HPP
#endif // OS_CPU_AIX_PPC_BYTES_AIX_PPC_HPP
@@ -24,8 +24,8 @@
*
*/

#ifndef OS_CPU_BSD_AARCH64_BYTES_BSD_AARCH64_INLINE_HPP
#define OS_CPU_BSD_AARCH64_BYTES_BSD_AARCH64_INLINE_HPP
#ifndef OS_CPU_BSD_AARCH64_BYTES_BSD_AARCH64_HPP
#define OS_CPU_BSD_AARCH64_BYTES_BSD_AARCH64_HPP

#ifdef __APPLE__
#include <libkern/OSByteOrder.h>
@@ -53,4 +53,4 @@ inline u8 Bytes::swap_u8(u8 x) {
return bswap_64(x);
}

#endif // OS_CPU_BSD_AARCH64_BYTES_BSD_AARCH64_INLINE_HPP
#endif // OS_CPU_BSD_AARCH64_BYTES_BSD_AARCH64_HPP
@@ -22,8 +22,8 @@
*
*/

#ifndef OS_CPU_BSD_X86_BYTES_BSD_X86_INLINE_HPP
#define OS_CPU_BSD_X86_BYTES_BSD_X86_INLINE_HPP
#ifndef OS_CPU_BSD_X86_BYTES_BSD_X86_HPP
#define OS_CPU_BSD_X86_BYTES_BSD_X86_HPP

#ifdef __APPLE__
#include <libkern/OSByteOrder.h>
@@ -98,4 +98,4 @@ inline u8 Bytes::swap_u8(u8 x) {
}
#endif // !AMD64

#endif // OS_CPU_BSD_X86_BYTES_BSD_X86_INLINE_HPP
#endif // OS_CPU_BSD_X86_BYTES_BSD_X86_HPP
@@ -22,8 +22,8 @@
*
*/

#ifndef OS_CPU_BSD_ZERO_BYTES_BSD_ZERO_INLINE_HPP
#define OS_CPU_BSD_ZERO_BYTES_BSD_ZERO_INLINE_HPP
#ifndef OS_CPU_BSD_ZERO_BYTES_BSD_ZERO_HPP
#define OS_CPU_BSD_ZERO_BYTES_BSD_ZERO_HPP

// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
@@ -64,4 +64,4 @@ inline u8 Bytes::swap_u8(u8 x) {
return bswap_64(x);
}

#endif // OS_CPU_BSD_ZERO_BYTES_BSD_ZERO_INLINE_HPP
#endif // OS_CPU_BSD_ZERO_BYTES_BSD_ZERO_HPP
@@ -23,8 +23,8 @@
*
*/

#ifndef OS_CPU_LINUX_AARCH64_BYTES_LINUX_AARCH64_INLINE_HPP
#define OS_CPU_LINUX_AARCH64_BYTES_LINUX_AARCH64_INLINE_HPP
#ifndef OS_CPU_LINUX_AARCH64_BYTES_LINUX_AARCH64_HPP
#define OS_CPU_LINUX_AARCH64_BYTES_LINUX_AARCH64_HPP

#include <byteswap.h>

@@ -42,4 +42,4 @@ inline u8 Bytes::swap_u8(u8 x) {
return bswap_64(x);
}

#endif // OS_CPU_LINUX_AARCH64_BYTES_LINUX_AARCH64_INLINE_HPP
#endif // OS_CPU_LINUX_AARCH64_BYTES_LINUX_AARCH64_HPP
@@ -22,8 +22,8 @@
*
*/

#ifndef OS_CPU_LINUX_ARM_BYTES_LINUX_ARM_INLINE_HPP
#define OS_CPU_LINUX_ARM_BYTES_LINUX_ARM_INLINE_HPP
#ifndef OS_CPU_LINUX_ARM_BYTES_LINUX_ARM_HPP
#define OS_CPU_LINUX_ARM_BYTES_LINUX_ARM_HPP

#include <byteswap.h>

@@ -44,4 +44,4 @@ inline u8 Bytes::swap_u8(u8 x) {
return bswap_64(x);
}

#endif // OS_CPU_LINUX_ARM_BYTES_LINUX_ARM_INLINE_HPP
#endif // OS_CPU_LINUX_ARM_BYTES_LINUX_ARM_HPP
@@ -23,8 +23,8 @@
*
*/

#ifndef OS_CPU_LINUX_PPC_BYTES_LINUX_PPC_INLINE_HPP
#define OS_CPU_LINUX_PPC_BYTES_LINUX_PPC_INLINE_HPP
#ifndef OS_CPU_LINUX_PPC_BYTES_LINUX_PPC_HPP
#define OS_CPU_LINUX_PPC_BYTES_LINUX_PPC_HPP

#if defined(VM_LITTLE_ENDIAN)
#include <byteswap.h>
@@ -36,4 +36,4 @@ inline u4 Bytes::swap_u4(u4 x) { return bswap_32(x); }
inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); }
#endif // VM_LITTLE_ENDIAN

#endif // OS_CPU_LINUX_PPC_BYTES_LINUX_PPC_INLINE_HPP
#endif // OS_CPU_LINUX_PPC_BYTES_LINUX_PPC_HPP
@@ -23,8 +23,8 @@
*
*/

#ifndef OS_CPU_LINUX_S390_BYTES_LINUX_S390_INLINE_HPP
#define OS_CPU_LINUX_S390_BYTES_LINUX_S390_INLINE_HPP
#ifndef OS_CPU_LINUX_S390_BYTES_LINUX_S390_HPP
#define OS_CPU_LINUX_S390_BYTES_LINUX_S390_HPP

// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
@@ -43,4 +43,4 @@ inline u8 swap_u8(u8 x) {
return bswap_64(x);
}

#endif // OS_CPU_LINUX_S390_BYTES_LINUX_S390_INLINE_HPP
#endif // OS_CPU_LINUX_S390_BYTES_LINUX_S390_HPP
@@ -22,8 +22,8 @@
*
*/

#ifndef OS_CPU_LINUX_X86_BYTES_LINUX_X86_INLINE_HPP
#define OS_CPU_LINUX_X86_BYTES_LINUX_X86_INLINE_HPP
#ifndef OS_CPU_LINUX_X86_BYTES_LINUX_X86_HPP
#define OS_CPU_LINUX_X86_BYTES_LINUX_X86_HPP

#include <byteswap.h>

@@ -76,4 +76,4 @@ inline u8 Bytes::swap_u8(u8 x) {
}
#endif // !AMD64

#endif // OS_CPU_LINUX_X86_BYTES_LINUX_X86_INLINE_HPP
#endif // OS_CPU_LINUX_X86_BYTES_LINUX_X86_HPP
@@ -22,8 +22,8 @@
*
*/

#ifndef OS_CPU_LINUX_ZERO_BYTES_LINUX_ZERO_INLINE_HPP
#define OS_CPU_LINUX_ZERO_BYTES_LINUX_ZERO_INLINE_HPP
#ifndef OS_CPU_LINUX_ZERO_BYTES_LINUX_ZERO_HPP
#define OS_CPU_LINUX_ZERO_BYTES_LINUX_ZERO_HPP

// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
@@ -42,4 +42,4 @@ inline u8 Bytes::swap_u8(u8 x) {
return bswap_64(x);
}

#endif // OS_CPU_LINUX_ZERO_BYTES_LINUX_ZERO_INLINE_HPP
#endif // OS_CPU_LINUX_ZERO_BYTES_LINUX_ZERO_HPP
@@ -22,8 +22,8 @@
*
*/

#ifndef OS_CPU_WINDOWS_AARCH64_BYTES_WINDOWS_AARCH64_INLINE_HPP
#define OS_CPU_WINDOWS_AARCH64_BYTES_WINDOWS_AARCH64_INLINE_HPP
#ifndef OS_CPU_WINDOWS_AARCH64_BYTES_WINDOWS_AARCH64_HPP
#define OS_CPU_WINDOWS_AARCH64_BYTES_WINDOWS_AARCH64_HPP

#include <stdlib.h>

@@ -43,4 +43,4 @@ inline u8 Bytes::swap_u8(u8 x) {

#pragma warning(default: 4035) // Enable warning 4035: no return value

#endif // OS_CPU_WINDOWS_AARCH64_BYTES_WINDOWS_AARCH64_INLINE_HPP
#endif // OS_CPU_WINDOWS_AARCH64_BYTES_WINDOWS_AARCH64_HPP
@@ -22,8 +22,8 @@
*
*/

#ifndef OS_CPU_WINDOWS_X86_BYTES_WINDOWS_X86_INLINE_HPP
#define OS_CPU_WINDOWS_X86_BYTES_WINDOWS_X86_INLINE_HPP
#ifndef OS_CPU_WINDOWS_X86_BYTES_WINDOWS_X86_HPP
#define OS_CPU_WINDOWS_X86_BYTES_WINDOWS_X86_HPP

#include <stdlib.h>

@@ -41,4 +41,4 @@ inline u8 Bytes::swap_u8(u8 x) {
return (u8) _byteswap_uint64((unsigned __int64) x);
}

#endif // OS_CPU_WINDOWS_X86_BYTES_WINDOWS_X86_INLINE_HPP
#endif // OS_CPU_WINDOWS_X86_BYTES_WINDOWS_X86_HPP

1 comment on commit c8f4c02

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on c8f4c02 Jun 3, 2021

Please sign in to comment.