compiler.h: remove concept of different unaligned access speeds
authorEric Biggers <ebiggers3@gmail.com>
Sat, 6 Feb 2016 15:47:11 +0000 (09:47 -0600)
committerEric Biggers <ebiggers3@gmail.com>
Tue, 9 Feb 2016 01:44:19 +0000 (19:44 -0600)
Just having fast and slow seems to be enough.

include/wimlib/compiler.h
include/wimlib/decompress_common.h

index 102deb7..c469010 100644 (file)
 #endif
 #define CPU_IS_LITTLE_ENDIAN (!CPU_IS_BIG_ENDIAN)
 
-#if defined(__x86_64__) || defined(__i386__)
-#  define UNALIGNED_ACCESS_SPEED 3
-#elif defined(__ARM_FEATURE_UNALIGNED) && (__ARM_FEATURE_UNALIGNED == 1)
-#  define UNALIGNED_ACCESS_SPEED 2
+/* UNALIGNED_ACCESS_IS_FAST should be defined to 1 if unaligned memory accesses
+ * can be performed efficiently on the target platform.  */
+#if defined(__x86_64__) || defined(__i386__) || defined(__ARM_FEATURE_UNALIGNED)
+#  define UNALIGNED_ACCESS_IS_FAST 1
 #else
-#  define UNALIGNED_ACCESS_SPEED 0
+#  define UNALIGNED_ACCESS_IS_FAST 0
 #endif
 
 /* Get the type of the specified expression.  */
index 4bfaf25..54241b3 100644 (file)
@@ -299,7 +299,7 @@ lz_copy(u8 *dst, u32 length, u32 offset, const u8 *winend, u32 min_length)
         * beyond the end of the output buffer, hence the check for (winend -
         * end >= WORDSIZE - 1).
         */
-       if (UNALIGNED_ACCESS_IS_VERY_FAST &&
+       if (UNALIGNED_ACCESS_IS_FAST &&
            likely(winend - end >= WORDSIZE - 1))
        {