MdeModulePkg LzmaDecompressLib: Update LZMA to new 16.04 version

[mirror_edk2.git] / MdeModulePkg / Library / LzmaCustomDecompressLib / Sdk / C / LzHash.h

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzHash.h b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzHash.h
index c923417501689882dfd773a91c412f993f6272a4..2191444072a13a459ea9bbee411329e65e42f1fe 100644 (file)
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzHash.h
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzHash.h
@@ -1,8 +1,8 @@
 /* LzHash.h -- HASH functions for LZ algorithms\r
-2008-10-04 : Igor Pavlov : Public domain */\r
+2015-04-12 : Igor Pavlov : Public domain */\r
 \r
-#ifndef __LZHASH_H\r
-#define __LZHASH_H\r
+#ifndef __LZ_HASH_H\r
+#define __LZ_HASH_H\r
 \r
 #define kHash2Size (1 << 10)\r
 #define kHash3Size (1 << 16)\r
@@ -12,43 +12,46 @@
 #define kFix4HashSize (kHash2Size + kHash3Size)\r
 #define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)\r
 \r
-#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);\r
+#define HASH2_CALC hv = cur[0] | ((UInt32)cur[1] << 8);\r
 \r
 #define HASH3_CALC { \\r
   UInt32 temp = p->crc[cur[0]] ^ cur[1]; \\r
-  hash2Value = temp & (kHash2Size - 1); \\r
-  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }\r
+  h2 = temp & (kHash2Size - 1); \\r
+  hv = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }\r
 \r
 #define HASH4_CALC { \\r
   UInt32 temp = p->crc[cur[0]] ^ cur[1]; \\r
-  hash2Value = temp & (kHash2Size - 1); \\r
-  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \\r
-  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }\r
+  h2 = temp & (kHash2Size - 1); \\r
+  temp ^= ((UInt32)cur[2] << 8); \\r
+  h3 = temp & (kHash3Size - 1); \\r
+  hv = (temp ^ (p->crc[cur[3]] << 5)) & p->hashMask; }\r
 \r
 #define HASH5_CALC { \\r
   UInt32 temp = p->crc[cur[0]] ^ cur[1]; \\r
-  hash2Value = temp & (kHash2Size - 1); \\r
-  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \\r
-  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \\r
-  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \\r
-  hash4Value &= (kHash4Size - 1); }\r
+  h2 = temp & (kHash2Size - 1); \\r
+  temp ^= ((UInt32)cur[2] << 8); \\r
+  h3 = temp & (kHash3Size - 1); \\r
+  temp ^= (p->crc[cur[3]] << 5); \\r
+  h4 = temp & (kHash4Size - 1); \\r
+  hv = (temp ^ (p->crc[cur[4]] << 3)) & p->hashMask; }\r
 \r
-/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */\r
-#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;\r
+/* #define HASH_ZIP_CALC hv = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */\r
+#define HASH_ZIP_CALC hv = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;\r
 \r
 \r
 #define MT_HASH2_CALC \\r
-  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);\r
+  h2 = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);\r
 \r
 #define MT_HASH3_CALC { \\r
   UInt32 temp = p->crc[cur[0]] ^ cur[1]; \\r
-  hash2Value = temp & (kHash2Size - 1); \\r
-  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }\r
+  h2 = temp & (kHash2Size - 1); \\r
+  h3 = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }\r
 \r
 #define MT_HASH4_CALC { \\r
   UInt32 temp = p->crc[cur[0]] ^ cur[1]; \\r
-  hash2Value = temp & (kHash2Size - 1); \\r
-  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \\r
-  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }\r
+  h2 = temp & (kHash2Size - 1); \\r
+  temp ^= ((UInt32)cur[2] << 8); \\r
+  h3 = temp & (kHash3Size - 1); \\r
+  h4 = (temp ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }\r
 \r
 #endif\r