summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Gagniuc <mr.nuke.me@gmail.com>2014-01-29 16:55:48 -0600
committerAlexandru Gagniuc <mr.nuke.me@gmail.com>2014-02-11 20:15:48 +0100
commit7c9bb41817988287c74f83512541355e7818c57f (patch)
treedcf49fb947c99920d4bb62e222ea3b4ac91c901c
parentc1d1fd850ee7b8e52bd2ea5064fab68ac0c27098 (diff)
cbfstool/lzma: Remove code which depends on commented out defines
These options seem to control the behavior of the encoder/decoder, with comments citing a trade-off between memory usage and performance. I removed these in a separate patch to make reverting in the future easier, if we find these options are useful. Change-Id: I24cb7101b89e60f4fb96777e3681c03d2a62e3d5 Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-on: http://review.coreboot.org/5084 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--util/cbfstool/lzma/C/LzmaDec.c6
-rw-r--r--util/cbfstool/lzma/C/LzmaDec.h11
-rw-r--r--util/cbfstool/lzma/C/LzmaEnc.c7
3 files changed, 3 insertions, 21 deletions
diff --git a/util/cbfstool/lzma/C/LzmaDec.c b/util/cbfstool/lzma/C/LzmaDec.c
index 5537b712ba..e208877b9d 100644
--- a/util/cbfstool/lzma/C/LzmaDec.c
+++ b/util/cbfstool/lzma/C/LzmaDec.c
@@ -28,11 +28,6 @@
#define TREE_DECODE(probs, limit, i) \
{ i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
-/* #define _LZMA_SIZE_OPT */
-
-#ifdef _LZMA_SIZE_OPT
-#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
-#else
#define TREE_6_DECODE(probs, i) \
{ i = 1; \
TREE_GET_BIT(probs, i); \
@@ -42,7 +37,6 @@
TREE_GET_BIT(probs, i); \
TREE_GET_BIT(probs, i); \
i -= 0x40; }
-#endif
#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
diff --git a/util/cbfstool/lzma/C/LzmaDec.h b/util/cbfstool/lzma/C/LzmaDec.h
index d296f85b03..1addabe55a 100644
--- a/util/cbfstool/lzma/C/LzmaDec.h
+++ b/util/cbfstool/lzma/C/LzmaDec.h
@@ -6,16 +6,7 @@
#include "Types.h"
-/* #define _LZMA_PROB32 */
-/* _LZMA_PROB32 can increase the speed on some CPUs,
- but memory usage for CLzmaDec::probs will be doubled in that case */
-
-#ifdef _LZMA_PROB32
-#define CLzmaProb uint32_t
-#else
-#define CLzmaProb uint16_t
-#endif
-
+typedef uint16_t CLzmaProb;
/* ---------- LZMA Properties ---------- */
diff --git a/util/cbfstool/lzma/C/LzmaEnc.c b/util/cbfstool/lzma/C/LzmaEnc.c
index 70e9baa1c2..583b45500e 100644
--- a/util/cbfstool/lzma/C/LzmaEnc.c
+++ b/util/cbfstool/lzma/C/LzmaEnc.c
@@ -174,11 +174,8 @@ struct COptimal
#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-#ifdef _LZMA_PROB32
-#define CLzmaProb uint32_t
-#else
-#define CLzmaProb uint16_t
-#endif
+typedef uint16_t CLzmaProb;
+
#define LZMA_PB_MAX 4
#define LZMA_LC_MAX 8