wok annotate linux/stuff/linux-unlzma-2.6.36.u @ rev 7207

Up: lvm2 to 2.02.76.
author Christopher Rogers <slaxemulator@gmail.com>
date Tue Nov 09 21:05:34 2010 +0000 (2010-11-09)
parents
children
rev   line source
slaxemulator@7131 1 --- linux-2.6.30.4/init/initramfs.c
slaxemulator@7131 2 +++ linux-2.6.30.4/init/initramfs.c
slaxemulator@7131 3 @@ -425,7 +425,8 @@
slaxemulator@7131 4 return len - count;
slaxemulator@7131 5 }
slaxemulator@7131 6
slaxemulator@7131 7 -static int __init flush_buffer(void *bufv, unsigned len)
slaxemulator@7131 8 +#define flush_buffer cpio_flush_buffer
slaxemulator@7131 9 +int __init flush_buffer(void *bufv, unsigned len)
slaxemulator@7131 10 {
slaxemulator@7131 11 char *buf = (char *) bufv;
slaxemulator@7131 12 int written;
slaxemulator@7131 13
slaxemulator@7131 14 --- linux-2.6.30.4/lib/decompress_unlzma.c
slaxemulator@7131 15 +++ linux-2.6.30.4/lib/decompress_unlzma.c
slaxemulator@7131 16 @@ -278,6 +278,10 @@
slaxemulator@7131 17 size_t global_pos;
slaxemulator@7131 18 int(*flush)(void*, unsigned int);
slaxemulator@7131 19 struct lzma_header *header;
slaxemulator@7131 20 + int is_cpio_flush;
slaxemulator@7131 21 + uint8_t **buffer_index;
slaxemulator@7131 22 + int next_index;
slaxemulator@7131 23 + int max_index;
slaxemulator@7131 24 };
slaxemulator@7131 25
slaxemulator@7131 26 struct cstate {
slaxemulator@7131 27 @@ -294,6 +298,14 @@
slaxemulator@7131 28 static inline uint8_t INIT peek_old_byte(struct writer *wr,
slaxemulator@7131 29 uint32_t offs)
slaxemulator@7131 30 {
slaxemulator@7131 31 + if (wr->is_cpio_flush) {
slaxemulator@7131 32 + int32_t pos;
slaxemulator@7131 33 + while (offs > wr->header->dict_size)
slaxemulator@7131 34 + offs -= wr->header->dict_size;
slaxemulator@7131 35 + pos = wr->buffer_pos - offs;
slaxemulator@7131 36 + return wr->buffer_index[pos / LZMA_IOBUF_SIZE]
slaxemulator@7131 37 + [pos % LZMA_IOBUF_SIZE];
slaxemulator@7131 38 + }
slaxemulator@7131 39 if (!wr->flush) {
slaxemulator@7131 40 int32_t pos;
slaxemulator@7131 41 while (offs > wr->header->dict_size)
slaxemulator@7131 42 @@ -309,8 +321,41 @@
slaxemulator@7131 43
slaxemulator@7131 44 }
slaxemulator@7131 45
slaxemulator@7131 46 +static inline void INIT write_byte_if_cpio(struct writer *wr, uint8_t byte)
slaxemulator@7131 47 +{
slaxemulator@7131 48 + if (wr->buffer_pos % LZMA_IOBUF_SIZE == 0) {
slaxemulator@7131 49 + // if the following large_malloc fails, the initramfs
slaxemulator@7131 50 + // whould not be load with is_cpio_flush forced 0 too.
slaxemulator@7131 51 + // Remember we do not allocate historic buffer.
slaxemulator@7131 52 + // Let's assume it will never fail !
slaxemulator@7131 53 + if (wr->next_index >= wr->max_index) {
slaxemulator@7131 54 + // realloc wr->buffer_index
slaxemulator@7131 55 + uint8_t **p = wr->buffer_index;
slaxemulator@7131 56 + wr->buffer_index = (uint8_t **)
slaxemulator@7131 57 + large_malloc(LZMA_IOBUF_SIZE +
slaxemulator@7131 58 + sizeof(*p) * wr->max_index);
slaxemulator@7131 59 + if (wr->max_index) {
slaxemulator@7131 60 + memcpy(wr->buffer_index, p,
slaxemulator@7131 61 + sizeof(*p) * wr->max_index);
slaxemulator@7131 62 + free(p);
slaxemulator@7131 63 + }
slaxemulator@7131 64 + wr->max_index += LZMA_IOBUF_SIZE / sizeof(*p);
slaxemulator@7131 65 + }
slaxemulator@7131 66 + wr->buffer_index[wr->next_index++] =
slaxemulator@7131 67 + (uint8_t *) large_malloc(LZMA_IOBUF_SIZE);
slaxemulator@7131 68 + }
slaxemulator@7131 69 + wr->buffer_index[wr->buffer_pos / LZMA_IOBUF_SIZE]
slaxemulator@7131 70 + [wr->buffer_pos % LZMA_IOBUF_SIZE] =
slaxemulator@7131 71 + wr->previous_byte = byte;
slaxemulator@7131 72 + wr->buffer_pos++;
slaxemulator@7131 73 +}
slaxemulator@7131 74 +
slaxemulator@7131 75 static inline void INIT write_byte(struct writer *wr, uint8_t byte)
slaxemulator@7131 76 {
slaxemulator@7131 77 + if (wr->is_cpio_flush) {
slaxemulator@7131 78 + write_byte_if_cpio(wr, byte);
slaxemulator@7131 79 + return;
slaxemulator@7131 80 + }
slaxemulator@7131 81 wr->buffer[wr->buffer_pos++] = wr->previous_byte = byte;
slaxemulator@7131 82 if (wr->flush && wr->buffer_pos == wr->header->dict_size) {
slaxemulator@7131 83 wr->buffer_pos = 0;
slaxemulator@7131 84 @@ -328,7 +373,21 @@
slaxemulator@7131 85 static inline void INIT copy_bytes(struct writer *wr,
slaxemulator@7131 86 uint32_t rep0, int len)
slaxemulator@7131 87 {
slaxemulator@7131 88 - do {
slaxemulator@7131 89 + if (wr->is_cpio_flush) {
slaxemulator@7131 90 + int32_t pos;
slaxemulator@7131 91 + uint32_t offs = rep0;
slaxemulator@7131 92 + while (offs > wr->header->dict_size)
slaxemulator@7131 93 + offs -= wr->header->dict_size;
slaxemulator@7131 94 + pos = wr->buffer_pos - offs;
slaxemulator@7131 95 + do {
slaxemulator@7131 96 + write_byte_if_cpio(wr,
slaxemulator@7131 97 + wr->buffer_index[pos / LZMA_IOBUF_SIZE]
slaxemulator@7131 98 + [pos % LZMA_IOBUF_SIZE]);
slaxemulator@7131 99 + pos++;
slaxemulator@7131 100 + len--;
slaxemulator@7131 101 + } while (len != 0 && wr->buffer_pos < wr->header->dst_size);
slaxemulator@7131 102 + }
slaxemulator@7131 103 + else do {
slaxemulator@7131 104 copy_byte(wr, rep0);
slaxemulator@7131 105 len--;
slaxemulator@7131 106 } while (len != 0 && wr->buffer_pos < wr->header->dst_size);
slaxemulator@7131 107 @@ -339,6 +398,9 @@
slaxemulator@7131 108 int pos_state, uint16_t *prob,
slaxemulator@7131 109 int lc, uint32_t literal_pos_mask) {
slaxemulator@7131 110 int mi = 1;
slaxemulator@7131 111 + static const int state[LZMA_NUM_STATES] =
slaxemulator@7131 112 + { 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5 };
slaxemulator@7131 113 +
slaxemulator@7131 114 rc_update_bit_0(rc, prob);
slaxemulator@7131 115 prob = (p + LZMA_LITERAL +
slaxemulator@7131 116 (LZMA_LIT_SIZE
slaxemulator@7131 117 @@ -369,18 +431,13 @@
slaxemulator@7131 118 rc_get_bit(rc, prob_lit, &mi);
slaxemulator@7131 119 }
slaxemulator@7131 120 write_byte(wr, mi);
slaxemulator@7131 121 - if (cst->state < 4)
slaxemulator@7131 122 - cst->state = 0;
slaxemulator@7131 123 - else if (cst->state < 10)
slaxemulator@7131 124 - cst->state -= 3;
slaxemulator@7131 125 - else
slaxemulator@7131 126 - cst->state -= 6;
slaxemulator@7131 127 + cst->state = state[cst->state];
slaxemulator@7131 128 }
slaxemulator@7131 129
slaxemulator@7131 130 static inline void INIT process_bit1(struct writer *wr, struct rc *rc,
slaxemulator@7131 131 struct cstate *cst, uint16_t *p,
slaxemulator@7131 132 int pos_state, uint16_t *prob) {
slaxemulator@7131 133 - int offset;
slaxemulator@7131 134 + int offset;
slaxemulator@7131 135 uint16_t *prob_len;
slaxemulator@7131 136 int num_bits;
slaxemulator@7131 137 int len;
slaxemulator@7131 138 @@ -396,7 +453,7 @@
slaxemulator@7131 139 prob = p + LZMA_LEN_CODER;
slaxemulator@7131 140 } else {
slaxemulator@7131 141 rc_update_bit_1(rc, prob);
slaxemulator@7131 142 - prob = p + LZMA_IS_REP_G0 + cst->state;
slaxemulator@7131 143 + prob += LZMA_IS_REP_G0 - LZMA_IS_REP;
slaxemulator@7131 144 if (rc_is_bit_0(rc, prob)) {
slaxemulator@7131 145 rc_update_bit_0(rc, prob);
slaxemulator@7131 146 prob = (p + LZMA_IS_REP_0_LONG
slaxemulator@7131 147 @@ -417,13 +474,13 @@
slaxemulator@7131 148 uint32_t distance;
slaxemulator@7131 149
slaxemulator@7131 150 rc_update_bit_1(rc, prob);
slaxemulator@7131 151 - prob = p + LZMA_IS_REP_G1 + cst->state;
slaxemulator@7131 152 + prob += LZMA_IS_REP_G1 - LZMA_IS_REP_G0;
slaxemulator@7131 153 if (rc_is_bit_0(rc, prob)) {
slaxemulator@7131 154 rc_update_bit_0(rc, prob);
slaxemulator@7131 155 distance = cst->rep1;
slaxemulator@7131 156 } else {
slaxemulator@7131 157 rc_update_bit_1(rc, prob);
slaxemulator@7131 158 - prob = p + LZMA_IS_REP_G2 + cst->state;
slaxemulator@7131 159 + prob += LZMA_IS_REP_G2 - LZMA_IS_REP_G1;
slaxemulator@7131 160 if (rc_is_bit_0(rc, prob)) {
slaxemulator@7131 161 rc_update_bit_0(rc, prob);
slaxemulator@7131 162 distance = cst->rep2;
slaxemulator@7131 163 @@ -444,24 +501,24 @@
slaxemulator@7131 164 prob_len = prob + LZMA_LEN_CHOICE;
slaxemulator@7131 165 if (rc_is_bit_0(rc, prob_len)) {
slaxemulator@7131 166 rc_update_bit_0(rc, prob_len);
slaxemulator@7131 167 - prob_len = (prob + LZMA_LEN_LOW
slaxemulator@7131 168 + prob_len += LZMA_LEN_LOW - LZMA_LEN_CHOICE
slaxemulator@7131 169 + (pos_state <<
slaxemulator@7131 170 - LZMA_LEN_NUM_LOW_BITS));
slaxemulator@7131 171 + LZMA_LEN_NUM_LOW_BITS);
slaxemulator@7131 172 offset = 0;
slaxemulator@7131 173 num_bits = LZMA_LEN_NUM_LOW_BITS;
slaxemulator@7131 174 } else {
slaxemulator@7131 175 rc_update_bit_1(rc, prob_len);
slaxemulator@7131 176 - prob_len = prob + LZMA_LEN_CHOICE_2;
slaxemulator@7131 177 + prob_len += LZMA_LEN_CHOICE_2 - LZMA_LEN_CHOICE;
slaxemulator@7131 178 if (rc_is_bit_0(rc, prob_len)) {
slaxemulator@7131 179 rc_update_bit_0(rc, prob_len);
slaxemulator@7131 180 - prob_len = (prob + LZMA_LEN_MID
slaxemulator@7131 181 + prob_len += LZMA_LEN_MID - LZMA_LEN_CHOICE_2
slaxemulator@7131 182 + (pos_state <<
slaxemulator@7131 183 - LZMA_LEN_NUM_MID_BITS));
slaxemulator@7131 184 + LZMA_LEN_NUM_MID_BITS);
slaxemulator@7131 185 offset = 1 << LZMA_LEN_NUM_LOW_BITS;
slaxemulator@7131 186 num_bits = LZMA_LEN_NUM_MID_BITS;
slaxemulator@7131 187 } else {
slaxemulator@7131 188 rc_update_bit_1(rc, prob_len);
slaxemulator@7131 189 - prob_len = prob + LZMA_LEN_HIGH;
slaxemulator@7131 190 + prob_len += LZMA_LEN_HIGH - LZMA_LEN_CHOICE_2;
slaxemulator@7131 191 offset = ((1 << LZMA_LEN_NUM_LOW_BITS)
slaxemulator@7131 192 + (1 << LZMA_LEN_NUM_MID_BITS));
slaxemulator@7131 193 num_bits = LZMA_LEN_NUM_HIGH_BITS;
slaxemulator@7131 194 @@ -529,6 +586,7 @@
slaxemulator@7131 195 void(*error_fn)(char *x)
slaxemulator@7131 196 )
slaxemulator@7131 197 {
slaxemulator@7131 198 + extern int cpio_flush_buffer(void*, unsigned int);
slaxemulator@7131 199 struct lzma_header header;
slaxemulator@7131 200 int lc, pb, lp;
slaxemulator@7131 201 uint32_t pos_state_mask;
slaxemulator@7131 202 @@ -563,6 +621,10 @@
slaxemulator@7131 203 wr.global_pos = 0;
slaxemulator@7131 204 wr.previous_byte = 0;
slaxemulator@7131 205 wr.buffer_pos = 0;
slaxemulator@7131 206 + wr.is_cpio_flush = 0;
slaxemulator@7131 207 + if (flush == cpio_flush_buffer)
slaxemulator@7131 208 + wr.is_cpio_flush = 1;
slaxemulator@7131 209 + wr.buffer_index = NULL;
slaxemulator@7131 210
slaxemulator@7131 211 rc_init(&rc, fill, inbuf, in_len);
slaxemulator@7131 212
slaxemulator@7131 213 @@ -596,23 +658,23 @@
slaxemulator@7131 214 if (header.dict_size == 0)
slaxemulator@7131 215 header.dict_size = 1;
slaxemulator@7131 216
slaxemulator@7131 217 - if (output)
slaxemulator@7131 218 + if (output || wr.is_cpio_flush)
slaxemulator@7131 219 wr.buffer = output;
slaxemulator@7131 220 else {
slaxemulator@7131 221 wr.bufsize = MIN(header.dst_size, header.dict_size);
slaxemulator@7131 222 wr.buffer = large_malloc(wr.bufsize);
slaxemulator@7131 223 }
slaxemulator@7131 224 - if (wr.buffer == NULL)
slaxemulator@7131 225 + if (wr.buffer == NULL && !wr.is_cpio_flush)
slaxemulator@7131 226 goto exit_1;
slaxemulator@7131 227
slaxemulator@7131 228 num_probs = LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp));
slaxemulator@7131 229 p = (uint16_t *) large_malloc(num_probs * sizeof(*p));
slaxemulator@7131 230 if (p == 0)
slaxemulator@7131 231 goto exit_2;
slaxemulator@7131 232 - num_probs = LZMA_LITERAL + (LZMA_LIT_SIZE << (lc + lp));
slaxemulator@7131 233 + num_probs += LZMA_LITERAL - LZMA_BASE_SIZE;
slaxemulator@7131 234 for (i = 0; i < num_probs; i++)
slaxemulator@7131 235 p[i] = (1 << RC_MODEL_TOTAL_BITS) >> 1;
slaxemulator@7131 236 -
slaxemulator@7131 237 + wr.max_index = wr.next_index = 0;
slaxemulator@7131 238 rc_init_code(&rc);
slaxemulator@7131 239
slaxemulator@7131 240 while (get_pos(&wr) < header.dst_size) {
slaxemulator@7131 241 @@ -631,12 +693,25 @@
slaxemulator@7131 242
slaxemulator@7131 243 if (posp)
slaxemulator@7131 244 *posp = rc.ptr-rc.buffer;
slaxemulator@7131 245 - if (wr.flush)
slaxemulator@7131 246 + if (wr.is_cpio_flush) {
slaxemulator@7131 247 + int i;
slaxemulator@7131 248 + for (i = 0; i < wr.next_index -1; i++) {
slaxemulator@7131 249 + wr.flush(wr.buffer_index[i], LZMA_IOBUF_SIZE);
slaxemulator@7131 250 + large_free(wr.buffer_index[i]);
slaxemulator@7131 251 + }
slaxemulator@7131 252 + if (i < wr.next_index) {
slaxemulator@7131 253 + wr.flush(wr.buffer_index[i],
slaxemulator@7131 254 + wr.buffer_pos % LZMA_IOBUF_SIZE);
slaxemulator@7131 255 + large_free(wr.buffer_index[i]);
slaxemulator@7131 256 + }
slaxemulator@7131 257 + large_free(wr.buffer_index);
slaxemulator@7131 258 + }
slaxemulator@7131 259 + else if (wr.flush)
slaxemulator@7131 260 wr.flush(wr.buffer, wr.buffer_pos);
slaxemulator@7131 261 ret = 0;
slaxemulator@7131 262 large_free(p);
slaxemulator@7131 263 exit_2:
slaxemulator@7131 264 - if (!output)
slaxemulator@7131 265 + if (!output && !wr.is_cpio_flush)
slaxemulator@7131 266 large_free(wr.buffer);
slaxemulator@7131 267 exit_1:
slaxemulator@7131 268 if (!buf)