wok-tiny annotate kernel-modular/stuff/linux-unlzma-2.6.37.u @ rev 57

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