Skip to content

Commit abbfd8f

Browse files
committed
more casting
1 parent 5bb5c2f commit abbfd8f

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

src/horizontalbitpacking.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ static void SIMD_nullunpacker32(const uint8_t *, uint32_t *out) {
3131
static void simdhunpack1(const uint8_t * in,uint32_t * out) {
3232
__m128i* pCurr = reinterpret_cast<__m128i*>(out);
3333
const static __m128i andmask = _mm_set_epi8
34-
(-128,1<<6,1<<5,1<<4,1<<3,1<<2,1<<1,1<<0,-128,1<<6,1<<5,1<<4,1<<3,1<<2,1<<1,1<<0);
34+
((char)-128,(char)(1<<6),(char)(1<<5),(char)(1<<4),(char)(1<<3),(char)(1<<2),(char)(1<<1),(char)(1<<0),(char)-128,(char)(1<<6),(char)(1<<5),(char)(1<<4),(char)(1<<3),(char)(1<<2),(char)(1<<1),(char)(1<<0));
3535
const static __m128i shufmask = _mm_set_epi8
36-
(1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0);
37-
const static __m128i allones = _mm_set1_epi8 (1);
36+
((char)1,(char)1,(char)1,(char)1,(char)1,(char)1,(char)1,(char)1,(char)0,(char)0,(char)0,(char)0,(char)0,(char)0,(char)0,(char)0);
37+
const static __m128i allones = _mm_set1_epi8 ((char)1);
3838
const static __m128i finalshufmask1 = _mm_set_epi8
39-
(-128,-128,-128,3,-128,-128,-128,2,-128,-128,-128,1,-128,-128,-128,0);
39+
((char)-128,(char)-128,(char)-128,(char)3,(char)-128,(char)-128,(char)-128,(char)2,(char)-128,(char)-128,(char)-128,(char)1,(char)-128,(char)-128,(char)-128,(char)0);
4040
const static __m128i finalshufmask2 = _mm_set_epi8
41-
(-128,-128,-128,7,-128,-128,-128,6,-128,-128,-128,5,-128,-128,-128,4);
41+
((char)-128,(char)-128,(char)-128,(char)7,(char)-128,(char)-128,(char)-128,(char)6,(char)-128,(char)-128,(char)-128,(char)5,(char)-128,(char)-128,(char)-128,(char)4);
4242
const static __m128i finalshufmask3 = _mm_set_epi8
43-
(-128,-128,-128,11,-128,-128,-128,10,-128,-128,-128,9,-128,-128,-128,8);
43+
((char)-128,(char)-128,(char)-128,(char)11,(char)-128,(char)-128,(char)-128,(char)10,(char)-128,(char)-128,(char)-128,(char)9,(char)-128,(char)-128,(char)-128,(char)8);
4444
const static __m128i finalshufmask4 = _mm_set_epi8
45-
(-128,-128,-128,15,-128,-128,-128,14,-128,-128,-128,13,-128,-128,-128,12);
45+
((char)-128,(char)-128,(char)-128,(char)15,(char)-128,(char)-128,(char)-128,(char)14,(char)-128,(char)-128,(char)-128,(char)13,(char)-128,(char)-128,(char)-128,(char)12);
4646
for (uint32_t j = 0; j<8;++j) {
4747
__m128i ba = _mm_loadu_si128(reinterpret_cast<const __m128i*>(in + 2 *
4848
j));
@@ -151,17 +151,17 @@ static void simdhunpack4(const uint8_t * in,uint32_t * out) {
151151
152152
enum{ b = 4};
153153
__m128i* pCurr = reinterpret_cast<__m128i*>(out);
154-
const static __m128i shuf8 = _mm_set_epi8 (13,12, 15,14, 9,8, 11,10, 5,4,
155-
7,6, 1,0, 3,2);
154+
const static __m128i shuf8 = _mm_set_epi8 ((char)13,(char)12, (char)15,(char)14, (char)9,(char)8, (char)11,(char)10, (char)5,(char)4,
155+
(char)7,(char)6, (char)1,(char)0, (char)3,(char)2);
156156
const static __m128i shufoneoutoftwo = _mm_set1_epi32 (252645135);
157-
const static __m128i shufmid8_1 = _mm_set_epi8 (-128, -128, -128, 3, -128,
158-
-128, -128, 1, -128, -128, -128, 2, -128, -128, -128, 0);
159-
const static __m128i shufmid8_2 = _mm_set_epi8 (-128, -128, -128, 7, -128,
160-
-128, -128, 5, -128, -128, -128, 6, -128, -128, -128, 4);
161-
const static __m128i shufmid8_3 = _mm_set_epi8 (-128, -128, -128, 11, -128,
162-
-128, -128, 9, -128, -128, -128, 10, -128, -128, -128, 8);
163-
const static __m128i shufmid8_4 = _mm_set_epi8 (-128, -128, -128, 15, -128,
164-
-128, -128, 13, -128, -128, -128, 14, -128, -128, -128, 12);
157+
const static __m128i shufmid8_1 = _mm_set_epi8 ((char)-128, (char)-128, (char)-128, (char)3, (char)-128,
158+
(char)-128, (char)-128, (char)1, (char)-128, (char)-128, (char)-128, (char)2, (char)-128, (char)-128, (char)-128, (char)0);
159+
const static __m128i shufmid8_2 = _mm_set_epi8 ((char)-128, (char)-128, (char)-128, (char)7, (char)-128,
160+
(char)-128, (char)-128, (char)5, (char)-128, (char)-128, (char)-128, (char)6, (char)-128, (char)-128, (char)-128, (char)4);
161+
const static __m128i shufmid8_3 = _mm_set_epi8 ((char)-128, (char)-128, (char)-128, (char)11, (char)-128,
162+
(char)-128, (char)-128, (char)9, (char)-128, (char)-128, (char)-128, (char)10, (char)-128, (char)-128, (char)-128, (char)8);
163+
const static __m128i shufmid8_4 = _mm_set_epi8 ((char)-128, (char)-128, (char)-128, (char)15, (char)-128,
164+
(char)-128, (char)-128, (char)13, (char)-128, (char)-128, (char)-128, (char)14, (char)-128, (char)-128, (char)-128, (char)12);
165165
for (uint32_t j = 0; j<4;++j) {
166166
const __m128i ba = _mm_loadu_si128(reinterpret_cast<const __m128i*>(in +
167167
16 * j));
@@ -833,10 +833,10 @@ static void simdhunpack29(const uint8_t *in, uint32_t *out) {
833833
_mm_loadu_si128(reinterpret_cast<const __m128i *>(in + b * j));
834834
__m128i ca = _mm_blend_epi16(tmp, _mm_slli_epi64(tmp, 3), 236);
835835
const static __m128i x2 =
836-
_mm_set_epi8(14, 13, 12, 11, 10, 9, 8, 7, 7, 6, 5, 4, 3, 2, 1, 0);
836+
_mm_set_epi8((char)14, (char)13, (char)12, (char)11, (char)10, (char)9, (char)8, (char)7, (char)7, (char)6, (char)5, (char)4, (char)3, (char)2, (char)1, (char)0);
837837
ca = _mm_shuffle_epi8(ca, x2);
838838
const static __m128i x1 =
839-
_mm_set_epi8(14, 13, 12, 11, 10, 9, 8, 7, 7, 6, 5, 4, 3, 2, 1, 0);
839+
_mm_set_epi8((char)14, (char)13, (char)12, (char)11, (char)10, (char)9, (char)8, (char)7, (char)7, (char)6, (char)5, (char)4, (char)3, (char)2, (char)1, (char)0);
840840
ca = _mm_blend_epi16(ca, _mm_shuffle_epi8(tmp, x1), 51);
841841
ca = _mm_mullo_epi32(ca, multi1_29);
842842
ca = _mm_srli_epi32(ca, shift1);

0 commit comments

Comments
 (0)