Revised the fastpos code. It now uses the slightly faster

table-based version from LZMA SDK 4.57. This should be
fast on most systems.

A simpler and smaller alternative version is also provided.
On some CPUs this can be even a little faster than the
default table-based version (see comments in fastpos.h),
but on most systems the table-based code is faster.

1 files changed, 0 insertions, 21 deletions

diff --git a/src/liblzma/lzma/lzma_encoder_private.h b/src/liblzma/lzma/lzma_encoder_private.h
index ba19b6ae..e403577c 100644
--- a/src/liblzma/lzma/lzma_encoder_private.h
+++ b/src/liblzma/lzma/lzma_encoder_private.h
@@ -45,27 +45,6 @@ do { \
 } while (0)
 
 
-#define get_pos_slot(pos) \
-	((pos) < (1 << 11) \
-		? lzma_fastpos[pos] \
-		: ((pos) < (1 << 21) \
-			? lzma_fastpos[(pos) >> 10] + 20 \
-			: lzma_fastpos[(pos) >> 20] + 40))
-
-
-#define get_pos_slot_2(pos) \
-	((pos) < (1 << 17) \
-		? lzma_fastpos[(pos) >> 6] + 12 \
-		: ((pos) < (1 << 27) \
-			? lzma_fastpos[(pos) >> 16] + 32 \
-			: lzma_fastpos[(pos) >> 26] + 52))
-
-
-/// This isn't modified once its contents have been
-/// initialized by lzma_fastpos_init().
-extern uint8_t lzma_fastpos[1 << 11];
-
-
 typedef struct {
 	probability choice;
 	probability choice2;