MdeModulePkg BrotliLib: Rename function with the specific lib name

[mirror_edk2.git] / MdeModulePkg / Library / BrotliCustomDecompressLib / dec / decode.c

diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.c b/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.c
index 67f0ff2cd96fbdb86fcb6ed3dc78b32775c10ae9..3bee3e71fe0340c6680b30597d86a89c98ed04d1 100644 (file)
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.c
+++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.c
@@ -56,7 +56,7 @@ BrotliDecoderState* BrotliDecoderCreateInstance(
     brotli_alloc_func alloc_func, brotli_free_func free_func, void* opaque) {\r
   BrotliDecoderState* state = 0;\r
   if (!alloc_func && !free_func) {\r
     brotli_alloc_func alloc_func, brotli_free_func free_func, void* opaque) {\r
   BrotliDecoderState* state = 0;\r
   if (!alloc_func && !free_func) {\r

-    state = (BrotliDecoderState*)malloc(sizeof(BrotliDecoderState));\r
+    state = (BrotliDecoderState*)BrDummyMalloc(sizeof(BrotliDecoderState));\r

   } else if (alloc_func && free_func) {\r
     state = (BrotliDecoderState*)alloc_func(opaque, sizeof(BrotliDecoderState));\r
   }\r
   } else if (alloc_func && free_func) {\r
     state = (BrotliDecoderState*)alloc_func(opaque, sizeof(BrotliDecoderState));\r
   }\r


@@ -855,6 +855,7 @@ static BROTLI_NOINLINE void InverseMoveToFrontTransform(
   uint32_t i = 4;\r
   uint32_t upper_bound = state->mtf_upper_bound;\r
   uint8_t* mtf = &state->mtf[4];  /* Make mtf[-1] addressable. */\r
   uint32_t i = 4;\r
   uint32_t upper_bound = state->mtf_upper_bound;\r
   uint8_t* mtf = &state->mtf[4];  /* Make mtf[-1] addressable. */\r

+  uint8_t* mtft = &state->mtf[3];\r

   /* Load endian-aware constant. */\r
   const uint8_t b0123[4] = {0, 1, 2, 3};\r
   uint32_t pattern;\r
   /* Load endian-aware constant. */\r
   const uint8_t b0123[4] = {0, 1, 2, 3};\r
   uint32_t pattern;\r


@@ -875,10 +876,10 @@ static BROTLI_NOINLINE void InverseMoveToFrontTransform(
     uint8_t value = mtf[index];\r
     upper_bound |= (uint32_t)v[i];\r
     v[i] = value;\r
     uint8_t value = mtf[index];\r
     upper_bound |= (uint32_t)v[i];\r
     v[i] = value;\r

-    mtf[-1] = value;\r
-    while (index > 0) {\r
+    mtft[0] = value;\r
+    while (index >= 0) {\r
+      mtft[index + 1] = mtft[index];\r

       index--;\r
       index--;\r

-      mtf[index + 1] = mtf[index];\r

     }\r
   }\r
   /* Remember amount of elements to be reinitialized. */\r
     }\r
   }\r
   /* Remember amount of elements to be reinitialized. */\r