Ignore:
Timestamp:
Jan 1, 2014, 12:47:38 AM (11 years ago)
Author:
Bruno Cornec
Message:
  • Update mindi-busybox to 1.21.1
Location:
branches/3.2/mindi-busybox/archival/libarchive/bz
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/3.2/mindi-busybox/archival/libarchive/bz/blocksort.c

    r2725 r3232  
    386386 */
    387387
    388 #if CONFIG_BZIP2_FEATURE_SPEED >= 1
     388#if CONFIG_BZIP2_FAST >= 1
    389389
    390390#define TIMES_8(code) \
    … …  
    497497
    498498/* 1.5% overall speedup, +290 bytes */
    499 #if CONFIG_BZIP2_FEATURE_SPEED >= 3
     499#if CONFIG_BZIP2_FAST >= 3
    500500            /*-- copy 2 --*/
    501501            if (i > hi) break;
    … …  
    751751    i = nblock - 1;
    752752/* 3%, +300 bytes */
    753 #if CONFIG_BZIP2_FEATURE_SPEED >= 2
     753#if CONFIG_BZIP2_FAST >= 2
    754754    for (; i >= 3; i -= 4) {
    755755        quadrant[i] = 0;
    … …  
    788788    s = block[0] << 8;
    789789    i = nblock - 1;
    790 #if CONFIG_BZIP2_FEATURE_SPEED >= 2
     790#if CONFIG_BZIP2_FAST >= 2
    791791    for (; i >= 3; i -= 4) {
    792792        s = (s >> 8) | (block[i] << 8);

  • branches/3.2/mindi-busybox/archival/libarchive/bz/bzlib_private.h

    r2725 r3232  
    184184    int32_t  sendMTFValues__code [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
    185185    int32_t  sendMTFValues__rfreq[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
    186 #if CONFIG_BZIP2_FEATURE_SPEED >= 5
     186#if CONFIG_BZIP2_FAST >= 5
    187187    /* second dimension: only 3 needed; 4 makes index calculations faster */
    188188    uint32_t sendMTFValues__len_pack[BZ_MAX_ALPHA_SIZE][4];

  • branches/3.2/mindi-busybox/archival/libarchive/bz/compress.c

    r2725 r3232  
    6262static
    6363/* Helps only on level 5, on other levels hurts. ? */
    64 #if CONFIG_BZIP2_FEATURE_SPEED >= 5
     64#if CONFIG_BZIP2_FAST >= 5
    6565ALWAYS_INLINE
    6666#endif
    … …  
    252252    int32_t v, t, i, j, gs, ge, totc, bt, bc, iter;
    253253    int32_t nSelectors, alphaSize, minLen, maxLen, selCtr;
    254     int32_t nGroups, nBytes;
     254    int32_t nGroups;
    255255
    256256    /*
    … …  
    332332                s->rfreq[t][v] = 0;
    333333
    334 #if CONFIG_BZIP2_FEATURE_SPEED >= 5
     334#if CONFIG_BZIP2_FAST >= 5
    335335        /*
    336336         * Set up an auxiliary length table which is used to fast-track
    … …  
    362362            for (t = 0; t < nGroups; t++)
    363363                cost[t] = 0;
    364 #if CONFIG_BZIP2_FEATURE_SPEED >= 5
     364#if CONFIG_BZIP2_FAST >= 5
    365365            if (nGroups == 6 && 50 == ge-gs+1) {
    366366                /*--- fast track the common case ---*/
    … …  
    421421             */
    422422/* 1% faster compress. +800 bytes */
    423 #if CONFIG_BZIP2_FEATURE_SPEED >= 4
     423#if CONFIG_BZIP2_FAST >= 4
    424424            if (nGroups == 6 && 50 == ge-gs+1) {
    425425                /*--- fast track the common case ---*/
    … …  
    513513        }
    514514
    515         nBytes = s->numZ;
    516515        bsW(s, 16, inUse16);
    517516
    … …  
    529528
    530529    /*--- Now the selectors. ---*/
    531     nBytes = s->numZ;
    532530    bsW(s, 3, nGroups);
    533531    bsW(s, 15, nSelectors);
    … …  
    539537
    540538    /*--- Now the coding tables. ---*/
    541     nBytes = s->numZ;
    542 
    543539    for (t = 0; t < nGroups; t++) {
    544540        int32_t curr = s->len[t][0];
    … …  
    552548
    553549    /*--- And finally, the block data proper ---*/
    554     nBytes = s->numZ;
    555550    selCtr = 0;
    556551    gs = 0;

  • branches/3.2/mindi-busybox/archival/libarchive/bz/huffman.c

    r2725 r3232  
    4949
    5050/* 90 bytes, 0.3% of overall compress speed */
    51 #if CONFIG_BZIP2_FEATURE_SPEED >= 1
     51#if CONFIG_BZIP2_FAST >= 1
    5252
    5353/* macro works better than inline (gcc 4.2.1) */
Note: See TracChangeset for help on using the changeset viewer.