mirror of
				https://github.com/facebook/zstd.git
				synced 2025-10-31 16:47:48 +02:00 
			
		
		
		
	renamed HufLog into ZSTD_HUFFDTABLE_CAPACITY_LOG
old name was not descriptive and actually misleading
This commit is contained in:
		| @@ -485,7 +485,7 @@ static const size_t ZSTDv05_frameHeaderSize_min = 5; | ||||
| #define FSEv05_ENCODING_DYNAMIC 3 | ||||
|  | ||||
|  | ||||
| #define HufLog 12 | ||||
| #define ZSTD_HUFFDTABLE_CAPACITY_LOG 12 | ||||
|  | ||||
| #define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */ | ||||
| #define MIN_CBLOCK_SIZE (1 /*litCSize*/ + 1 /* RLE or RAW */ + MIN_SEQUENCES_SIZE /* nbSeq==0 */)   /* for a non-null block */ | ||||
| @@ -2645,7 +2645,7 @@ struct ZSTDv05_DCtx_s | ||||
|     FSEv05_DTable LLTable[FSEv05_DTABLE_SIZE_U32(LLFSEv05Log)]; | ||||
|     FSEv05_DTable OffTable[FSEv05_DTABLE_SIZE_U32(OffFSEv05Log)]; | ||||
|     FSEv05_DTable MLTable[FSEv05_DTABLE_SIZE_U32(MLFSEv05Log)]; | ||||
|     unsigned   hufTableX4[HUFv05_DTABLE_SIZE(HufLog)]; | ||||
|     unsigned   hufTableX4[HUFv05_DTABLE_SIZE(ZSTD_HUFFDTABLE_CAPACITY_LOG)]; | ||||
|     const void* previousDstEnd; | ||||
|     const void* base; | ||||
|     const void* vBase; | ||||
| @@ -2673,7 +2673,7 @@ size_t ZSTDv05_decompressBegin(ZSTDv05_DCtx* dctx) | ||||
|     dctx->base = NULL; | ||||
|     dctx->vBase = NULL; | ||||
|     dctx->dictEnd = NULL; | ||||
|     dctx->hufTableX4[0] = HufLog; | ||||
|     dctx->hufTableX4[0] = ZSTD_HUFFDTABLE_CAPACITY_LOG; | ||||
|     dctx->flagStaticTables = 0; | ||||
|     return 0; | ||||
| } | ||||
|   | ||||
| @@ -479,7 +479,7 @@ typedef enum { bt_compressed, bt_raw, bt_rle, bt_end } blockType_t; | ||||
| #define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */ | ||||
| #define MIN_CBLOCK_SIZE (1 /*litCSize*/ + 1 /* RLE or RAW */ + MIN_SEQUENCES_SIZE /* nbSeq==0 */)   /* for a non-null block */ | ||||
|  | ||||
| #define HufLog 12 | ||||
| #define ZSTD_HUFFDTABLE_CAPACITY_LOG 12 | ||||
|  | ||||
| #define IS_HUF 0 | ||||
| #define IS_PCH 1 | ||||
| @@ -2806,7 +2806,7 @@ struct ZSTDv06_DCtx_s | ||||
|     FSEv06_DTable LLTable[FSEv06_DTABLE_SIZE_U32(LLFSELog)]; | ||||
|     FSEv06_DTable OffTable[FSEv06_DTABLE_SIZE_U32(OffFSELog)]; | ||||
|     FSEv06_DTable MLTable[FSEv06_DTABLE_SIZE_U32(MLFSELog)]; | ||||
|     unsigned   hufTableX4[HUFv06_DTABLE_SIZE(HufLog)]; | ||||
|     unsigned   hufTableX4[HUFv06_DTABLE_SIZE(ZSTD_HUFFDTABLE_CAPACITY_LOG)]; | ||||
|     const void* previousDstEnd; | ||||
|     const void* base; | ||||
|     const void* vBase; | ||||
| @@ -2834,7 +2834,7 @@ size_t ZSTDv06_decompressBegin(ZSTDv06_DCtx* dctx) | ||||
|     dctx->base = NULL; | ||||
|     dctx->vBase = NULL; | ||||
|     dctx->dictEnd = NULL; | ||||
|     dctx->hufTableX4[0] = HufLog; | ||||
|     dctx->hufTableX4[0] = ZSTD_HUFFDTABLE_CAPACITY_LOG; | ||||
|     dctx->flagRepeatTable = 0; | ||||
|     return 0; | ||||
| } | ||||
|   | ||||
| @@ -2717,7 +2717,7 @@ typedef enum { bt_compressed, bt_raw, bt_rle, bt_end } blockType_t; | ||||
| #define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */ | ||||
| #define MIN_CBLOCK_SIZE (1 /*litCSize*/ + 1 /* RLE or RAW */ + MIN_SEQUENCES_SIZE /* nbSeq==0 */)   /* for a non-null block */ | ||||
|  | ||||
| #define HufLog 12 | ||||
| #define ZSTD_HUFFDTABLE_CAPACITY_LOG 12 | ||||
| typedef enum { lbt_huffman, lbt_repeat, lbt_raw, lbt_rle } litBlockType_t; | ||||
|  | ||||
| #define LONGNBSEQ 0x7F00 | ||||
| @@ -2931,7 +2931,7 @@ struct ZSTDv07_DCtx_s | ||||
|     FSEv07_DTable LLTable[FSEv07_DTABLE_SIZE_U32(LLFSELog)]; | ||||
|     FSEv07_DTable OffTable[FSEv07_DTABLE_SIZE_U32(OffFSELog)]; | ||||
|     FSEv07_DTable MLTable[FSEv07_DTABLE_SIZE_U32(MLFSELog)]; | ||||
|     HUFv07_DTable hufTable[HUFv07_DTABLE_SIZE(HufLog)];  /* can accommodate HUFv07_decompress4X */ | ||||
|     HUFv07_DTable hufTable[HUFv07_DTABLE_SIZE(ZSTD_HUFFDTABLE_CAPACITY_LOG)];  /* can accommodate HUFv07_decompress4X */ | ||||
|     const void* previousDstEnd; | ||||
|     const void* base; | ||||
|     const void* vBase; | ||||
| @@ -2967,7 +2967,7 @@ size_t ZSTDv07_decompressBegin(ZSTDv07_DCtx* dctx) | ||||
|     dctx->base = NULL; | ||||
|     dctx->vBase = NULL; | ||||
|     dctx->dictEnd = NULL; | ||||
|     dctx->hufTable[0] = (HUFv07_DTable)((HufLog)*0x1000001); | ||||
|     dctx->hufTable[0] = (HUFv07_DTable)((ZSTD_HUFFDTABLE_CAPACITY_LOG)*0x1000001); | ||||
|     dctx->litEntropy = dctx->fseEntropy = 0; | ||||
|     dctx->dictID = 0; | ||||
|     { int i; for (i=0; i<ZSTDv07_REP_NUM; i++) dctx->rep[i] = repStartValue[i]; } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user