From 99c2e1bf434cb0fb470d4a723d9d60e03d975ddd Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 23 Sep 2014 08:16:54 -0400 Subject: [PATCH] rewind: Change tabs to spaces --- rewind.c | 126 +++++++++++++++++++++++++++---------------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/rewind.c b/rewind.c index 2d1e846ed3..f59e89efd1 100644 --- a/rewind.c +++ b/rewind.c @@ -290,74 +290,74 @@ static inline int compat_ctz(unsigned x) static inline size_t find_change(const uint16_t *a, const uint16_t *b) { - const __m128i *a128 = (const __m128i*)a; - const __m128i *b128 = (const __m128i*)b; + const __m128i *a128 = (const __m128i*)a; + const __m128i *b128 = (const __m128i*)b; for (;;) - { - __m128i v0 = _mm_loadu_si128(a128); - __m128i v1 = _mm_loadu_si128(b128); - __m128i c = _mm_cmpeq_epi32(v0, v1); + { + __m128i v0 = _mm_loadu_si128(a128); + __m128i v1 = _mm_loadu_si128(b128); + __m128i c = _mm_cmpeq_epi32(v0, v1); - uint32_t mask = _mm_movemask_epi8(c); - if (mask != 0xffff) /* Something has changed, figure out where. */ - { - size_t ret = (((uint8_t*)a128 - (uint8_t*)a) | + uint32_t mask = _mm_movemask_epi8(c); + if (mask != 0xffff) /* Something has changed, figure out where. */ + { + size_t ret = (((uint8_t*)a128 - (uint8_t*)a) | (compat_ctz(~mask))) >> 1; return ret | (a[ret] == b[ret]); - } + } - a128++; - b128++; - } + a128++; + b128++; + } } #else static inline size_t find_change(const uint16_t *a, const uint16_t *b) { - const uint16_t *a_org = a; + const uint16_t *a_org = a; #ifdef NO_UNALIGNED_MEM - while (((uintptr_t)a & (sizeof(size_t) - 1)) && *a == *b) - { - a++; - b++; - } - if (*a == *b) + while (((uintptr_t)a & (sizeof(size_t) - 1)) && *a == *b) + { + a++; + b++; + } + if (*a == *b) #endif - { - const size_t *a_big = (const size_t*)a; - const size_t *b_big = (const size_t*)b; + { + const size_t *a_big = (const size_t*)a; + const size_t *b_big = (const size_t*)b; - while (*a_big == *b_big) - { - a_big++; - b_big++; - } - a = (const uint16_t*)a_big; - b = (const uint16_t*)b_big; + while (*a_big == *b_big) + { + a_big++; + b_big++; + } + a = (const uint16_t*)a_big; + b = (const uint16_t*)b_big; - while (*a == *b) - { - a++; - b++; - } - } - return a - a_org; + while (*a == *b) + { + a++; + b++; + } + } + return a - a_org; } #endif static inline size_t find_same(const uint16_t *a, const uint16_t *b) { - const uint16_t *a_org = a; + const uint16_t *a_org = a; #ifdef NO_UNALIGNED_MEM - if (((uintptr_t)a & (sizeof(uint32_t) - 1)) && *a != *b) - { - a++; - b++; - } - if (*a != *b) + if (((uintptr_t)a & (sizeof(uint32_t) - 1)) && *a != *b) + { + a++; + b++; + } + if (*a != *b) #endif - { - /* With this, it's random whether two consecutive identical + { + /* With this, it's random whether two consecutive identical * words are caught. * * Luckily, compression rate is the same for both cases, and @@ -365,24 +365,24 @@ static inline size_t find_same(const uint16_t *a, const uint16_t *b) * * (We prefer to miss two-word blocks, anyways; fewer iterations * of the outer loop, as well as in the decompressor.) */ - const uint32_t *a_big = (const uint32_t*)a; - const uint32_t *b_big = (const uint32_t*)b; + const uint32_t *a_big = (const uint32_t*)a; + const uint32_t *b_big = (const uint32_t*)b; - while (*a_big != *b_big) - { - a_big++; - b_big++; - } - a = (const uint16_t*)a_big; - b = (const uint16_t*)b_big; + while (*a_big != *b_big) + { + a_big++; + b_big++; + } + a = (const uint16_t*)a_big; + b = (const uint16_t*)b_big; - if (a != a_org && a[-1] == b[-1]) - { - a--; - b--; - } - } - return a - a_org; + if (a != a_org && a[-1] == b[-1]) + { + a--; + b--; + } + } + return a - a_org; } void state_manager_push_do(state_manager_t *state)