portability and compression cleanups

[wimlib] / include / wimlib / unaligned.h

diff --git a/include/wimlib/unaligned.h b/include/wimlib/unaligned.h
index 7c2ade22031894debbf1f449295c5499d32faf96..ccc86f016a3ab9a1638e49a1bf42891e437d0a8e 100644 (file)
--- a/include/wimlib/unaligned.h
+++ b/include/wimlib/unaligned.h
@@ -10,9 +10,9 @@
 #ifndef _WIMLIB_UNALIGNED_H
 #define _WIMLIB_UNALIGNED_H
 
-#include "compiler.h"
-#include "endianness.h"
-#include "types.h"
+#include "wimlib/compiler.h"
+#include "wimlib/endianness.h"
+#include "wimlib/types.h"
 
 #define DEFINE_UNALIGNED_TYPE(type)                            \
 struct type##_unaligned {                                      \
@@ -31,10 +31,99 @@ store_##type##_unaligned(type val, void *p)                 \
        ((struct type##_unaligned *)p)->v = val;                \
 }
 
+DEFINE_UNALIGNED_TYPE(u16);
+DEFINE_UNALIGNED_TYPE(u32);
+DEFINE_UNALIGNED_TYPE(u64);
 DEFINE_UNALIGNED_TYPE(le16);
 DEFINE_UNALIGNED_TYPE(le32);
 DEFINE_UNALIGNED_TYPE(le64);
+DEFINE_UNALIGNED_TYPE(be16);
 DEFINE_UNALIGNED_TYPE(be32);
+DEFINE_UNALIGNED_TYPE(be64);
 DEFINE_UNALIGNED_TYPE(size_t);
+DEFINE_UNALIGNED_TYPE(machine_word_t);
+
+#define load_word_unaligned    load_machine_word_t_unaligned
+#define store_word_unaligned   store_machine_word_t_unaligned
+
+static inline void
+copy_word_unaligned(const void *src, void *dst)
+{
+       store_word_unaligned(load_word_unaligned(src), dst);
+}
+
+static inline machine_word_t
+repeat_byte(u8 b)
+{
+       machine_word_t v;
+
+       BUILD_BUG_ON(WORDSIZE != 4 && WORDSIZE != 8);
+
+       v = b;
+       v |= v << 8;
+       v |= v << 16;
+       v |= v << ((WORDSIZE == 8) ? 32 : 0);
+       return v;
+}
+
+static inline u16
+get_unaligned_u16_le(const void *p)
+{
+       u16 v;
+
+       if (UNALIGNED_ACCESS_IS_FAST) {
+               v = le16_to_cpu(load_le16_unaligned(p));
+       } else {
+               const u8 *p8 = p;
+               v = 0;
+               v |= (u16)p8[0] << 0;
+               v |= (u16)p8[1] << 8;
+       }
+       return v;
+}
+
+static inline u32
+get_unaligned_u32_le(const void *p)
+{
+       u32 v;
+
+       if (UNALIGNED_ACCESS_IS_FAST) {
+               v = le32_to_cpu(load_le32_unaligned(p));
+       } else {
+               const u8 *p8 = p;
+               v = 0;
+               v |= (u32)p8[0] << 0;
+               v |= (u32)p8[1] << 8;
+               v |= (u32)p8[2] << 16;
+               v |= (u32)p8[3] << 24;
+       }
+       return v;
+}
+
+static inline void
+put_unaligned_u16_le(u16 v, void *p)
+{
+       if (UNALIGNED_ACCESS_IS_FAST) {
+               store_le16_unaligned(cpu_to_le16(v), p);
+       } else {
+               u8 *p8 = p;
+               p8[0] = (v >> 0) & 0xFF;
+               p8[1] = (v >> 8) & 0xFF;
+       }
+}
+
+static inline void
+put_unaligned_u32_le(u32 v, void *p)
+{
+       if (UNALIGNED_ACCESS_IS_FAST) {
+               store_le32_unaligned(cpu_to_le32(v), p);
+       } else {
+               u8 *p8 = p;
+               p8[0] = (v >> 0) & 0xFF;
+               p8[1] = (v >> 8) & 0xFF;
+               p8[2] = (v >> 16) & 0xFF;
+               p8[3] = (v >> 24) & 0xFF;
+       }
+}
 
 #endif /* _WIMLIB_UNALIGNED_H */