Sort of garbage collection commit. :-| Many things are still

broken. API has changed a lot and it will still change a
little more here and there. The command line tool doesn't
have all the required changes to reflect the API changes, so
it's easy to get "internal error" or trigger assertions.

1 files changed, 18 insertions, 66 deletions

diff --git a/src/liblzma/rangecoder/price_table.c b/src/liblzma/rangecoder/price_table.c
index d0b50fa6..539206b1 100644
--- a/src/liblzma/rangecoder/price_table.c
+++ b/src/liblzma/rangecoder/price_table.c
@@ -1,70 +1,22 @@
-/* This file has been automatically generated by price_table_gen.c. */
+/* This file has been automatically generated by price_tablegen.c. */
 
 #include "range_encoder.h"
 
-const uint32_t lzma_rc_prob_prices[BIT_MODEL_TOTAL >> MOVE_REDUCING_BITS] = {
-	   0, 576, 512, 480, 448, 432, 416, 400,
-	 384, 376, 368, 360, 352, 344, 336, 328,
-	 320, 316, 312, 308, 304, 300, 296, 292,
-	 288, 284, 280, 276, 272, 268, 264, 260,
-	 256, 254, 252, 250, 248, 246, 244, 242,
-	 240, 238, 236, 234, 232, 230, 228, 226,
-	 224, 222, 220, 218, 216, 214, 212, 210,
-	 208, 206, 204, 202, 200, 198, 196, 194,
-	 192, 191, 190, 189, 188, 187, 186, 185,
-	 184, 183, 182, 181, 180, 179, 178, 177,
-	 176, 175, 174, 173, 172, 171, 170, 169,
-	 168, 167, 166, 165, 164, 163, 162, 161,
-	 160, 159, 158, 157, 156, 155, 154, 153,
-	 152, 151, 150, 149, 148, 147, 146, 145,
-	 144, 143, 142, 141, 140, 139, 138, 137,
-	 136, 135, 134, 133, 132, 131, 130, 129,
-	 128, 127, 127, 126, 126, 125, 125, 124,
-	 124, 123, 123, 122, 122, 121, 121, 120,
-	 120, 119, 119, 118, 118, 117, 117, 116,
-	 116, 115, 115, 114, 114, 113, 113, 112,
-	 112, 111, 111, 110, 110, 109, 109, 108,
-	 108, 107, 107, 106, 106, 105, 105, 104,
-	 104, 103, 103, 102, 102, 101, 101, 100,
-	 100,  99,  99,  98,  98,  97,  97,  96,
-	  96,  95,  95,  94,  94,  93,  93,  92,
-	  92,  91,  91,  90,  90,  89,  89,  88,
-	  88,  87,  87,  86,  86,  85,  85,  84,
-	  84,  83,  83,  82,  82,  81,  81,  80,
-	  80,  79,  79,  78,  78,  77,  77,  76,
-	  76,  75,  75,  74,  74,  73,  73,  72,
-	  72,  71,  71,  70,  70,  69,  69,  68,
-	  68,  67,  67,  66,  66,  65,  65,  64,
-	  64,  63,  63,  63,  63,  62,  62,  62,
-	  62,  61,  61,  61,  61,  60,  60,  60,
-	  60,  59,  59,  59,  59,  58,  58,  58,
-	  58,  57,  57,  57,  57,  56,  56,  56,
-	  56,  55,  55,  55,  55,  54,  54,  54,
-	  54,  53,  53,  53,  53,  52,  52,  52,
-	  52,  51,  51,  51,  51,  50,  50,  50,
-	  50,  49,  49,  49,  49,  48,  48,  48,
-	  48,  47,  47,  47,  47,  46,  46,  46,
-	  46,  45,  45,  45,  45,  44,  44,  44,
-	  44,  43,  43,  43,  43,  42,  42,  42,
-	  42,  41,  41,  41,  41,  40,  40,  40,
-	  40,  39,  39,  39,  39,  38,  38,  38,
-	  38,  37,  37,  37,  37,  36,  36,  36,
-	  36,  35,  35,  35,  35,  34,  34,  34,
-	  34,  33,  33,  33,  33,  32,  32,  32,
-	  32,  31,  31,  31,  31,  30,  30,  30,
-	  30,  29,  29,  29,  29,  28,  28,  28,
-	  28,  27,  27,  27,  27,  26,  26,  26,
-	  26,  25,  25,  25,  25,  24,  24,  24,
-	  24,  23,  23,  23,  23,  22,  22,  22,
-	  22,  21,  21,  21,  21,  20,  20,  20,
-	  20,  19,  19,  19,  19,  18,  18,  18,
-	  18,  17,  17,  17,  17,  16,  16,  16,
-	  16,  15,  15,  15,  15,  14,  14,  14,
-	  14,  13,  13,  13,  13,  12,  12,  12,
-	  12,  11,  11,  11,  11,  10,  10,  10,
-	  10,   9,   9,   9,   9,   8,   8,   8,
-	   8,   7,   7,   7,   7,   6,   6,   6,
-	   6,   5,   5,   5,   5,   4,   4,   4,
-	   4,   3,   3,   3,   3,   2,   2,   2,
-	   2,   1,   1,   1,   1,   0,   0,   0
+const uint32_t lzma_rc_prices[RC_PRICE_TABLE_SIZE] = {
+	 128, 103,  91,  84,  78,  73,  69,  66,
+	  63,  61,  58,  56,  54,  52,  51,  49,
+	  48,  46,  45,  44,  43,  42,  41,  40,
+	  39,  38,  37,  36,  35,  34,  34,  33,
+	  32,  31,  31,  30,  29,  29,  28,  28,
+	  27,  26,  26,  25,  25,  24,  24,  23,
+	  23,  22,  22,  22,  21,  21,  20,  20,
+	  19,  19,  19,  18,  18,  17,  17,  17,
+	  16,  16,  16,  15,  15,  15,  14,  14,
+	  14,  13,  13,  13,  12,  12,  12,  11,
+	  11,  11,  11,  10,  10,  10,  10,   9,
+	   9,   9,   9,   8,   8,   8,   8,   7,
+	   7,   7,   7,   6,   6,   6,   6,   5,
+	   5,   5,   5,   5,   4,   4,   4,   4,
+	   3,   3,   3,   3,   3,   2,   2,   2,
+	   2,   2,   2,   1,   1,   1,   1,   1
 };