BaseTools/LzmaCompress: Fix the option "d" dictionary size

[edk2-devel] [PATCH] BaseTools/LzmaCompress: Fix the option "d" dictionary size

Posted by Zhang, Shenglei 4 years, 7 months ago

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 6b80310f34199d1f62e45e40fa902734735091fa.
(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>
---
 BaseTools/Source/C/LzmaCompress/LzmaCompress.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/BaseTools/Source/C/LzmaCompress/LzmaCompress.c b/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
index 856fcf9ffb17..bebdb9aa84a1 100644
--- a/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
+++ b/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
@@ -42,7 +42,7 @@ const char *kInvalidParamValMessage = "Invalid parameter value";
 static Bool mQuietMode = False;
 static CONVERTER_TYPE mConType = NoConverter;
 
-UINT64 mDictionarySize = 31;
+UINT64 mDictionarySize = 28;
 UINT64 mCompressionMode = 2;
 
 #define UTILITY_NAME "LzmaCompress"
@@ -64,7 +64,7 @@ void PrintHelp(char *buffer)
              "  -q, --quiet: reduce output messages\n"
              "  --debug [0-9]: set debug level\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"
              "  -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) {
       AsciiStringToUint64(args[param + 1],FALSE,&mDictionarySize);
-      if (mDictionarySize <= 30){
-        props.dictSize = (UINT32)mDictionarySize;
+      if (mDictionarySize <= 27) {
+        if (mDictionarySize == 0) {
+          props.dictSize = 0;
+        } else {
+          props.dictSize = (1 << mDictionarySize);
+        }
         param++;
         continue;
       } else {
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#48275): https://edk2.groups.io/g/devel/message/48275
Mute This Topic: https://groups.io/mt/34341275/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] BaseTools/LzmaCompress: Fix the option "d" dictionary size

Posted by Liming Gao 4 years, 7 months ago

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Zhang, Shenglei
>Sent: Monday, September 30, 2019 11:52 AM
>To: devel@edk2.groups.io
>Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
>Subject: [PATCH] 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 6b80310f34199d1f62e45e40fa902734735091fa.
>(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>
>---
> BaseTools/Source/C/LzmaCompress/LzmaCompress.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
>b/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
>index 856fcf9ffb17..bebdb9aa84a1 100644
>--- a/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
>+++ b/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
>@@ -42,7 +42,7 @@ const char *kInvalidParamValMessage = "Invalid
>parameter value";
> static Bool mQuietMode = False;
> static CONVERTER_TYPE mConType = NoConverter;
>
>-UINT64 mDictionarySize = 31;
>+UINT64 mDictionarySize = 28;
> UINT64 mCompressionMode = 2;
>
> #define UTILITY_NAME "LzmaCompress"
>@@ -64,7 +64,7 @@ void PrintHelp(char *buffer)
>              "  -q, --quiet: reduce output messages\n"
>              "  --debug [0-9]: set debug level\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"
>              "  -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) {
>       AsciiStringToUint64(args[param + 1],FALSE,&mDictionarySize);
>-      if (mDictionarySize <= 30){
>-        props.dictSize = (UINT32)mDictionarySize;
>+      if (mDictionarySize <= 27) {
>+        if (mDictionarySize == 0) {
>+          props.dictSize = 0;
>+        } else {
>+          props.dictSize = (1 << mDictionarySize);
>+        }
>         param++;
>         continue;
>       } else {
>--
>2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#48276): https://edk2.groups.io/g/devel/message/48276
Mute This Topic: https://groups.io/mt/34341275/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-