v1.14.4

[wimlib] / src / lzms_common.c

diff --git a/src/lzms_common.c b/src/lzms_common.c
index 47c071178940732b8eb8e6a03883c770be5132cb..50176847f8b042cd20b1600342c5ee0fad0805da 100644 (file)
--- a/src/lzms_common.c
+++ b/src/lzms_common.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2013, 2014 Eric Biggers
+ * Copyright (C) 2013-2016 Eric Biggers
  *
  * This file is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
@@ -16,16 +16,16 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this file; if not, see http://www.gnu.org/licenses/.
+ * along with this file; if not, see https://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include "wimlib/cpu_features.h"
 #include "wimlib/lzms_common.h"
 #include "wimlib/unaligned.h"
-#include "wimlib/x86_cpu_features.h"
 
 #ifdef __x86_64__
 #  include <emmintrin.h>
@@ -379,7 +379,7 @@ lzms_dilute_symbol_frequencies(u32 freqs[], unsigned num_syms)
 
 
 #ifdef __x86_64__
-static inline u8 *
+static forceinline u8 *
 find_next_opcode_sse4_2(u8 *p)
 {
        const __v16qi potential_opcodes = (__v16qi) {0x48, 0x4C, 0xE8, 0xE9, 0xF0, 0xFF};
@@ -391,7 +391,11 @@ find_next_opcode_sse4_2(u8 *p)
                "  pcmpestri $0x0, (%[p]), %[potential_opcodes]      \n"
                "  jnc 1b                                            \n"
                "2:                                                  \n"
+       #ifdef __ILP32__ /* x32 ABI (x86_64 with 32-bit pointers) */
+               "  add %%ecx, %[p]                                   \n"
+       #else
                "  add %%rcx, %[p]                                   \n"
+       #endif
                : [p] "+r" (p)
                : [potential_opcodes] "x" (potential_opcodes), "a" (6), "d" (16)
                : "rcx", "cc"
@@ -401,7 +405,7 @@ find_next_opcode_sse4_2(u8 *p)
 }
 #endif /* __x86_64__ */
 
-static inline u8 *
+static forceinline u8 *
 find_next_opcode_default(u8 *p)
 {
        /*
@@ -433,7 +437,7 @@ find_next_opcode_default(u8 *p)
        return p;
 }
 
-static inline u8 *
+static forceinline u8 *
 translate_if_needed(u8 *data, u8 *p, s32 *last_x86_pos,
                    s32 last_target_usages[], bool undo)
 {
@@ -516,15 +520,15 @@ have_opcode:
        p += opcode_nbytes;
        if (undo) {
                if (i - *last_x86_pos <= max_trans_offset) {
-                       u32 n = get_unaligned_u32_le(p);
-                       put_unaligned_u32_le(n - i, p);
+                       u32 n = get_unaligned_le32(p);
+                       put_unaligned_le32(n - i, p);
                }
-               target16 = i + get_unaligned_u16_le(p);
+               target16 = i + get_unaligned_le16(p);
        } else {
-               target16 = i + get_unaligned_u16_le(p);
+               target16 = i + get_unaligned_le16(p);
                if (i - *last_x86_pos <= max_trans_offset) {
-                       u32 n = get_unaligned_u32_le(p);
-                       put_unaligned_u32_le(n + i, p);
+                       u32 n = get_unaligned_le32(p);
+                       put_unaligned_le32(n + i, p);
                }
        }
 
@@ -610,7 +614,7 @@ lzms_x86_filter(u8 data[restrict], s32 size,
        tail_ptr = &data[size - 16];
 
 #ifdef __x86_64__
-       if (x86_have_cpu_feature(X86_CPU_FEATURE_SSE4_2)) {
+       if (cpu_features & X86_CPU_FEATURE_SSE4_2) {
                u8 saved_byte = *tail_ptr;
                *tail_ptr = 0xE8;
                for (;;) {