MdeModulePkg LzmaDecompressLib: Update LZMA to new 16.04 version

[mirror_edk2.git] / MdeModulePkg / Library / LzmaCustomDecompressLib / Sdk / C / Bra86.c

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Bra86.c b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Bra86.c
index 93566cb212043d435b367b250e41ba39292a2255..8dd3ed48d9aba8788489a5ba4ec3fb102694a4b7 100644 (file)
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Bra86.c
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Bra86.c
@@ -1,85 +1,82 @@
 /* Bra86.c -- Converter for x86 code (BCJ)\r
-2008-10-04 : Igor Pavlov : Public domain */\r
+2013-11-12 : Igor Pavlov : Public domain */\r
 \r
-#include "Bra.h"\r
+#include "Precomp.h"\r
 \r
-#define Test86MSByte(b) ((b) == 0 || (b) == 0xFF)\r
+#include "Bra.h"\r
 \r
-const Byte kMaskToAllowedStatus[8] = {1, 1, 1, 0, 1, 0, 0, 0};\r
-const Byte kMaskToBitNumber[8] = {0, 1, 2, 2, 3, 3, 3, 3};\r
+#define Test86MSByte(b) ((((b) + 1) & 0xFE) == 0)\r
 \r
 SizeT x86_Convert(Byte *data, SizeT size, UInt32 ip, UInt32 *state, int encoding)\r
 {\r
-  SizeT bufferPos = 0, prevPosT;\r
-  UInt32 prevMask = *state & 0x7;\r
+  SizeT pos = 0;\r
+  UInt32 mask = *state & 7;\r
   if (size < 5)\r
     return 0;\r
+  size -= 4;\r
   ip += 5;\r
-  prevPosT = (SizeT)0 - 1;\r
 \r
   for (;;)\r
   {\r
-    Byte *p = data + bufferPos;\r
-    Byte *limit = data + size - 4;\r
+    Byte *p = data + pos;\r
+    const Byte *limit = data + size;\r
     for (; p < limit; p++)\r
       if ((*p & 0xFE) == 0xE8)\r
         break;\r
-    bufferPos = (SizeT)(p - data);\r
-    if (p >= limit)\r
-      break;\r
-    prevPosT = bufferPos - prevPosT;\r
-    if (prevPosT > 3)\r
-      prevMask = 0;\r
-    else\r
+\r
     {\r
-      prevMask = (prevMask << ((int)prevPosT - 1)) & 0x7;\r
-      if (prevMask != 0)\r
+      SizeT d = (SizeT)(p - data - pos);\r
+      pos = (SizeT)(p - data);\r
+      if (p >= limit)\r
       {\r
-        Byte b = p[4 - kMaskToBitNumber[prevMask]];\r
-        if (!kMaskToAllowedStatus[prevMask] || Test86MSByte(b))\r
+        *state = (d > 2 ? 0 : mask >> (unsigned)d);\r
+        return pos;\r
+      }\r
+      if (d > 2)\r
+        mask = 0;\r
+      else\r
+      {\r
+        mask >>= (unsigned)d;\r
+        if (mask != 0 && (mask > 4 || mask == 3 || Test86MSByte(p[(mask >> 1) + 1])))\r
         {\r
-          prevPosT = bufferPos;\r
-          prevMask = ((prevMask << 1) & 0x7) | 1;\r
-          bufferPos++;\r
+          mask = (mask >> 1) | 4;\r
+          pos++;\r
           continue;\r
         }\r
       }\r
     }\r
-    prevPosT = bufferPos;\r
 \r
     if (Test86MSByte(p[4]))\r
     {\r
-      UInt32 src = ((UInt32)p[4] << 24) | ((UInt32)p[3] << 16) | ((UInt32)p[2] << 8) | ((UInt32)p[1]);\r
-      UInt32 dest;\r
-      for (;;)\r
+      UInt32 v = ((UInt32)p[4] << 24) | ((UInt32)p[3] << 16) | ((UInt32)p[2] << 8) | ((UInt32)p[1]);\r
+      UInt32 cur = ip + (UInt32)pos;\r
+      pos += 5;\r
+      if (encoding)\r
+        v += cur;\r
+      else\r
+        v -= cur;\r
+      if (mask != 0)\r
       {\r
-        Byte b;\r
-        int index;\r
-        if (encoding)\r
-          dest = (ip + (UInt32)bufferPos) + src;\r
-        else\r
-          dest = src - (ip + (UInt32)bufferPos);\r
-        if (prevMask == 0)\r
-          break;\r
-        index = kMaskToBitNumber[prevMask] * 8;\r
-        b = (Byte)(dest >> (24 - index));\r
-        if (!Test86MSByte(b))\r
-          break;\r
-        src = dest ^ ((1 << (32 - index)) - 1);\r
+        unsigned sh = (mask & 6) << 2;\r
+        if (Test86MSByte((Byte)(v >> sh)))\r
+        {\r
+          v ^= (((UInt32)0x100 << sh) - 1);\r
+          if (encoding)\r
+            v += cur;\r
+          else\r
+            v -= cur;\r
+        }\r
+        mask = 0;\r
       }\r
-      p[4] = (Byte)(~(((dest >> 24) & 1) - 1));\r
-      p[3] = (Byte)(dest >> 16);\r
-      p[2] = (Byte)(dest >> 8);\r
-      p[1] = (Byte)dest;\r
-      bufferPos += 5;\r
+      p[1] = (Byte)v;\r
+      p[2] = (Byte)(v >> 8);\r
+      p[3] = (Byte)(v >> 16);\r
+      p[4] = (Byte)(0 - ((v >> 24) & 1));\r
     }\r
     else\r
     {\r
-      prevMask = ((prevMask << 1) & 0x7) | 1;\r
-      bufferPos++;\r
+      mask = (mask >> 1) | 4;\r
+      pos++;\r
     }\r
   }\r
-  prevPosT = bufferPos - prevPosT;\r
-  *state = ((prevPosT > 3) ? 0 : ((prevMask << ((int)prevPosT - 1)) & 0x7));\r
-  return bufferPos;\r
 }\r