wok annotate linux/stuff/linux-unlzma-2.6.30.4.u @ rev 3919

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