BaseTools/LzmaCompress: Fix the option "d" dictionary size
The range of dictionary size is set from [0,30] to [0,27].
And update the help information for this.
The previous logic for processing the parameter dict size is incorrect.
Now fix the logic.
The option "d" is added at 6b80310f34.
(https://bugzilla.tianocore.org/show_bug.cgi?id=2077)
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
			
			
This commit is contained in:
		
				
					committed by
					
						
						Liming Gao
					
				
			
			
				
	
			
			
			
						parent
						
							ac81789c3b
						
					
				
				
					commit
					f835e1d4c1
				
			@@ -42,7 +42,7 @@ const char *kInvalidParamValMessage = "Invalid parameter value";
 | 
				
			|||||||
static Bool mQuietMode = False;
 | 
					static Bool mQuietMode = False;
 | 
				
			||||||
static CONVERTER_TYPE mConType = NoConverter;
 | 
					static CONVERTER_TYPE mConType = NoConverter;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
UINT64 mDictionarySize = 31;
 | 
					UINT64 mDictionarySize = 28;
 | 
				
			||||||
UINT64 mCompressionMode = 2;
 | 
					UINT64 mCompressionMode = 2;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define UTILITY_NAME "LzmaCompress"
 | 
					#define UTILITY_NAME "LzmaCompress"
 | 
				
			||||||
@@ -64,7 +64,7 @@ void PrintHelp(char *buffer)
 | 
				
			|||||||
             "  -q, --quiet: reduce output messages\n"
 | 
					             "  -q, --quiet: reduce output messages\n"
 | 
				
			||||||
             "  --debug [0-9]: set debug level\n"
 | 
					             "  --debug [0-9]: set debug level\n"
 | 
				
			||||||
             "  -a: set compression mode 0 = fast, 1 = normal, default: 1 (normal)\n"
 | 
					             "  -a: set compression mode 0 = fast, 1 = normal, default: 1 (normal)\n"
 | 
				
			||||||
             "  d: sets Dictionary size - [0, 30], default: 23 (8MB)\n"
 | 
					             "  d: sets Dictionary size - [0, 27], default: 24 (16MB)\n"
 | 
				
			||||||
             "  --version: display the program version and exit\n"
 | 
					             "  --version: display the program version and exit\n"
 | 
				
			||||||
             "  -h, --help: display this help text\n"
 | 
					             "  -h, --help: display this help text\n"
 | 
				
			||||||
             );
 | 
					             );
 | 
				
			||||||
@@ -298,8 +298,12 @@ int main2(int numArgs, const char *args[], char *rs)
 | 
				
			|||||||
      }
 | 
					      }
 | 
				
			||||||
    } else if (strcmp(args[param], "d") == 0) {
 | 
					    } else if (strcmp(args[param], "d") == 0) {
 | 
				
			||||||
      AsciiStringToUint64(args[param + 1],FALSE,&mDictionarySize);
 | 
					      AsciiStringToUint64(args[param + 1],FALSE,&mDictionarySize);
 | 
				
			||||||
      if (mDictionarySize <= 30){
 | 
					      if (mDictionarySize <= 27) {
 | 
				
			||||||
        props.dictSize = (UINT32)mDictionarySize;
 | 
					        if (mDictionarySize == 0) {
 | 
				
			||||||
 | 
					          props.dictSize = 0;
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					          props.dictSize = (1 << mDictionarySize);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
        param++;
 | 
					        param++;
 | 
				
			||||||
        continue;
 | 
					        continue;
 | 
				
			||||||
      } else {
 | 
					      } else {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user