react-native-update 10.34.3 → 10.34.5

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

@@ -1,123 +1,104 @@
-/* Ppmd7Enc.c -- Ppmd7z (PPMdH with 7z Range Coder) Encoder
-2023-09-07 : Igor Pavlov : Public domain
-This code is based on:
-  PPMd var.H (2001): Dmitry Shkarin : Public domain */
-
+/* Ppmd7Enc.c -- PPMdH Encoder
+2017-04-03 : Igor Pavlov : Public domain
+This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
 
 #include "Precomp.h"
 
 #include "Ppmd7.h"
 
-#define kTopValue ((UInt32)1 << 24)
-
-#define R (&p->rc.enc)
+#define kTopValue (1 << 24)
 
-void Ppmd7z_Init_RangeEnc(CPpmd7 *p)
+void Ppmd7z_RangeEnc_Init(CPpmd7z_RangeEnc *p)
 {
-  R->Low = 0;
-  R->Range = 0xFFFFFFFF;
-  R->Cache = 0;
-  R->CacheSize = 1;
+  p->Low = 0;
+  p->Range = 0xFFFFFFFF;
+  p->Cache = 0;
+  p->CacheSize = 1;
 }
 
-Z7_NO_INLINE
-static void Ppmd7z_RangeEnc_ShiftLow(CPpmd7 *p)
+static void RangeEnc_ShiftLow(CPpmd7z_RangeEnc *p)
 {
-  if ((UInt32)R->Low < (UInt32)0xFF000000 || (unsigned)(R->Low >> 32) != 0)
+  if ((UInt32)p->Low < (UInt32)0xFF000000 || (unsigned)(p->Low >> 32) != 0)
   {
-    Byte temp = R->Cache;
+    Byte temp = p->Cache;
     do
     {
-      IByteOut_Write(R->Stream, (Byte)(temp + (Byte)(R->Low >> 32)));
+      IByteOut_Write(p->Stream, (Byte)(temp + (Byte)(p->Low >> 32)));
       temp = 0xFF;
     }
-    while (--R->CacheSize != 0);
-    R->Cache = (Byte)((UInt32)R->Low >> 24);
+    while (--p->CacheSize != 0);
+    p->Cache = (Byte)((UInt32)p->Low >> 24);
   }
-  R->CacheSize++;
-  R->Low = (UInt32)((UInt32)R->Low << 8);
+  p->CacheSize++;
+  p->Low = (UInt32)p->Low << 8;
 }
 
-#define RC_NORM_BASE(p) if (R->Range < kTopValue) { R->Range <<= 8;  Ppmd7z_RangeEnc_ShiftLow(p);
-#define RC_NORM_1(p)    RC_NORM_BASE(p) }
-#define RC_NORM(p)      RC_NORM_BASE(p)  RC_NORM_BASE(p) }}
-
-// we must use only one type of Normalization from two: LOCAL or REMOTE
-#define RC_NORM_LOCAL(p)    // RC_NORM(p)
-#define RC_NORM_REMOTE(p)   RC_NORM(p)
+static void RangeEnc_Encode(CPpmd7z_RangeEnc *p, UInt32 start, UInt32 size, UInt32 total)
+{
+  p->Low += start * (p->Range /= total);
+  p->Range *= size;
+  while (p->Range < kTopValue)
+  {
+    p->Range <<= 8;
+    RangeEnc_ShiftLow(p);
+  }
+}
 
-/*
-#define Ppmd7z_RangeEnc_Encode(p, start, _size_) \
-  { UInt32 size = _size_; \
-    R->Low += start * R->Range; \
-    R->Range *= size; \
-    RC_NORM_LOCAL(p); }
-*/
+static void RangeEnc_EncodeBit_0(CPpmd7z_RangeEnc *p, UInt32 size0)
+{
+  p->Range = (p->Range >> 14) * size0;
+  while (p->Range < kTopValue)
+  {
+    p->Range <<= 8;
+    RangeEnc_ShiftLow(p);
+  }
+}
 
-Z7_FORCE_INLINE
-// Z7_NO_INLINE
-static void Ppmd7z_RangeEnc_Encode(CPpmd7 *p, UInt32 start, UInt32 size)
+static void RangeEnc_EncodeBit_1(CPpmd7z_RangeEnc *p, UInt32 size0)
 {
-  R->Low += start * R->Range;
-  R->Range *= size;
-  RC_NORM_LOCAL(p)
+  UInt32 newBound = (p->Range >> 14) * size0;
+  p->Low += newBound;
+  p->Range -= newBound;
+  while (p->Range < kTopValue)
+  {
+    p->Range <<= 8;
+    RangeEnc_ShiftLow(p);
+  }
 }
 
-void Ppmd7z_Flush_RangeEnc(CPpmd7 *p)
+void Ppmd7z_RangeEnc_FlushData(CPpmd7z_RangeEnc *p)
 {
   unsigned i;
   for (i = 0; i < 5; i++)
-    Ppmd7z_RangeEnc_ShiftLow(p);
+    RangeEnc_ShiftLow(p);
 }
 
 
+#define MASK(sym) ((signed char *)charMask)[sym]
 
-#define RC_Encode(start, size)  Ppmd7z_RangeEnc_Encode(p, start, size);
-#define RC_EncodeFinal(start, size)  RC_Encode(start, size) RC_NORM_REMOTE(p)
-
-#define CTX(ref) ((CPpmd7_Context *)Ppmd7_GetContext(p, ref))
-#define SUFFIX(ctx) CTX((ctx)->Suffix)
-// typedef CPpmd7_Context * CTX_PTR;
-#define SUCCESSOR(p) Ppmd_GET_SUCCESSOR(p)
-
-void Ppmd7_UpdateModel(CPpmd7 *p);
-
-#define MASK(sym)  ((Byte *)charMask)[sym]
-
-Z7_FORCE_INLINE
-static
-void Ppmd7z_EncodeSymbol(CPpmd7 *p, int symbol)
+void Ppmd7_EncodeSymbol(CPpmd7 *p, CPpmd7z_RangeEnc *rc, int symbol)
 {
   size_t charMask[256 / sizeof(size_t)];
-  
   if (p->MinContext->NumStats != 1)
   {
     CPpmd_State *s = Ppmd7_GetStats(p, p->MinContext);
     UInt32 sum;
     unsigned i;
-   
-
-    
-    
-    R->Range /= p->MinContext->Union2.SummFreq;
-    
     if (s->Symbol == symbol)
     {
-      // R->Range /= p->MinContext->Union2.SummFreq;
-      RC_EncodeFinal(0, s->Freq)
+      RangeEnc_Encode(rc, 0, s->Freq, p->MinContext->SummFreq);
       p->FoundState = s;
       Ppmd7_Update1_0(p);
       return;
     }
     p->PrevSuccess = 0;
     sum = s->Freq;
-    i = (unsigned)p->MinContext->NumStats - 1;
+    i = p->MinContext->NumStats - 1;
     do
     {
       if ((++s)->Symbol == symbol)
       {
-        // R->Range /= p->MinContext->Union2.SummFreq;
-        RC_EncodeFinal(sum, s->Freq)
+        RangeEnc_Encode(rc, sum, s->Freq, p->MinContext->SummFreq);
         p->FoundState = s;
         Ppmd7_Update1(p);
         return;
@@ -125,213 +106,82 @@ void Ppmd7z_EncodeSymbol(CPpmd7 *p, int symbol)
       sum += s->Freq;
     }
     while (--i);
-
-    // R->Range /= p->MinContext->Union2.SummFreq;
-    RC_Encode(sum, p->MinContext->Union2.SummFreq - sum)
     
-    p->HiBitsFlag = PPMD7_HiBitsFlag_3(p->FoundState->Symbol);
-    PPMD_SetAllBitsIn256Bytes(charMask)
-    // MASK(s->Symbol) = 0;
-    // i = p->MinContext->NumStats - 1;
-    // do { MASK((--s)->Symbol) = 0; } while (--i);
-    {
-      CPpmd_State *s2 = Ppmd7_GetStats(p, p->MinContext);
-      MASK(s->Symbol) = 0;
-      do
-      {
-        const unsigned sym0 = s2[0].Symbol;
-        const unsigned sym1 = s2[1].Symbol;
-        s2 += 2;
-        MASK(sym0) = 0;
-        MASK(sym1) = 0;
-      }
-      while (s2 < s);
-    }
+    p->HiBitsFlag = p->HB2Flag[p->FoundState->Symbol];
+    PPMD_SetAllBitsIn256Bytes(charMask);
+    MASK(s->Symbol) = 0;
+    i = p->MinContext->NumStats - 1;
+    do { MASK((--s)->Symbol) = 0; } while (--i);
+    RangeEnc_Encode(rc, sum, p->MinContext->SummFreq - sum, p->MinContext->SummFreq);
   }
   else
   {
     UInt16 *prob = Ppmd7_GetBinSumm(p);
     CPpmd_State *s = Ppmd7Context_OneState(p->MinContext);
-    UInt32 pr = *prob;
-    const UInt32 bound = (R->Range >> 14) * pr;
-    pr = PPMD_UPDATE_PROB_1(pr);
     if (s->Symbol == symbol)
     {
-      *prob = (UInt16)(pr + (1 << PPMD_INT_BITS));
-      // RangeEnc_EncodeBit_0(p, bound);
-      R->Range = bound;
-      RC_NORM_1(p)
-      
-      // p->FoundState = s;
-      // Ppmd7_UpdateBin(p);
-      {
-        const unsigned freq = s->Freq;
-        CPpmd7_Context *c = CTX(SUCCESSOR(s));
-        p->FoundState = s;
-        p->PrevSuccess = 1;
-        p->RunLength++;
-        s->Freq = (Byte)(freq + (freq < 128));
-        // NextContext(p);
-        if (p->OrderFall == 0 && (const Byte *)c > p->Text)
-          p->MaxContext = p->MinContext = c;
-        else
-          Ppmd7_UpdateModel(p);
-      }
+      RangeEnc_EncodeBit_0(rc, *prob);
+      *prob = (UInt16)PPMD_UPDATE_PROB_0(*prob);
+      p->FoundState = s;
+      Ppmd7_UpdateBin(p);
       return;
     }
-
-    *prob = (UInt16)pr;
-    p->InitEsc = p->ExpEscape[pr >> 10];
-    // RangeEnc_EncodeBit_1(p, bound);
-    R->Low += bound;
-    R->Range -= bound;
-    RC_NORM_LOCAL(p)
-    
-    PPMD_SetAllBitsIn256Bytes(charMask)
-    MASK(s->Symbol) = 0;
-    p->PrevSuccess = 0;
+    else
+    {
+      RangeEnc_EncodeBit_1(rc, *prob);
+      *prob = (UInt16)PPMD_UPDATE_PROB_1(*prob);
+      p->InitEsc = PPMD7_kExpEscape[*prob >> 10];
+      PPMD_SetAllBitsIn256Bytes(charMask);
+      MASK(s->Symbol) = 0;
+      p->PrevSuccess = 0;
+    }
   }
-
   for (;;)
   {
+    UInt32 escFreq;
     CPpmd_See *see;
     CPpmd_State *s;
-    UInt32 sum, escFreq;
-    CPpmd7_Context *mc;
-    unsigned i, numMasked;
-    
-    RC_NORM_REMOTE(p)
-
-    mc = p->MinContext;
-    numMasked = mc->NumStats;
-
+    UInt32 sum;
+    unsigned i, numMasked = p->MinContext->NumStats;
     do
     {
       p->OrderFall++;
-      if (!mc->Suffix)
+      if (!p->MinContext->Suffix)
         return; /* EndMarker (symbol = -1) */
-      mc = Ppmd7_GetContext(p, mc->Suffix);
-      i = mc->NumStats;
+      p->MinContext = Ppmd7_GetContext(p, p->MinContext->Suffix);
     }
-    while (i == numMasked);
-
-    p->MinContext = mc;
+    while (p->MinContext->NumStats == numMasked);
     
-    // see = Ppmd7_MakeEscFreq(p, numMasked, &escFreq);
-    {
-      if (i != 256)
-      {
-        unsigned nonMasked = i - numMasked;
-        see = p->See[(unsigned)p->NS2Indx[(size_t)nonMasked - 1]]
-            + p->HiBitsFlag
-            + (nonMasked < (unsigned)SUFFIX(mc)->NumStats - i)
-            + 2 * (unsigned)(mc->Union2.SummFreq < 11 * i)
-            + 4 * (unsigned)(numMasked > nonMasked);
-        {
-          // if (see->Summ) field is larger than 16-bit, we need only low 16 bits of Summ
-          unsigned summ = (UInt16)see->Summ; // & 0xFFFF
-          unsigned r = (summ >> see->Shift);
-          see->Summ = (UInt16)(summ - r);
-          escFreq = r + (r == 0);
-        }
-      }
-      else
-      {
-        see = &p->DummySee;
-        escFreq = 1;
-      }
-    }
-
-    s = Ppmd7_GetStats(p, mc);
+    see = Ppmd7_MakeEscFreq(p, numMasked, &escFreq);
+    s = Ppmd7_GetStats(p, p->MinContext);
     sum = 0;
-    // i = mc->NumStats;
-
+    i = p->MinContext->NumStats;
     do
     {
-      const unsigned cur = s->Symbol;
-      if ((int)cur == symbol)
+      int cur = s->Symbol;
+      if (cur == symbol)
       {
-        const UInt32 low = sum;
-        const UInt32 freq = s->Freq;
-        unsigned num2;
-
-        Ppmd_See_UPDATE(see)
-        p->FoundState = s;
-        sum += escFreq;
-
-        num2 = i / 2;
-        i &= 1;
-        sum += freq & (0 - (UInt32)i);
-        if (num2 != 0)
+        UInt32 low = sum;
+        CPpmd_State *s1 = s;
+        do
         {
-          s += i;
-          do
-          {
-            const unsigned sym0 = s[0].Symbol;
-            const unsigned sym1 = s[1].Symbol;
-            s += 2;
-            sum += (s[-2].Freq & (unsigned)(MASK(sym0)));
-            sum += (s[-1].Freq & (unsigned)(MASK(sym1)));
-          }
-          while (--num2);
+          sum += (s->Freq & (int)(MASK(s->Symbol)));
+          s++;
         }
-
-        
-        R->Range /= sum;
-        RC_EncodeFinal(low, freq)
+        while (--i);
+        RangeEnc_Encode(rc, low, s1->Freq, sum + escFreq);
+        Ppmd_See_Update(see);
+        p->FoundState = s1;
         Ppmd7_Update2(p);
         return;
       }
-      sum += (s->Freq & (unsigned)(MASK(cur)));
+      sum += (s->Freq & (int)(MASK(cur)));
+      MASK(cur) = 0;
       s++;
     }
     while (--i);
     
-    {
-      const UInt32 total = sum + escFreq;
-      see->Summ = (UInt16)(see->Summ + total);
-
-      R->Range /= total;
-      RC_Encode(sum, escFreq)
-    }
-
-    {
-      const CPpmd_State *s2 = Ppmd7_GetStats(p, p->MinContext);
-      s--;
-      MASK(s->Symbol) = 0;
-      do
-      {
-        const unsigned sym0 = s2[0].Symbol;
-        const unsigned sym1 = s2[1].Symbol;
-        s2 += 2;
-        MASK(sym0) = 0;
-        MASK(sym1) = 0;
-      }
-      while (s2 < s);
-    }
+    RangeEnc_Encode(rc, sum, escFreq, sum + escFreq);
+    see->Summ = (UInt16)(see->Summ + sum + escFreq);
   }
 }
-
-
-void Ppmd7z_EncodeSymbols(CPpmd7 *p, const Byte *buf, const Byte *lim)
-{
-  for (; buf < lim; buf++)
-  {
-    Ppmd7z_EncodeSymbol(p, *buf);
-  }
-}
-
-#undef kTopValue
-#undef WRITE_BYTE
-#undef RC_NORM_BASE
-#undef RC_NORM_1
-#undef RC_NORM
-#undef RC_NORM_LOCAL
-#undef RC_NORM_REMOTE
-#undef R
-#undef RC_Encode
-#undef RC_EncodeFinal
-#undef SUFFIX
-#undef CTX
-#undef SUCCESSOR
-#undef MASK

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

@@ -1,127 +1,10 @@
-/* Precomp.h -- precompilation file
-2024-01-25 : Igor Pavlov : Public domain */
+/* Precomp.h -- StdAfx
+2013-11-12 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_PRECOMP_H
-#define ZIP7_INC_PRECOMP_H
-
-/*
-  this file must be included before another *.h files and before <windows.h>.
-  this file is included from the following files:
-    C\*.c
-    C\Util\*\Precomp.h   <-  C\Util\*\*.c
-    CPP\Common\Common.h  <-  *\StdAfx.h    <-  *\*.cpp
-
-  this file can set the following macros:
-    Z7_LARGE_PAGES 1
-    Z7_LONG_PATH 1
-    Z7_WIN32_WINNT_MIN  0x0500 (or higher) : we require at least win2000+ for 7-Zip
-    _WIN32_WINNT        0x0500 (or higher)
-    WINVER  _WIN32_WINNT
-    UNICODE 1
-    _UNICODE 1
-*/
+#ifndef __7Z_PRECOMP_H
+#define __7Z_PRECOMP_H
 
 #include "Compiler.h"
-
-#ifdef _MSC_VER
-// #pragma warning(disable : 4206) // nonstandard extension used : translation unit is empty
-#if _MSC_VER >= 1912
-// #pragma warning(disable : 5039) // pointer or reference to potentially throwing function passed to 'extern "C"' function under - EHc.Undefined behavior may occur if this function throws an exception.
-#endif
-#endif
-
-/*
-// for debug:
-#define UNICODE 1
-#define _UNICODE 1
-#define  _WIN32_WINNT  0x0500  // win2000
-#ifndef WINVER
-  #define WINVER  _WIN32_WINNT
-#endif
-*/
-
-#ifdef _WIN32
-/*
-  this "Precomp.h" file must be included before <windows.h>,
-  if we want to define _WIN32_WINNT before <windows.h>.
-*/
-
-#ifndef Z7_LARGE_PAGES
-#ifndef Z7_NO_LARGE_PAGES
-#define Z7_LARGE_PAGES 1
-#endif
-#endif
-
-#ifndef Z7_LONG_PATH
-#ifndef Z7_NO_LONG_PATH
-#define Z7_LONG_PATH 1
-#endif
-#endif
-
-#ifndef Z7_DEVICE_FILE
-#ifndef Z7_NO_DEVICE_FILE
-// #define Z7_DEVICE_FILE 1
-#endif
-#endif
-
-// we don't change macros if included after <windows.h>
-#ifndef _WINDOWS_
-
-#ifndef Z7_WIN32_WINNT_MIN
-  #if defined(_M_ARM64) || defined(__aarch64__)
-    // #define Z7_WIN32_WINNT_MIN  0x0a00  // win10
-    #define Z7_WIN32_WINNT_MIN  0x0600  // vista
-  #elif defined(_M_ARM) && defined(_M_ARMT) && defined(_M_ARM_NT)
-    // #define Z7_WIN32_WINNT_MIN  0x0602  // win8
-    #define Z7_WIN32_WINNT_MIN  0x0600  // vista
-  #elif defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__) || defined(_M_IA64)
-    #define Z7_WIN32_WINNT_MIN  0x0503  // win2003
-  // #elif defined(_M_IX86) || defined(__i386__)
-  //   #define Z7_WIN32_WINNT_MIN  0x0500  // win2000
-  #else // x86 and another(old) systems
-    #define Z7_WIN32_WINNT_MIN  0x0500  // win2000
-    // #define Z7_WIN32_WINNT_MIN  0x0502  // win2003 // for debug
-  #endif
-#endif // Z7_WIN32_WINNT_MIN
-
-
-#ifndef Z7_DO_NOT_DEFINE_WIN32_WINNT
-#ifdef _WIN32_WINNT
-  // #error Stop_Compiling_Bad_WIN32_WINNT
-#else
-  #ifndef Z7_NO_DEFINE_WIN32_WINNT
-Z7_DIAGNOSTIC_IGNORE_BEGIN_RESERVED_MACRO_IDENTIFIER
-    #define _WIN32_WINNT  Z7_WIN32_WINNT_MIN
-Z7_DIAGNOSTIC_IGNORE_END_RESERVED_MACRO_IDENTIFIER
-  #endif
-#endif // _WIN32_WINNT
-
-#ifndef WINVER
-  #define WINVER  _WIN32_WINNT
-#endif
-#endif // Z7_DO_NOT_DEFINE_WIN32_WINNT
-
-
-#ifndef _MBCS
-#ifndef Z7_NO_UNICODE
-// UNICODE and _UNICODE are used by <windows.h> and by 7-zip code.
-
-#ifndef UNICODE
-#define UNICODE 1
-#endif
-
-#ifndef _UNICODE
-Z7_DIAGNOSTIC_IGNORE_BEGIN_RESERVED_MACRO_IDENTIFIER
-#define _UNICODE 1
-Z7_DIAGNOSTIC_IGNORE_END_RESERVED_MACRO_IDENTIFIER
-#endif
-
-#endif // Z7_NO_UNICODE
-#endif // _MBCS
-#endif // _WINDOWS_
-
-// #include "7zWindows.h"
-
-#endif // _WIN32
+/* #include "7zTypes.h" */
 
 #endif

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

@@ -1,14 +1,14 @@
 /* RotateDefs.h -- Rotate functions
-2023-06-18 : Igor Pavlov : Public domain */
+2015-03-25 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_ROTATE_DEFS_H
-#define ZIP7_INC_ROTATE_DEFS_H
+#ifndef __ROTATE_DEFS_H
+#define __ROTATE_DEFS_H
 
 #ifdef _MSC_VER
 
 #include <stdlib.h>
 
-/* don't use _rotl with old MINGW. It can insert slow call to function. */
+/* don't use _rotl with MINGW. It can insert slow call to function. */
  
 /* #if (_MSC_VER >= 1200) */
 #pragma intrinsic(_rotl)
@@ -18,32 +18,12 @@
 #define rotlFixed(x, n) _rotl((x), (n))
 #define rotrFixed(x, n) _rotr((x), (n))
 
-#if (_MSC_VER >= 1300)
-#define Z7_ROTL64(x, n) _rotl64((x), (n))
-#define Z7_ROTR64(x, n) _rotr64((x), (n))
-#else
-#define Z7_ROTL64(x, n) (((x) << (n)) | ((x) >> (64 - (n))))
-#define Z7_ROTR64(x, n) (((x) >> (n)) | ((x) << (64 - (n))))
-#endif
-
 #else
 
 /* new compilers can translate these macros to fast commands. */
 
-#if defined(__clang__) && (__clang_major__ >= 4) \
-  || defined(__GNUC__) && (__GNUC__ >= 5)
-/* GCC 4.9.0 and clang 3.5 can recognize more correct version: */
-#define rotlFixed(x, n) (((x) << (n)) | ((x) >> (-(n) & 31)))
-#define rotrFixed(x, n) (((x) >> (n)) | ((x) << (-(n) & 31)))
-#define Z7_ROTL64(x, n) (((x) << (n)) | ((x) >> (-(n) & 63)))
-#define Z7_ROTR64(x, n) (((x) >> (n)) | ((x) << (-(n) & 63)))
-#else
-/* for old GCC / clang: */
 #define rotlFixed(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
 #define rotrFixed(x, n) (((x) >> (n)) | ((x) << (32 - (n))))
-#define Z7_ROTL64(x, n) (((x) << (n)) | ((x) >> (64 - (n))))
-#define Z7_ROTR64(x, n) (((x) >> (n)) | ((x) << (64 - (n))))
-#endif
 
 #endif