react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/C/XzCrc64.c

@@ -1,5 +1,5 @@
 /* XzCrc64.c -- CRC64 calculation
-2023-12-08 : Igor Pavlov : Public domain */
+2017-05-23 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
@@ -8,76 +8,45 @@
 
 #define kCrc64Poly UINT64_CONST(0xC96C5795D7870F42)
 
-// for debug only : define Z7_CRC64_DEBUG_BE to test big-endian code in little-endian cpu
-// #define Z7_CRC64_DEBUG_BE
-#ifdef Z7_CRC64_DEBUG_BE
-#undef MY_CPU_LE
-#define MY_CPU_BE
-#endif
-
-#ifdef Z7_CRC64_NUM_TABLES
-  #define Z7_CRC64_NUM_TABLES_USE  Z7_CRC64_NUM_TABLES
+#ifdef MY_CPU_LE
+  #define CRC64_NUM_TABLES 4
 #else
-  #define Z7_CRC64_NUM_TABLES_USE  12
-#endif
-
-#if Z7_CRC64_NUM_TABLES_USE < 1
-  #error Stop_Compiling_Bad_Z7_CRC_NUM_TABLES
+  #define CRC64_NUM_TABLES 5
+  #define CRC_UINT64_SWAP(v) \
+      ((v >> 56) \
+    | ((v >> 40) & ((UInt64)0xFF <<  8)) \
+    | ((v >> 24) & ((UInt64)0xFF << 16)) \
+    | ((v >>  8) & ((UInt64)0xFF << 24)) \
+    | ((v <<  8) & ((UInt64)0xFF << 32)) \
+    | ((v << 24) & ((UInt64)0xFF << 40)) \
+    | ((v << 40) & ((UInt64)0xFF << 48)) \
+    | ((v << 56)))
+
+  UInt64 MY_FAST_CALL XzCrc64UpdateT1_BeT4(UInt64 v, const void *data, size_t size, const UInt64 *table);
 #endif
 
-
-#if Z7_CRC64_NUM_TABLES_USE != 1
-
 #ifndef MY_CPU_BE
-  #define FUNC_NAME_LE_2(s)   XzCrc64UpdateT ## s
-  #define FUNC_NAME_LE_1(s)   FUNC_NAME_LE_2(s)
-  #define FUNC_NAME_LE        FUNC_NAME_LE_1(Z7_CRC64_NUM_TABLES_USE)
-  UInt64 Z7_FASTCALL FUNC_NAME_LE (UInt64 v, const void *data, size_t size, const UInt64 *table);
-#endif
-#ifndef MY_CPU_LE
-  #define FUNC_NAME_BE_2(s)   XzCrc64UpdateBeT ## s
-  #define FUNC_NAME_BE_1(s)   FUNC_NAME_BE_2(s)
-  #define FUNC_NAME_BE        FUNC_NAME_BE_1(Z7_CRC64_NUM_TABLES_USE)
-  UInt64 Z7_FASTCALL FUNC_NAME_BE (UInt64 v, const void *data, size_t size, const UInt64 *table);
+  UInt64 MY_FAST_CALL XzCrc64UpdateT4(UInt64 v, const void *data, size_t size, const UInt64 *table);
 #endif
 
-#if defined(MY_CPU_LE)
-  #define FUNC_REF  FUNC_NAME_LE
-#elif defined(MY_CPU_BE)
-  #define FUNC_REF  FUNC_NAME_BE
-#else
-  #define FUNC_REF  g_Crc64Update
-  static UInt64 (Z7_FASTCALL *FUNC_REF)(UInt64 v, const void *data, size_t size, const UInt64 *table);
-#endif
-
-#endif
+typedef UInt64 (MY_FAST_CALL *CRC64_FUNC)(UInt64 v, const void *data, size_t size, const UInt64 *table);
 
+static CRC64_FUNC g_Crc64Update;
+UInt64 g_Crc64Table[256 * CRC64_NUM_TABLES];
 
-MY_ALIGN(64)
-static UInt64 g_Crc64Table[256 * Z7_CRC64_NUM_TABLES_USE];
-
-
-UInt64 Z7_FASTCALL Crc64Update(UInt64 v, const void *data, size_t size)
+UInt64 MY_FAST_CALL Crc64Update(UInt64 v, const void *data, size_t size)
 {
-#if Z7_CRC64_NUM_TABLES_USE == 1
-  #define CRC64_UPDATE_BYTE_2(crc, b)  (table[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
-  const UInt64 *table = g_Crc64Table;
-  const Byte *p = (const Byte *)data;
-  const Byte *lim = p + size;
-  for (; p != lim; p++)
-    v = CRC64_UPDATE_BYTE_2(v, *p);
-  return v;
-  #undef CRC64_UPDATE_BYTE_2
-#else
-  return FUNC_REF (v, data, size, g_Crc64Table);
-#endif
+  return g_Crc64Update(v, data, size, g_Crc64Table);
 }
 
+UInt64 MY_FAST_CALL Crc64Calc(const void *data, size_t size)
+{
+  return g_Crc64Update(CRC64_INIT_VAL, data, size, g_Crc64Table) ^ CRC64_INIT_VAL;
+}
 
-Z7_NO_INLINE
-void Z7_FASTCALL Crc64GenerateTable(void)
+void MY_FAST_CALL Crc64GenerateTable()
 {
-  unsigned i;
+  UInt32 i;
   for (i = 0; i < 256; i++)
   {
     UInt64 r = i;
@@ -86,55 +55,32 @@ void Z7_FASTCALL Crc64GenerateTable(void)
       r = (r >> 1) ^ (kCrc64Poly & ((UInt64)0 - (r & 1)));
     g_Crc64Table[i] = r;
   }
-
-#if Z7_CRC64_NUM_TABLES_USE != 1
-#if 1 || 1 && defined(MY_CPU_X86) // low register count
-  for (i = 0; i < 256 * (Z7_CRC64_NUM_TABLES_USE - 1); i++)
-  {
-    const UInt64 r0 = g_Crc64Table[(size_t)i];
-    g_Crc64Table[(size_t)i + 256] = g_Crc64Table[(Byte)r0] ^ (r0 >> 8);
-  }
-#else
-  for (i = 0; i < 256 * (Z7_CRC64_NUM_TABLES_USE - 1); i += 2)
+  for (i = 256; i < 256 * CRC64_NUM_TABLES; i++)
   {
-    UInt64 r0 = g_Crc64Table[(size_t)(i)    ];
-    UInt64 r1 = g_Crc64Table[(size_t)(i) + 1];
-    r0 = g_Crc64Table[(Byte)r0] ^ (r0 >> 8);
-    r1 = g_Crc64Table[(Byte)r1] ^ (r1 >> 8);
-    g_Crc64Table[(size_t)i + 256    ] = r0;
-    g_Crc64Table[(size_t)i + 256 + 1] = r1;
+    UInt64 r = g_Crc64Table[(size_t)i - 256];
+    g_Crc64Table[i] = g_Crc64Table[r & 0xFF] ^ (r >> 8);
   }
-#endif
+  
+  #ifdef MY_CPU_LE
+
+  g_Crc64Update = XzCrc64UpdateT4;
 
-#ifndef MY_CPU_LE
+  #else
   {
-#ifndef MY_CPU_BE
+    #ifndef MY_CPU_BE
     UInt32 k = 1;
     if (*(const Byte *)&k == 1)
-      FUNC_REF = FUNC_NAME_LE;
+      g_Crc64Update = XzCrc64UpdateT4;
     else
-#endif
+    #endif
     {
-#ifndef MY_CPU_BE
-      FUNC_REF = FUNC_NAME_BE;
-#endif
-      for (i = 0; i < 256 * Z7_CRC64_NUM_TABLES_USE; i++)
+      for (i = 256 * CRC64_NUM_TABLES - 1; i >= 256; i--)
       {
-        const UInt64 x = g_Crc64Table[i];
-        g_Crc64Table[i] = Z7_BSWAP64(x);
+        UInt64 x = g_Crc64Table[(size_t)i - 256];
+        g_Crc64Table[i] = CRC_UINT64_SWAP(x);
       }
+      g_Crc64Update = XzCrc64UpdateT1_BeT4;
     }
   }
-#endif // ndef MY_CPU_LE
-#endif // Z7_CRC64_NUM_TABLES_USE != 1
+  #endif
 }
-
-#undef kCrc64Poly
-#undef Z7_CRC64_NUM_TABLES_USE
-#undef FUNC_REF
-#undef FUNC_NAME_LE_2
-#undef FUNC_NAME_LE_1
-#undef FUNC_NAME_LE
-#undef FUNC_NAME_BE_2
-#undef FUNC_NAME_BE_1
-#undef FUNC_NAME_BE

package/harmony/pushy/src/main/cpp/lzma/C/XzCrc64.h

@@ -1,8 +1,8 @@
 /* XzCrc64.h -- CRC64 calculation
-2023-12-08 : Igor Pavlov : Public domain */
+2013-01-18 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_XZ_CRC64_H
-#define ZIP7_INC_XZ_CRC64_H
+#ifndef __XZ_CRC64_H
+#define __XZ_CRC64_H
 
 #include <stddef.h>
 
@@ -10,16 +10,16 @@
 
 EXTERN_C_BEGIN
 
-// extern UInt64 g_Crc64Table[];
+extern UInt64 g_Crc64Table[];
 
-void Z7_FASTCALL Crc64GenerateTable(void);
+void MY_FAST_CALL Crc64GenerateTable(void);
 
 #define CRC64_INIT_VAL UINT64_CONST(0xFFFFFFFFFFFFFFFF)
 #define CRC64_GET_DIGEST(crc) ((crc) ^ CRC64_INIT_VAL)
-// #define CRC64_UPDATE_BYTE(crc, b) (g_Crc64Table[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
+#define CRC64_UPDATE_BYTE(crc, b) (g_Crc64Table[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
 
-UInt64 Z7_FASTCALL Crc64Update(UInt64 crc, const void *data, size_t size);
-// UInt64 Z7_FASTCALL Crc64Calc(const void *data, size_t size);
+UInt64 MY_FAST_CALL Crc64Update(UInt64 crc, const void *data, size_t size);
+UInt64 MY_FAST_CALL Crc64Calc(const void *data, size_t size);
 
 EXTERN_C_END
 

package/harmony/pushy/src/main/cpp/lzma/C/XzCrc64Opt.c

@@ -1,261 +1,69 @@
-/* XzCrc64Opt.c -- CRC64 calculation (optimized functions)
-: Igor Pavlov : Public domain */
+/* XzCrc64Opt.c -- CRC64 calculation
+2017-06-30 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
 #include "CpuArch.h"
 
-#if !defined(Z7_CRC64_NUM_TABLES) || Z7_CRC64_NUM_TABLES > 1
-
-// for debug only : define Z7_CRC64_DEBUG_BE to test big-endian code in little-endian cpu
-// #define Z7_CRC64_DEBUG_BE
-#ifdef Z7_CRC64_DEBUG_BE
-#undef MY_CPU_LE
-#define MY_CPU_BE
-#endif
-
-#if defined(MY_CPU_64BIT)
-#define Z7_CRC64_USE_64BIT
-#endif
-
-// the value Z7_CRC64_NUM_TABLES_USE must be defined to same value as in XzCrc64.c
-#ifdef Z7_CRC64_NUM_TABLES
-#define Z7_CRC64_NUM_TABLES_USE  Z7_CRC64_NUM_TABLES
-#else
-#define Z7_CRC64_NUM_TABLES_USE  12
-#endif
-
-#if Z7_CRC64_NUM_TABLES_USE % 4 || \
-    Z7_CRC64_NUM_TABLES_USE < 4 || \
-    Z7_CRC64_NUM_TABLES_USE > 4 * 4
-  #error Stop_Compiling_Bad_CRC64_NUM_TABLES
-#endif
-
-
 #ifndef MY_CPU_BE
 
-#define CRC64_UPDATE_BYTE_2(crc, b)  (table[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
-
-#if defined(Z7_CRC64_USE_64BIT) && (Z7_CRC64_NUM_TABLES_USE % 8 == 0)
-
-#define Q64LE(n, d) \
-    ( (table + ((n) * 8 + 7) * 0x100)[((d)         ) & 0xFF] \
-    ^ (table + ((n) * 8 + 6) * 0x100)[((d) >> 1 * 8) & 0xFF] \
-    ^ (table + ((n) * 8 + 5) * 0x100)[((d) >> 2 * 8) & 0xFF] \
-    ^ (table + ((n) * 8 + 4) * 0x100)[((d) >> 3 * 8) & 0xFF] \
-    ^ (table + ((n) * 8 + 3) * 0x100)[((d) >> 4 * 8) & 0xFF] \
-    ^ (table + ((n) * 8 + 2) * 0x100)[((d) >> 5 * 8) & 0xFF] \
-    ^ (table + ((n) * 8 + 1) * 0x100)[((d) >> 6 * 8) & 0xFF] \
-    ^ (table + ((n) * 8 + 0) * 0x100)[((d) >> 7 * 8)] )
-
-#define R64(a)  *((const UInt64 *)(const void *)p + (a))
-
-#else
-
-#define Q32LE(n, d) \
-    ( (table + ((n) * 4 + 3) * 0x100)[((d)         ) & 0xFF] \
-    ^ (table + ((n) * 4 + 2) * 0x100)[((d) >> 1 * 8) & 0xFF] \
-    ^ (table + ((n) * 4 + 1) * 0x100)[((d) >> 2 * 8) & 0xFF] \
-    ^ (table + ((n) * 4 + 0) * 0x100)[((d) >> 3 * 8)] )
-
-#define R32(a)  *((const UInt32 *)(const void *)p + (a))
-
-#endif
-
-
-#define CRC64_FUNC_PRE_LE2(step) \
-UInt64 Z7_FASTCALL XzCrc64UpdateT ## step (UInt64 v, const void *data, size_t size, const UInt64 *table)
-
-#define CRC64_FUNC_PRE_LE(step)   \
-        CRC64_FUNC_PRE_LE2(step); \
-        CRC64_FUNC_PRE_LE2(step)
+#define CRC64_UPDATE_BYTE_2(crc, b) (table[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
 
-CRC64_FUNC_PRE_LE(Z7_CRC64_NUM_TABLES_USE)
+UInt64 MY_FAST_CALL XzCrc64UpdateT4(UInt64 v, const void *data, size_t size, const UInt64 *table)
 {
   const Byte *p = (const Byte *)data;
-  const Byte *lim;
-  for (; size && ((unsigned)(ptrdiff_t)p & (7 - (Z7_CRC64_NUM_TABLES_USE & 4))) != 0; size--, p++)
+  for (; size > 0 && ((unsigned)(ptrdiff_t)p & 3) != 0; size--, p++)
     v = CRC64_UPDATE_BYTE_2(v, *p);
-  lim = p + size;
-  if (size >= Z7_CRC64_NUM_TABLES_USE)
+  for (; size >= 4; size -= 4, p += 4)
   {
-    lim -= Z7_CRC64_NUM_TABLES_USE;
-    do
-    {
-#if Z7_CRC64_NUM_TABLES_USE == 4
-      const UInt32 d = (UInt32)v ^ R32(0);
-      v = (v >> 32) ^ Q32LE(0, d);
-#elif Z7_CRC64_NUM_TABLES_USE == 8
-#ifdef Z7_CRC64_USE_64BIT
-      v ^= R64(0);
-      v = Q64LE(0, v);
-#else
-      UInt32 v0, v1;
-      v0 = (UInt32)v         ^ R32(0);
-      v1 = (UInt32)(v >> 32) ^ R32(1);
-      v = Q32LE(1, v0) ^ Q32LE(0, v1);
-#endif
-#elif Z7_CRC64_NUM_TABLES_USE == 12
-      UInt32 w;
-      UInt32 v0, v1;
-      v0 = (UInt32)v         ^ R32(0);
-      v1 = (UInt32)(v >> 32) ^ R32(1);
-      w = R32(2);
-      v = Q32LE(0, w);
-      v ^= Q32LE(2, v0) ^ Q32LE(1, v1);
-#elif Z7_CRC64_NUM_TABLES_USE == 16
-#ifdef Z7_CRC64_USE_64BIT
-      UInt64 w;
-      UInt64 x;
-      w  = R64(1);      x = Q64LE(0, w);
-      v ^= R64(0);  v = x ^ Q64LE(1, v);
-#else
-      UInt32 v0, v1;
-      UInt32 r0, r1;
-      v0 = (UInt32)v         ^ R32(0);
-      v1 = (UInt32)(v >> 32) ^ R32(1);
-      r0 =                     R32(2);
-      r1 =                     R32(3);
-      v  = Q32LE(1, r0) ^ Q32LE(0, r1);
-      v ^= Q32LE(3, v0) ^ Q32LE(2, v1);
-#endif
-#else
-#error Stop_Compiling_Bad_CRC64_NUM_TABLES
-#endif
-      p += Z7_CRC64_NUM_TABLES_USE;
-    }
-    while (p <= lim);
-    lim += Z7_CRC64_NUM_TABLES_USE;
+    UInt32 d = (UInt32)v ^ *(const UInt32 *)p;
+    v = (v >> 32)
+        ^ (table + 0x300)[((d      ) & 0xFF)]
+        ^ (table + 0x200)[((d >>  8) & 0xFF)]
+        ^ (table + 0x100)[((d >> 16) & 0xFF)]
+        ^ (table + 0x000)[((d >> 24))];
   }
-  for (; p < lim; p++)
+  for (; size > 0; size--, p++)
     v = CRC64_UPDATE_BYTE_2(v, *p);
   return v;
 }
 
-#undef CRC64_UPDATE_BYTE_2
-#undef R32
-#undef R64
-#undef Q32LE
-#undef Q64LE
-#undef CRC64_FUNC_PRE_LE
-#undef CRC64_FUNC_PRE_LE2
-
 #endif
 
 
-
-
 #ifndef MY_CPU_LE
 
-#define CRC64_UPDATE_BYTE_2_BE(crc, b)  (table[((crc) >> 56) ^ (b)] ^ ((crc) << 8))
-
-#if defined(Z7_CRC64_USE_64BIT) && (Z7_CRC64_NUM_TABLES_USE % 8 == 0)
-
-#define Q64BE(n, d) \
-    ( (table + ((n) * 8 + 0) * 0x100)[(Byte)(d)] \
-    ^ (table + ((n) * 8 + 1) * 0x100)[((d) >> 1 * 8) & 0xFF] \
-    ^ (table + ((n) * 8 + 2) * 0x100)[((d) >> 2 * 8) & 0xFF] \
-    ^ (table + ((n) * 8 + 3) * 0x100)[((d) >> 3 * 8) & 0xFF] \
-    ^ (table + ((n) * 8 + 4) * 0x100)[((d) >> 4 * 8) & 0xFF] \
-    ^ (table + ((n) * 8 + 5) * 0x100)[((d) >> 5 * 8) & 0xFF] \
-    ^ (table + ((n) * 8 + 6) * 0x100)[((d) >> 6 * 8) & 0xFF] \
-    ^ (table + ((n) * 8 + 7) * 0x100)[((d) >> 7 * 8)] )
-
-#ifdef Z7_CRC64_DEBUG_BE
-  #define R64BE(a)  GetBe64a((const UInt64 *)(const void *)p + (a))
-#else
-  #define R64BE(a)         *((const UInt64 *)(const void *)p + (a))
-#endif
-
-#else
+#define CRC_UINT64_SWAP(v) \
+      ((v >> 56) \
+    | ((v >> 40) & ((UInt64)0xFF <<  8)) \
+    | ((v >> 24) & ((UInt64)0xFF << 16)) \
+    | ((v >>  8) & ((UInt64)0xFF << 24)) \
+    | ((v <<  8) & ((UInt64)0xFF << 32)) \
+    | ((v << 24) & ((UInt64)0xFF << 40)) \
+    | ((v << 40) & ((UInt64)0xFF << 48)) \
+    | ((v << 56)))
 
-#define Q32BE(n, d) \
-    ( (table + ((n) * 4 + 0) * 0x100)[(Byte)(d)] \
-    ^ (table + ((n) * 4 + 1) * 0x100)[((d) >> 1 * 8) & 0xFF] \
-    ^ (table + ((n) * 4 + 2) * 0x100)[((d) >> 2 * 8) & 0xFF] \
-    ^ (table + ((n) * 4 + 3) * 0x100)[((d) >> 3 * 8)] )
+#define CRC64_UPDATE_BYTE_2_BE(crc, b) (table[(Byte)((crc) >> 56) ^ (b)] ^ ((crc) << 8))
 
-#ifdef Z7_CRC64_DEBUG_BE
-  #define R32BE(a)  GetBe32a((const UInt32 *)(const void *)p + (a))
-#else
-  #define R32BE(a)         *((const UInt32 *)(const void *)p + (a))
-#endif
-
-#endif
-
-#define CRC64_FUNC_PRE_BE2(step) \
-UInt64 Z7_FASTCALL XzCrc64UpdateBeT ## step (UInt64 v, const void *data, size_t size, const UInt64 *table)
-
-#define CRC64_FUNC_PRE_BE(step)   \
-        CRC64_FUNC_PRE_BE2(step); \
-        CRC64_FUNC_PRE_BE2(step)
-
-CRC64_FUNC_PRE_BE(Z7_CRC64_NUM_TABLES_USE)
+UInt64 MY_FAST_CALL XzCrc64UpdateT1_BeT4(UInt64 v, const void *data, size_t size, const UInt64 *table)
 {
   const Byte *p = (const Byte *)data;
-  const Byte *lim;
-  v = Z7_BSWAP64(v);
-  for (; size && ((unsigned)(ptrdiff_t)p & (7 - (Z7_CRC64_NUM_TABLES_USE & 4))) != 0; size--, p++)
+  table += 0x100;
+  v = CRC_UINT64_SWAP(v);
+  for (; size > 0 && ((unsigned)(ptrdiff_t)p & 3) != 0; size--, p++)
     v = CRC64_UPDATE_BYTE_2_BE(v, *p);
-  lim = p + size;
-  if (size >= Z7_CRC64_NUM_TABLES_USE)
+  for (; size >= 4; size -= 4, p += 4)
   {
-    lim -= Z7_CRC64_NUM_TABLES_USE;
-    do
-    {
-#if   Z7_CRC64_NUM_TABLES_USE == 4
-      const UInt32 d = (UInt32)(v >> 32) ^ R32BE(0);
-      v = (v << 32) ^ Q32BE(0, d);
-#elif Z7_CRC64_NUM_TABLES_USE == 12
-      const UInt32 d1 = (UInt32)(v >> 32) ^ R32BE(0);
-      const UInt32 d0 = (UInt32)(v      ) ^ R32BE(1);
-      const UInt32 w =                      R32BE(2);
-      v  = Q32BE(0, w);
-      v ^= Q32BE(2, d1) ^ Q32BE(1, d0);
-
-#elif Z7_CRC64_NUM_TABLES_USE == 8
-  #ifdef Z7_CRC64_USE_64BIT
-      v ^= R64BE(0);
-      v  = Q64BE(0, v);
-  #else
-      const UInt32 d1 = (UInt32)(v >> 32) ^ R32BE(0);
-      const UInt32 d0 = (UInt32)(v      ) ^ R32BE(1);
-      v = Q32BE(1, d1) ^ Q32BE(0, d0);
-  #endif
-#elif Z7_CRC64_NUM_TABLES_USE == 16
-  #ifdef Z7_CRC64_USE_64BIT
-      const UInt64 w = R64BE(1);
-      v ^= R64BE(0);
-      v  = Q64BE(0, w) ^ Q64BE(1, v);
-  #else
-      const UInt32 d1 = (UInt32)(v >> 32) ^ R32BE(0);
-      const UInt32 d0 = (UInt32)(v      ) ^ R32BE(1);
-      const UInt32 w1 =                     R32BE(2);
-      const UInt32 w0 =                     R32BE(3);
-      v  = Q32BE(1, w1) ^ Q32BE(0, w0);
-      v ^= Q32BE(3, d1) ^ Q32BE(2, d0);
-  #endif
-#else
-#error Stop_Compiling_Bad_CRC64_NUM_TABLES
-#endif
-      p += Z7_CRC64_NUM_TABLES_USE;
-    }
-    while (p <= lim);
-    lim += Z7_CRC64_NUM_TABLES_USE;
+    UInt32 d = (UInt32)(v >> 32) ^ *(const UInt32 *)p;
+    v = (v << 32)
+        ^ (table + 0x000)[((d      ) & 0xFF)]
+        ^ (table + 0x100)[((d >>  8) & 0xFF)]
+        ^ (table + 0x200)[((d >> 16) & 0xFF)]
+        ^ (table + 0x300)[((d >> 24))];
   }
-  for (; p < lim; p++)
+  for (; size > 0; size--, p++)
     v = CRC64_UPDATE_BYTE_2_BE(v, *p);
-  return Z7_BSWAP64(v);
+  return CRC_UINT64_SWAP(v);
 }
 
-#undef CRC64_UPDATE_BYTE_2_BE
-#undef R32BE
-#undef R64BE
-#undef Q32BE
-#undef Q64BE
-#undef CRC64_FUNC_PRE_BE
-#undef CRC64_FUNC_PRE_BE2
-
-#endif
-#undef Z7_CRC64_NUM_TABLES_USE
 #endif