AuroraMiddleware/brotli
1
0
Fork 0
mirror of https://github.com/google/brotli.git synced 2024-11-22 11:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

platform: fix unaligned 64-bit accesses on AArch32 (#699)

Browse Source 
Ensures that Aarch32 Arm builds with an Armv8 compiler do not set
BROTLI_64_BITS.

This scenario is possible with ChromeOS builds, as they may use a
toolchain with the target armv7-cros-gnueabi, but with -march=armv8.
This will set __ARM_ARCH to 8 (defining BROTLI_TARGET_ARMV8), but will
also set __ARM_32BIT_STATE and not __ARM_64BIT_STATE. Without this,
illegal 64-bit non-word-aligned reads (LDRD) may be emitted.

Also fix unaligned 64-bit reads on AArch32 - STRD was still possible to
emit.
This commit is contained in:
Stephen Kyle 2018-07-24 16:29:50 +01:00 committed by Eugene Kliuchnikov
parent fc4d345968
commit 6d027d1648
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
c/common/platform.h
View File

@ -187,7 +187,14 @@ OR:
#if (defined(__ARM_ARCH) && (__ARM_ARCH == 8)) || \ #if (defined(__ARM_ARCH) && (__ARM_ARCH == 8)) || \
defined(__aarch64__) || defined(__ARM64_ARCH_8__) defined(__aarch64__) || defined(__ARM64_ARCH_8__)
#define BROTLI_TARGET_ARMV8 #define BROTLI_TARGET_ARMV8_ANY
#if defined(__ARM_32BIT_STATE)
#define BROTLI_TARGET_ARMV8_32
#elif defined(__ARM_64BIT_STATE)
#define BROTLI_TARGET_ARMV8_64
#endif
#endif /* ARMv8 */ #endif /* ARMv8 */
#if defined(__i386) || defined(_M_IX86) #if defined(__i386) || defined(_M_IX86)
@ -210,7 +217,7 @@ OR:
#define BROTLI_64_BITS 1 #define BROTLI_64_BITS 1
#elif defined(BROTLI_BUILD_32_BIT) #elif defined(BROTLI_BUILD_32_BIT)
#define BROTLI_64_BITS 0 #define BROTLI_64_BITS 0
#elif defined(BROTLI_TARGET_X64) || defined(BROTLI_TARGET_ARMV8) || \ #elif defined(BROTLI_TARGET_X64) || defined(BROTLI_TARGET_ARMV8_64) || \
defined(BROTLI_TARGET_POWERPC64) || defined(BROTLI_TARGET_RISCV64) defined(BROTLI_TARGET_POWERPC64) || defined(BROTLI_TARGET_RISCV64)
#define BROTLI_64_BITS 1 #define BROTLI_64_BITS 1
#else #else
@ -261,7 +268,7 @@ OR:
#if defined(BROTLI_BUILD_PORTABLE) #if defined(BROTLI_BUILD_PORTABLE)
#define BROTLI_ALIGNED_READ (!!1) #define BROTLI_ALIGNED_READ (!!1)
#elif defined(BROTLI_TARGET_X86) || defined(BROTLI_TARGET_X64) || \ #elif defined(BROTLI_TARGET_X86) || defined(BROTLI_TARGET_X64) || \
defined(BROTLI_TARGET_ARMV7) || defined(BROTLI_TARGET_ARMV8) || \ defined(BROTLI_TARGET_ARMV7) || defined(BROTLI_TARGET_ARMV8_ANY) || \
defined(BROTLI_TARGET_RISCV64) defined(BROTLI_TARGET_RISCV64)
/* Allow unaligned read only for white-listed CPUs. */ /* Allow unaligned read only for white-listed CPUs. */
#define BROTLI_ALIGNED_READ (!!0) #define BROTLI_ALIGNED_READ (!!0)
@ -306,15 +313,33 @@ static BROTLI_INLINE void BrotliUnalignedWrite64(void* p, uint64_t v) {
} }
#else /* BROTLI_64_BITS */ #else /* BROTLI_64_BITS */
/* Avoid emitting LDRD / STRD, which require properly aligned address. */ /* Avoid emitting LDRD / STRD, which require properly aligned address. */
#if BROTLI_GNUC_HAS_ATTRIBUTE(aligned, 2, 7, 0)
typedef __attribute__((aligned(1))) uint64_t unaligned_uint64_t;
static BROTLI_INLINE uint64_t BrotliUnalignedRead64(const void* p) { static BROTLI_INLINE uint64_t BrotliUnalignedRead64(const void* p) {
const uint32_t* dwords = (const uint32_t*)p; return (uint64_t) ((unaligned_uint64_t*) p)[0];
return dwords[0] | ((uint64_t)dwords[1] << 32);
} }
static BROTLI_INLINE void BrotliUnalignedWrite64(void* p, uint64_t v) { static BROTLI_INLINE void BrotliUnalignedWrite64(void* p, uint64_t v) {
uint32_t* dwords = (uint32_t *)p; unaligned_uint64_t* dwords = (unaligned_uint64_t*) p;
dwords[0] = (uint32_t)v; dwords[0] = (unaligned_uint64_t) v;
dwords[1] = (uint32_t)(v >> 32);
} }
#else /* BROTLI_GNUC_HAS_ATTRIBUTE(aligned, 2, 7, 0) */
/* Alternative way to avoid LDRD/STRD is use volatile pointers. See:
* http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.faqs/ka16346.html
*/
static BROTLI_INLINE uint64_t BrotliUnalignedRead64(const void* p) {
return (uint64_t) *((volatile uint32_t*) p)
| ((uint64_t) *((volatile uint32_t*) p+1) << 32);
}
static BROTLI_INLINE void BrotliUnalignedWrite64(void* p, uint64_t v) {
*((volatile uint32_t*) p) = (uint32_t) v;
*((volatile uint32_t*) p+1) = (uint32_t) (v >> 32);
}
#endif /* BROTLI_GNUC_HAS_ATTRIBUTE(aligned, 2, 7, 0) */
#endif /* BROTLI_64_BITS */ #endif /* BROTLI_64_BITS */
#endif /* BROTLI_ALIGNED_READ */ #endif /* BROTLI_ALIGNED_READ */
@ -400,7 +425,7 @@ static BROTLI_INLINE void BROTLI_UNALIGNED_STORE64LE(void* p, uint64_t v) {
#define BROTLI_IS_CONSTANT(x) (!!0) #define BROTLI_IS_CONSTANT(x) (!!0)
#endif #endif
#if defined(BROTLI_TARGET_ARMV7) || defined(BROTLI_TARGET_ARMV8) #if defined(BROTLI_TARGET_ARMV7) || defined(BROTLI_TARGET_ARMV8_ANY)
#define BROTLI_HAS_UBFX (!!1) #define BROTLI_HAS_UBFX (!!1)
#else #else
#define BROTLI_HAS_UBFX (!!0) #define BROTLI_HAS_UBFX (!!0)
@ -427,7 +452,7 @@ static BROTLI_INLINE void BrotliDump(const char* f, int l, const char* fn) {
/* TODO: add appropriate icc/sunpro/arm/ibm/ti checks. */ /* TODO: add appropriate icc/sunpro/arm/ibm/ti checks. */
#if (BROTLI_GNUC_VERSION_CHECK(3, 0, 0) || defined(__llvm__)) && \ #if (BROTLI_GNUC_VERSION_CHECK(3, 0, 0) || defined(__llvm__)) && \
!defined(BROTLI_BUILD_NO_RBIT) !defined(BROTLI_BUILD_NO_RBIT)
#if defined(BROTLI_TARGET_ARMV7) || defined(BROTLI_TARGET_ARMV8) #if defined(BROTLI_TARGET_ARMV7) || defined(BROTLI_TARGET_ARMV8_ANY)
/* TODO: detect ARMv6T2 and enable this code for it. */ /* TODO: detect ARMv6T2 and enable this code for it. */
static BROTLI_INLINE brotli_reg_t BrotliRBit(brotli_reg_t input) { static BROTLI_INLINE brotli_reg_t BrotliRBit(brotli_reg_t input) {
brotli_reg_t output; brotli_reg_t output;