Skip to content

M
MTProxy2
Commit b0e9c6b4 authored by Viktor Oreshkin's avatar Viktor Oreshkin Committed by vvaltman
Browse files
Options

Fix build for 32bit x86 

By making a contribution to this project, I certify that:

(1) The contribution was created in whole by me or is based upon
    previous work that, to the best of my knowledge, is in the
    public domain and I have the right to put it in the public domain.

(2) I understand and agree that this project and the contribution are
    public and that a record of the contribution (including all
    metadata and personal information I submit with it, including my
    sign-off) is maintained indefinitely and may be redistributed.

(3) I am granting this work into the public domain.
Signed-off-by: 's avatarViktor Oreshkin <imselfish@stek29.rocks>
parent e231d049
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 24 deletions
Makefile
View file @ b0e9c6b4
......@@ -4,8 +4,10 @@ EXE = ${OBJ}/bin
COMMIT := $(shell git log -1 --pretty=format:"%H")
CFLAGS = -m64 -O3 -std=gnu11 -Wall -mpclmul -march=core2 -mfpmath=sse -mssse3 -fno-strict-aliasing -fno-strict-overflow -fwrapv -DAES=1 -DCOMMIT=\"${COMMIT}\" -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64
LDFLAGS = -m64 -ggdb -rdynamic -lm -lrt -lcrypto -lz -lpthread -lcrypto
ARCH=-m32
CFLAGS = $(ARCH) -O3 -std=gnu11 -Wall -mpclmul -march=core2 -mfpmath=sse -mssse3 -fno-strict-aliasing -fno-strict-overflow -fwrapv -DAES=1 -DCOMMIT=\"${COMMIT}\" -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64
LDFLAGS = $(ARCH) -ggdb -rdynamic -lm -lrt -lcrypto -lz -lpthread -lcrypto
LIB = ${OBJ}/lib
CINCLUDE = -iquote common -iquote .
......
common/crc32.c
View file @ b0e9c6b4
......@@ -31,6 +31,65 @@
#include "common/cpuid.h"
#include "common/kprintf.h"
#define FASTMOV_RMI32_TO_SSE(dst, src) \
asm volatile ("movd %1, %0\n\t" : "=x" (dst) : "g" (src))
#ifdef __LP64__
#define FASTMOV_SSE_TO_LO_HI_DW(sse, lo, hi)\
do {\
uint64_t T; \
asm volatile ("movq %1, %0\n\t" : "=r" (T) : "x" (sse)); \
lo = (uint32_t) T; \
hi = (uint32_t) (T >> 32); \
} while(0)
#else
#define FASTMOV_SSE_TO_LO_HI_DW(sse, lo, hi)\
do {\
asm volatile ("movd %1, %0\n\t" : "=r" (lo) : "x" (sse)); \
sse = __builtin_ia32_psrldqi128(sse, 32); \
asm volatile ("movd %1, %0\n\t" : "=r" (hi) : "x" (sse)); \
} while(0)
#endif
#ifdef __LP64__
#define RETURN_SSE_UINT64(sse)\
do {\
uint64_t T; \
asm volatile ("movq %1, %0\n\t" : "=r" (T) : "x" (sse)); \
return T; \
} while(0)
// RMI == reg, mem, imm
#define FASTMOV_RMI64_TO_SSE(dst, src) \
asm volatile ("movq %1, %0\n\t" : "=x" (dst) : "g" (src))
#else
#define RETURN_SSE_UINT64(sse)\
do {\
uint32_t lo, hi;\
FASTMOV_SSE_TO_LO_HI_DW(sse, lo, hi);\
uint64_t T; \
T = (((uint64_t)hi)<<32) | lo; \
return T; \
} while(0)
#define FASTMOV_RMI64_TO_SSE(dst, src) \
do { \
uint64_t T = src; \
asm volatile ("movsd %1, %0\n\t" : "=x" (dst) : "m" (T)); \
} while(0)
#endif
static const unsigned int crc32_table[256] =
{
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
......@@ -440,7 +499,7 @@ unsigned crc32_partial_clmul (const void *data, long len, unsigned crc) {
{
v2di C;
asm volatile ("movd %1, %0\n\t" : "=x" (C) : "g" (crc));
FASTMOV_RMI32_TO_SSE(C, crc);
asm volatile ("pcmpeqw %0, %0\n\t" : "=x" (G)); //G := 2 ^ 128 - 1
H = (v2di) __builtin_ia32_loaddqu (mask + o);
......@@ -462,20 +521,20 @@ unsigned crc32_partial_clmul (const void *data, long len, unsigned crc) {
D ^= (v2di) __builtin_ia32_pclmulqdq128 (D, CRC32_K64, 0x10);
uint64_t T;
unsigned lo, hi;
#ifdef CRC32_BARRETT_REDUCTION
H = (v2di) __builtin_ia32_punpckhdq128 ((v4si) (G ^ G), (v4si) D);
H = (v2di) __builtin_ia32_pclmulqdq128 (H, CRC32_MU, 0x00);
H = (v2di) __builtin_ia32_pclmulqdq128 (H, CRC32_MU, 0x10);
D ^= __builtin_ia32_pslldqi128 (H, 32);
D = __builtin_ia32_punpckhqdq128 (D, D);
asm volatile ("movq %1, %0\n\t" : "=r" (T) : "x" (D));
return (unsigned) (T >> 32);
FASTMOV_SSE_TO_LO_HI_DW(D, lo, hi);
return hi;
#else
D = __builtin_ia32_punpckhqdq128 (D, D);
asm volatile ("movq %1, %0\n\t" : "=r" (T) : "x" (D));
crc = (unsigned) T;
return crc32_table0[crc & 0xff] ^ crc32_table1[(crc & 0xff00) >> 8] ^ crc32_table2[(crc & 0xff0000) >> 16] ^ crc32_table[crc >> 24] ^ ((unsigned) (T >> 32));
FASTMOV_SSE_TO_LO_HI_DW(D, lo, hi);
return crc32_table0[lo & 0xff] ^ crc32_table1[(lo & 0xff00) >> 8] ^ crc32_table2[(lo & 0xff0000) >> 16] ^ crc32_table[lo >> 24] ^ ((unsigned) hi);
#endif
}
......@@ -571,9 +630,7 @@ static uint64_t crc64_barrett_reduction (v2di D) {
D ^= __builtin_ia32_pclmulqdq128 (E, CRC64_MU, 0x10);
D = __builtin_ia32_punpckhqdq128 (D, D);
D ^= E;
uint64_t T;
asm volatile ("movq %1, %0\n\t" : "=r" (T) : "x" (D));
return T;
RETURN_SSE_UINT64(D);
}
uint64_t crc64_partial_clmul (const void *data, long len, uint64_t crc) {
......@@ -586,7 +643,7 @@ uint64_t crc64_partial_clmul (const void *data, long len, uint64_t crc) {
int o = (int)(32 - ((uintptr_t) data & 15));
v2di D = (* (v2di *) q), E = (*(v2di *)(q + 16)), C, G, H;
asm volatile ("movq %1, %0\n\t" : "=x" (C) : "g" (crc));
FASTMOV_RMI64_TO_SSE(C, crc);
asm volatile ("pcmpeqw %0, %0\n\t" : "=x" (G)); //G := 2 ^ 128 - 1
H = (v2di) __builtin_ia32_loaddqu (mask + o);
......@@ -701,7 +758,7 @@ unsigned gf32_combine_generic (unsigned *powers, unsigned crc1, int64_t len2) {
uint64_t gf32_combine_clmul (unsigned *powers, unsigned crc1, int64_t len2) {
v2di D;
asm volatile ("movd %1, %0\n\t" : "=x" (D) : "g" (crc1));
FASTMOV_RMI32_TO_SSE(D, crc1);
D = __builtin_ia32_pslldqi128 (D, 96);
int n = __builtin_ffsll (len2);
......@@ -721,9 +778,7 @@ uint64_t gf32_combine_clmul (unsigned *powers, unsigned crc1, int64_t len2) {
D ^= (v2di) __builtin_ia32_pclmulqdq128 (* ((v2di *) (powers + 12)), D, 0x01);
D = __builtin_ia32_punpckhqdq128 (D, D);
uint64_t T;
asm volatile ("movq %1, %0\n\t" : "=r" (T) : "x" (D));
return T;
RETURN_SSE_UINT64(D);
}
/* }}} */
......@@ -827,7 +882,7 @@ static uint64_t compute_crc64_combine_clmul (uint64_t crc1, uint64_t crc2, int64
crc64_init_power_buf ();
}
v2di D;
asm volatile ("movq %1, %0\n\t" : "=x" (D) : "g" (crc1));
FASTMOV_RMI64_TO_SSE(D, crc1);
D = __builtin_ia32_pslldqi128 (D, 64);
int n = __builtin_ffsll (len2);
......
common/crc32c.c
View file @ b0e9c6b4
......@@ -297,6 +297,12 @@ static unsigned crc32c_table0[256] = {
0x4a21617b, 0x9764cbc3, 0xf54642fa, 0x2803e842,
};
#define CRC32C_REFLECTED_X1023 0x7417153fll
#define CRC32C_REFLECTED_X2047 0x1426a815ll
#define CRC32C_REFLECTED_X4095 0xe986c148ll
#define CRC32C_REFLECTED_X8191 0xcdc220ddll
#define CRC32C_REFLECTED_X16383 0x1acaec54ll
#ifdef __LP64__
static unsigned crc32c_partial_sse42 (const void *data, long len, unsigned crc) {
const char *p = data;
......@@ -331,12 +337,6 @@ static unsigned crc32c_partial_sse42 (const void *data, long len, unsigned crc)
return c;
}
#define CRC32C_REFLECTED_X1023 0x7417153fll
#define CRC32C_REFLECTED_X2047 0x1426a815ll
#define CRC32C_REFLECTED_X4095 0xe986c148ll
#define CRC32C_REFLECTED_X8191 0xcdc220ddll
#define CRC32C_REFLECTED_X16383 0x1acaec54ll
static unsigned crc32c_partial_sse42_clmul (const void *data, long len, unsigned crc) {
const char *p = data;
if (unlikely ((((uintptr_t) p) & 1)) && (len > 0)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment