From 196fe5443217aee1b54f00d8c29eb689e53a0f13 Mon Sep 17 00:00:00 2001 From: powturbo Date: Sun, 24 Apr 2016 21:23:01 +0200 Subject: [PATCH] Variable byte: 15/16/32/64 bits integer arrays --- vint.h | 65 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 14 deletions(-) diff --git a/vint.h b/vint.h index 4309609..98ad0b8 100644 --- a/vint.h +++ b/vint.h @@ -25,31 +25,58 @@ #ifndef VINT_H #define VINT_H #include +#include "conf.h" #ifdef __cplusplus extern "C" { #endif //----------------------------------- Variable byte single value macros (low level) ----------------------------------------------- //------------- 32 bits ------------- -extern unsigned char vtab[]; #define _vbput32(_op_, _x_, _act_) {\ - if(likely(_x_ < (1<< 7))) { *_op_++ = _x_; _act_;}\ - else if(likely(_x_ < (1<<14))) { ctou16(_op_) = _x_ << 8 | _x_ >> 8 | 0x80; _op_ += 2; _act_;}\ - else if(likely(_x_ < (1<<21))) { *_op_++ = _x_ >> 16 | 0xc0; ctou32(_op_) = _x_; _op_ += 2; _act_;}\ - else if(likely(_x_ < (1<<28))) { ctou32(_op_) = rol32(_x_,8) | 0xe0; _op_ += 4; _act_;}\ - else { *_op_++ = (unsigned long long)_x_ >> 32 | 0xf0; ctou32(_op_) = _x_; _op_ += 4; _act_;}\ + if(likely(_x_ < (1<< 7))) { *_op_++ = _x_; _act_;}\ + else if(likely(_x_ < (1<<14))) { ctou16(_op_) = bswap16(_x_| 0x8000); _op_ += 2; _act_;}\ + else if(likely(_x_ < (1<<21))) { *_op_++ = _x_ >> 16 | 0xc0; ctou16(_op_) = _x_; _op_ += 2; _act_;}\ + else if(likely(_x_ < (1<<28))) { ctou32(_op_) = bswap32(_x_| 0xe0000000); _op_ += 4; _act_;}\ + else { *_op_++ = (unsigned long long)_x_ >> 32 | 0xf0; ctou32(_op_) = _x_; _op_ += 4; _act_;}\ } #define _vbget32(_ip_, _x_, _act_) do { _x_ = *_ip_++;\ if(!(_x_ & 0x80)) { _act_;}\ - else if(!(_x_ & 0x40)) { _x_ = (_x_ & 0x3f)<< 8 | *_ip_++; _act_;}\ + else if(!(_x_ & 0x40)) { _x_ = bswap16(ctou16(_ip_++-1) & 0xff3f); _act_;}\ else if(!(_x_ & 0x20)) { _x_ = (_x_ & 0x1f)<<16 | ctou16(_ip_); _ip_ += 2; _act_;}\ - else if(!(_x_ & 0x10)) { _x_ = ror32(ctou32(_ip_-1),8) & 0xfffffff; _ip_ += 3; _act_;}\ + else if(!(_x_ & 0x10)) { _x_ = bswap32(ctou32(_ip_-1) & 0xffffff0f) ; _ip_ += 3; _act_;}\ else { _x_ = (unsigned long long)(_x_ & 0x07)<<32 | ctou32(_ip_); _ip_ += 4; _act_;}\ } while(0) +#define _vblen32(_x_) ((_x_) >= (1<<7)?((_x_) >= (1<<14)?((_x_) >= (1<<21)?((_x_) >= (1<<28)?5:4):3):2):1) +#define _vbvlen32(_x_) _vtab32_[((unsigned char)(_x_))>>4] //------------- 64 bits ----------- #define _vbput64(_op_, _x_, _act_) {\ + if(likely(_x_ < (1<< 7))) { *_op_++ = _x_; _act_;}\ + else if(likely(_x_ < (1<<14))) { ctou16(_op_) = bswap16(_x_| 0x8000); _op_ += 2; _act_;}\ + else if(likely(_x_ < (1<<21))) { *_op_++ = _x_ >> 16 | 0xc0; ctou16(_op_) = _x_; _op_ += 2; _act_;}\ + else if(likely(_x_ < (1<<28))) { ctou32(_op_) = bswap32(_x_| 0xe0000000); _op_ += 4; _act_;}\ + else if( _x_ < 1ull<<35) { *_op_++ = _x_ >> 32 | 0xf0; ctou32(_op_) = _x_; _op_ += 4; _act_;}\ + else if( _x_ < 1ull<<42) { ctou16(_op_) = bswap16(_x_ >> 32 | 0xf800); _op_ += 2; ctou32(_op_) = _x_; _op_ += 4; _act_;}\ + else if( _x_ < 1ull<<49) { *_op_++ = _x_ >> 48 | 0xfc; ctou16(_op_) = _x_ >> 32; _op_ += 2; ctou32(_op_) = _x_; _op_ += 4; _act_;}\ + else if( _x_ < 1ull<<56) { ctou64(_op_) = bswap64(_x_ | 0xfe00000000000000ull); _op_ += 8; _act_;}\ + else { *_op_++ = 0xff; ctou64(_op_) = _x_; _op_ += 8; _act_;}\ +} + +#define _vbget64(_ip_, _x_, _act_) do { _x_ = *_ip_++;\ + if(!(_x_ & 0x80)) { _act_;}\ + else if(!(_x_ & 0x40)) { _x_ = bswap16(ctou16(_ip_++-1) & 0xff3f); _act_;}\ + else if(!(_x_ & 0x20)) { _x_ = (_x_ & 0x1f)<<16 | ctou16(_ip_); _ip_ += 2; _act_;}\ + else if(!(_x_ & 0x10)) { _x_ = bswap32(ctou32(_ip_-1) & 0xffffff0f); _ip_ += 3; _act_;}\ + else if(!(_x_ & 0x08)) { _x_ = (_x_ & 0x07)<<32 | ctou32(_ip_); _ip_ += 4; _act_;}\ + else if(!(_x_ & 0x04)) { _x_ = (unsigned long long)(bswap16(ctou16(_ip_-1)) & 0x7ff) << 32 | ctou32(_ip_+1); _ip_ += 5; _act_;}\ + else if(!(_x_ & 0x02)) { _x_ = (_x_ & 0x03)<<48 | (unsigned long long)ctou16(_ip_) << 32 | ctou32(_ip_+2); _ip_ += 6; _act_;}\ + else if(!(_x_ & 0x01)) { _x_ = bswap64(ctou64(_ip_-1)) & 0x01ffffffffffffffull; _ip_ += 7; _act_;}\ + else { _x_ = ctou64(_ip_); _ip_ += 8; _act_;}\ +} while(0) + + +#define _vbput640(_op_, _x_, _act_) {\ if(_x_ < 1 << 7) { *_op_++ = _x_ << 1; _act_;}\ else if(_x_ < 1 <<14) { ctou16(_op_) = _x_ << 2 | 0x01; _op_ += 2; _act_;}\ else if(_x_ < 1 <<21) { ctou16(_op_) = _x_ << 3 | 0x03; _op_ += 2; *_op_++ = _x_ >> 13; _act_;}\ @@ -61,7 +88,7 @@ extern unsigned char vtab[]; else { *_op_++ = 0xff; ctou64(_op_) = _x_; _op_+=8; _act_;}\ } -#define _vbget64(_ip_, _x_, _act_) do {\ +#define _vbget640(_ip_, _x_, _act_) do {\ if(!((_x_ = *_ip_) & 1<<0)) { _ip_++; _x_ >>= 1; _act_;}\ else if(!(_x_ & 1<<1)) { _x_ = ctou16(_ip_) >> 2; _ip_ += 2; _act_;}\ else if(!(_x_ & 1<<2)) { _x_ = ctou16(_ip_) >> 3 | *(_ip_+2) << 13; _ip_ += 3; _act_;}\ @@ -73,6 +100,10 @@ extern unsigned char vtab[]; else { _x_ = ctou64(_ip_+1); _ip_ += 9; _act_;}\ } while(0) + +#define _vblen64(_x_) ((_x_) >= (1<<7)?((_x_) >= (1<<14)?((_x_) >= (1<<21)?((_x_) >= (1<<28)?((_x_) >= (1ull<<35)?((_x_) >= (1ull<<42)?((_x_) >= (1ull<<49)?((_x_) >= (1ull<<56)?9:8):7):6):5):4):3):2):1) +#define _vbvlen64(_x_) _vtab64_[_x_] + //------------- 16 bits ----------- #define _vbput16(_op_, _x_, _act_) _vbput32(_op_, _x_, _act_) #define _vbget16(_ip_, _x_, _act_) _vbget32(_ip_, _x_, _act_) @@ -80,14 +111,20 @@ extern unsigned char vtab[]; //------------- 15 bits ----------- #define _vbput15(_op_, _x_, _act_) do { if(likely((_x_) < 0x80)) { *_op_++ = _x_; _act_; } else { *_op_++ = (_x_) >> 8 | 0x80; *_op_++ = _x_; } } while(0) #define _vbget15(_ip_, _x_, _act_) do { if(!((_x_ = *_ip_++) & 0x80)) _x_ = (_x_ & 0x7f) << 8 | *_ip_++; _act_; } while(0) +#define _vblen15(_x_) ((_x_) >= 0x80?2:1) //----------------------------- Variable byte functions ----------------------------------------------------------------------- // ---- Variable byte length after compressing value _x_ -#define vblen32(_x_) ({ unsigned _x = _x_; _x > 0x7f?(_x > 0x3fff?(_x > 0x1fffff?(_x > 0x0fffffff?5:4):3):2):1; }) -#define vblen15(_x_) ((_x_) > 0x7f?2:1) +static inline unsigned vblen64(uint64_t x) { return _vblen64(x); } +static inline unsigned vblen32(unsigned x) { return _vblen32(x); } +static inline unsigned vblen16(unsigned short x) { return _vblen32(x); } +static inline unsigned vblen15(unsigned short x) { return _vblen15(x); } -// ---- Length of compressed value. Input _x_ is the compressed buffer start -#define vbvlen32(_x_) vtab[((unsigned char)(_x_))>>4] +// ---- Length of compressed value. Input in is the compressed buffer start +static inline unsigned vbvlen64(unsigned char *in) { return in[0]==0xff?9:clz32(in[0] ^ 0xff) - 23; } +static inline unsigned vbvlen32(unsigned char *in) { return clz32((in[0] ^ 0xff) | 0x08) - 23; } +#define vbvlen16(p) vbvlen32(p) +static inline unsigned vbvlen15(unsigned char *in) { return (in[0] >> 7)+1; } //----- encode/decode 16/32/64 single value and advance output/input pointer #define vbput64(_op_, _x_) { unsigned long long _x = _x_; _vbput64(_op_, _x, ;); } @@ -104,7 +141,7 @@ extern unsigned char vtab[]; unsigned char *vbenc64( uint64_t *__restrict in, unsigned n, unsigned char *__restrict out); unsigned char *vbenc32( unsigned *__restrict in, unsigned n, unsigned char *__restrict out); unsigned char *vbenc16( unsigned short *__restrict in, unsigned n, unsigned char *__restrict out); -unsigned char *vbenc15( unsigned short *__restrict in, unsigned n, unsigned char *__restrict out); +unsigned char *vbenc15( unsigned short *__restrict in, unsigned n, unsigned char *__restrict out); // 15 bits range (0-0x7fff) //----- Decode Return value = end of compressed input buffer in unsigned char *vbdec64( unsigned char *__restrict in, unsigned n, uint64_t *__restrict out);