diff --git a/vint.c~ b/vint.c~ deleted file mode 100644 index 2737426..0000000 --- a/vint.c~ +++ /dev/null @@ -1,236 +0,0 @@ -/** - Copyright (C) powturbo 2013-2016 - GPL v2 License - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - - homepage : https://sites.google.com/site/powturbo/ - - github : https://github.com/powturbo - - twitter : https://twitter.com/powturbo - - email : powturbo [_AT_] gmail [_DOT_] com -**/ -// vint.c - "Integer Compression" variable byte -#include - -#include "conf.h" -#include "vint.h" -#include "bitutil.h" - -//-------------------------------------- variable byte : 32 bits ---------------------------------------------------------------- - //0000 0001 0010 0011 0100 0101 0110 0111 1000 1001 1010 1011 1100 1101 1110 1111 -unsigned char vtab[] = { 1, 1, 1, 1, 1, 1, 1, 1, 5, 4, 3, 3, 2, 2, 2, 2 }; - -// decompress buffer into an array of n unsigned values. Return value = end of decompressed buffer in -unsigned char *vbdec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out) { register unsigned x, *op; - for(op = out; op != out+(n&~(8-1)); op += 8) { - _vbget32(in, x, op[0] = x); - _vbget32(in, x, op[1] = x); - _vbget32(in, x, op[2] = x); - _vbget32(in, x, op[3] = x); __builtin_prefetch(in+256, 0); - _vbget32(in, x, op[4] = x); - _vbget32(in, x, op[5] = x); - _vbget32(in, x, op[6] = x); - _vbget32(in, x, op[7] = x); - } - while(op != out+n) _vbget32(in, x, *op++ = x ); - return in; -} - -// encode array with n unsigned (32 bits in[n]) values to the buffer out. Return value = end of compressed buffer out -unsigned char *vbenc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out) { register unsigned x, *ip; - for(ip = in; ip != in+(n&~(8-1)); ip += 8) { __builtin_prefetch(ip+128, 0); - x = ip[0]; _vbput32(out, x, ;); - x = ip[1]; _vbput32(out, x, ;); - x = ip[2]; _vbput32(out, x, ;); - x = ip[3]; _vbput32(out, x, ;); - x = ip[4]; _vbput32(out, x, ;); - x = ip[5]; _vbput32(out, x, ;); - x = ip[6]; _vbput32(out, x, ;); - x = ip[7]; _vbput32(out, x, ;); - } - while(ip != in+n) { x = *ip++; _vbput32(out, x, ;); } - return out; -} - -unsigned char *vbdec64(unsigned char *__restrict in, unsigned n, uint64_t *__restrict out) { uint64_t x,*op; - for(op = out; op != out+(n&~(4-1)); op += 4) { - _vbget64(in, x, op[0] = x); - _vbget64(in, x, op[1] = x); - _vbget64(in, x, op[2] = x); - _vbget64(in, x, op[3] = x); - } - while(op != out+n) { _vbget64(in, x, ; ); *op++ = x; } - return in; -} - -// encode array with n unsigned (32 bits in[n]) values to the buffer out. Return value = end of compressed buffer out -unsigned char *vbenc64(uint64_t *__restrict in, unsigned n, unsigned char *__restrict out) { uint64_t *ip; - for(ip = in; ip != in+(n&~(4-1)); ) { - vbput64(out, *ip++); - vbput64(out, *ip++); - vbput64(out, *ip++); - vbput64(out, *ip++); - } - while(ip != in+n) vbput64(out, *ip++); - return out; -} - -//---------------------------------- increasing integer lists ---------------------------------------------------------------------------------------------------- -unsigned char *vbdenc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out, unsigned start) { - unsigned *ip,v; - for(ip = in; ip != in+(n&~(4-1)); ) { - v = (*ip)-start; start=*ip++; _vbput32(out, v, ;); - v = (*ip)-start; start=*ip++; _vbput32(out, v, ;); - v = (*ip)-start; start=*ip++; _vbput32(out, v, ;); - v = (*ip)-start; start=*ip++; _vbput32(out, v, ;); - } - while(ip < in+n) { v = (*ip)-start; start = *ip++; _vbput32(out, v, ;); } - return out; -} - -unsigned char *vbddec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out, unsigned start) { - unsigned x,*op; - for(op = out; op != out+(n&~(8-1)); ) { - _vbget32(in, x, ;); *op++ = (start += x); - _vbget32(in, x, ;); *op++ = (start += x); - _vbget32(in, x, ;); *op++ = (start += x); - _vbget32(in, x, ;); *op++ = (start += x); - _vbget32(in, x, ;); *op++ = (start += x); - _vbget32(in, x, ;); *op++ = (start += x); - _vbget32(in, x, ;); *op++ = (start += x); - _vbget32(in, x, ;); *op++ = (start += x); - } - while(op != out+n) _vbget32(in, x, *op++ = (start += x)); - return in; -} - -//----------------------------------strictly increasing (never remaining constant or decreasing) integer lists--------------------------------------------------------- -#define VINT_Z -unsigned char *vbd1enc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out, unsigned start) { - unsigned *ip, v, b = 0; - unsigned char *op = out; - #ifdef VINT_Z - v = in[0] - start - 1; - unsigned long long u = (unsigned long long)v<<1; - if(n == 1) u |= 1; - _vbput32(op, u, ;); - if(!--n) return op; - start = *in++; - #endif - for(ip = in; ip != in + (n&~(4-1)); ) { - v = (*ip)-start-1; start = *ip++; _vbput32(op, v, ;); b |= v; - v = (*ip)-start-1; start = *ip++; _vbput32(op, v, ;); b |= v; - v = (*ip)-start-1; start = *ip++; _vbput32(op, v, ;); b |= v; - v = (*ip)-start-1; start = *ip++; _vbput32(op, v, ;); b |= v; - } - while(ip != in+n) { v = (*ip)-start-1; start = *ip++; _vbput32(op, v, ;); b |= v; } - #ifdef VINT_Z - if(!b) { - u = (unsigned long long)in[-1] << 1 | 1; - _vbput32(out, u, ;); - return out; - } - #endif - return op; -} - -unsigned char *vbd1dec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out, unsigned start) { - unsigned x,*op; - #ifdef VINT_Z - unsigned long long u; _vbget32(in, u, ;); x = u>>1; *out = (start += x+1); - if(u & 1) { - #ifdef __SSE2__ - out++; --n; BITDIZERO32(out, n, start, 1); - #else - for(x = 1; x < n; x++) out[x] = start+x; - #endif - return in; - } - out++; --n; - #endif - - for(op = out; op != out+(n&~(8-1)); ) { - _vbget32(in, x, ++x); *op++ = (start += x); - _vbget32(in, x, ++x); *op++ = (start += x); - _vbget32(in, x, ++x); *op++ = (start += x); - _vbget32(in, x, ++x); *op++ = (start += x); - _vbget32(in, x, ++x); *op++ = (start += x); - _vbget32(in, x, ++x); *op++ = (start += x); - _vbget32(in, x, ++x); *op++ = (start += x); - _vbget32(in, x, ++x); *op++ = (start += x); - } - while(op != out+n) { _vbget32(in, x, ++x); *op++ = (start += x); } - return in; -} - -//--------------------------------------- variable byte : 16/15 bits ------------------------------------------------------------------- -unsigned char *vbenc15(unsigned short *__restrict in, unsigned n, unsigned char *__restrict out) { unsigned short *in_ = in +n; while(in < in_) vbput15(out, *in++); return out;} -unsigned char *vbdec15(unsigned char *__restrict in, unsigned n, unsigned short *__restrict out) { unsigned short *out_ = out+n,x; while(out < out_) _vbget15(in, x, *out++ = x); return in; } - -unsigned char *vbenc16(unsigned short *__restrict in, unsigned n, unsigned char *__restrict out) { unsigned short *in_ = in +n; while(in < in_) vbput16(out, *in++); return out;} -unsigned char *vbdec16(unsigned char *__restrict in, unsigned n, unsigned short *__restrict out) { unsigned short *out_ = out+n,x; while(out < out_) _vbget16(in, x, *out++ = x); return in; } - -//---------------------------------- Zigzag encoding ------------------------------------------------------------------------------------ -unsigned char *vbzenc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out, unsigned start) { - unsigned *ip,v; - for(ip = in; ip != in+(n&~(4-1)); ) { - v = zigzagenc32((*ip)-start); start=*ip++; _vbput32(out, v, ;); - v = zigzagenc32((*ip)-start); start=*ip++; _vbput32(out, v, ;); - v = zigzagenc32((*ip)-start); start=*ip++; _vbput32(out, v, ;); - v = zigzagenc32((*ip)-start); start=*ip++; _vbput32(out, v, ;); - } - while(ip < in+n) { v = zigzagenc32((*ip)-start); start = *ip++; _vbput32(out, v, ;); } - return out; -} - -unsigned char *vbzdec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out, unsigned start) { - unsigned x,*op; - for(op = out; op != out+(n&~(8-1)); ) { - _vbget32(in, x, ;); *op++ = (start += zigzagdec32(x)); - _vbget32(in, x, ;); *op++ = (start += zigzagdec32(x)); - _vbget32(in, x, ;); *op++ = (start += zigzagdec32(x)); - _vbget32(in, x, ;); *op++ = (start += zigzagdec32(x)); - _vbget32(in, x, ;); *op++ = (start += zigzagdec32(x)); - _vbget32(in, x, ;); *op++ = (start += zigzagdec32(x)); - _vbget32(in, x, ;); *op++ = (start += zigzagdec32(x)); - _vbget32(in, x, ;); *op++ = (start += zigzagdec32(x)); - } - while(op != out+n) _vbget32(in, x, *op++ = (start += zigzagdec32(x))); - return in; -} - -unsigned char *vbzenc64(uint64_t *__restrict in, unsigned n, unsigned char *__restrict out, uint64_t start) { - uint64_t *ip,v; - for(ip = in; ip != in+(n&~(4-1)); ) { - v = zigzagenc64((*ip)-start); start=*ip++; _vbput64(out, v, ;); - v = zigzagenc64((*ip)-start); start=*ip++; _vbput64(out, v, ;); - v = zigzagenc64((*ip)-start); start=*ip++; _vbput64(out, v, ;); - v = zigzagenc64((*ip)-start); start=*ip++; _vbput64(out, v, ;); - } - while(ip < in+n) { v = zigzagenc64((*ip)-start); start = *ip++; _vbput64(out, v, ;); } - return out; -} - -unsigned char *vbzdec64(unsigned char *__restrict in, unsigned n, uint64_t *__restrict out, uint64_t start) { - uint64_t x,*op; - for(op = out; op != out+(n&~(4-1)); ) { - _vbget64(in, x, ;); *op++ = (start += zigzagdec64(x)); - _vbget64(in, x, ;); *op++ = (start += zigzagdec64(x)); - _vbget64(in, x, ;); *op++ = (start += zigzagdec64(x)); - _vbget64(in, x, ;); *op++ = (start += zigzagdec64(x)); - } - while(op != out+n) _vbget64(in, x, *op++ = (start += zigzagdec64(x))); - return in; -} diff --git a/vint.h~ b/vint.h~ deleted file mode 100644 index ec9426c..0000000 --- a/vint.h~ +++ /dev/null @@ -1,133 +0,0 @@ -/** - Copyright (C) powturbo 2013-2016 - GPL v2 License - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - - homepage : https://sites.google.com/site/powturbo/ - - github : https://github.com/powturbo - - twitter : https://twitter.com/powturbo - - email : powturbo [_AT_] gmail [_DOT_] com -**/ -// vint.h - "Integer Compression" variable byte include header - -#ifndef VINT_H -#define VINT_H -#include - -#ifdef __cplusplus -extern "C" { -#endif - -//--------------------------- 32 bits --------------------------------------------------------------------------------------- -extern unsigned char vtab[]; -#define vbvlen32(__x) vtab[((unsigned char)(__x))>>4] - -#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;}\ -} - -#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 & 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 { __x = (unsigned long long)(__x & 0x07)<<32 | ctou32(__ip); __ip += 4; __act;}\ -} while(0) - -//----------------- 16 bits ------------------------------------------------------------------------------------------------------- -#define _vbput16(__op, __x) _vbput32(__op, __x) -#define _vbget16(__ip, __x, __act) _vbget32(__ip, __x, __act) - -//----------------- 64 bits ------------------------------------------------------------------------------------------------------- -#define _vbput64(__op, __x, __act) {\ - if(__x < 1 << 7) { *__op++ = __x << 1; __act;}\ - else if(__x < 1 <<14) { *(unsigned short *)__op = __x << 2 | 0x01; __op += 2; __act;}\ - else if(__x < 1 <<21) { *(unsigned short *)__op = __x << 3 | 0x03; __op += 2; *__op++ = __x >> 13; __act;}\ - else if(__x < 1 <<28) { *(unsigned *)__op = __x << 4 | 0x07; __op += 4; __act;}\ - else if(__x < 1ull<<35) { *(unsigned *)__op = __x << 5 | 0x0f; __op += 4; *__op++ = __x >> 27; __act;}\ - else if(__x < 1ull<<42) { *(unsigned *)__op = __x << 6 | 0x1f; __op += 4; *(unsigned short *)__op = __x >> 26; __op+=2; __act;}\ - else if(__x < 1ull<<49) { *(unsigned *)__op = __x << 7 | 0x3f; __op += 4; *(unsigned short *)__op = __x >> 25; *(__op+2) = __x >> 41; __op+=3; __act;}\ - else if(__x < 1ull<<56) { *(unsigned long long *)__op = __x << 8 | 0x7f; __op += 8; __act;}\ - else { *__op++ = 0xff; *(unsigned long long *)__op = __x; __op+=8; __act;}\ -} - -#define _vbget64(__ip, __x, __act) do {\ - if(!((__x = *__ip) & 1<<0)) { __ip++; __x >>= 1; __act;}\ - else if(!(__x & 1<<1)) { __x = (*(unsigned short *)__ip) >> 2; __ip += 2; __act;}\ - else if(!(__x & 1<<2)) { __x = (*(unsigned short *)__ip) >> 3 | *(__ip+2) << 13; __ip += 3; __act;}\ - else if(!(__x & 1<<3)) { __x = (*(unsigned *)__ip) >> 4; __ip += 4; __act;}\ - else if(!(__x & 1<<4)) { __x = (*(unsigned *)__ip) >> 5 | (unsigned long long)(*(unsigned char *)(__ip+4)) << 27; __ip += 5; __act;}\ - else if(!(__x & 1<<5)) { __x = (*(unsigned *)__ip) >> 6 | (unsigned long long)(*(unsigned short *)(__ip+4)) << 26; __ip += 6; __act;}\ - else if(!(__x & 1<<6)) { __x = (*(unsigned *)__ip) >> 7 | (unsigned long long)(*(unsigned short *)(__ip+4)) << 25 | (unsigned long long)(*(__ip+6)) << 41; __ip += 7; __act;}\ - else if(!(__x & 1<<7)) { __x = (*(unsigned long long *)__ip) >> 8; __ip += 8; __act;}\ - else { __x = *(unsigned long long *)(__ip+1); __ip += 9; __act;}\ -} while(0) - -//----------------------------- Variable byte functions ----------------------------------------------------------------------- -// Length of uncompress value. Input __x is the compressed buffer start -#define vblen32(__x) ({ unsigned _x = __x; _x > 0x7f?(_x > 0x3fff?(_x > 0x1fffff?(_x > 0x0fffffff?5:4):3):2):1; }) - -//------- encode/decode single value ---------- -#define vbput16(__op, __x) vbput32(__op, __x) -#define vbget16(__ip) vbget32(__ip) - -#define vbput32(__op, __x) { register unsigned _x_ = __x; _vbput32(__op, _x_, ;); } -#define vbget32(__ip) ({ register unsigned _x_; _vbget32(__ip, _x_, ;); _x_; }) - -#define vbput64(__op, __x) { unsigned long long _x_ = __x; _vbput64(__op, _x_, ;); } -#define vbget64(__ip) ({ unsigned long long _x_; _vbget64(__ip, _x_, ;); _x_; }) - -// encode array with n unsigned (32 bits in[n]) values to the buffer out. Return value = end of compressed buffer out -unsigned char *vbenc16(unsigned short *__restrict in, unsigned n, unsigned char *__restrict out); -unsigned char *vbenc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out); -unsigned char *vbenc64(uint64_t *__restrict in, unsigned n, unsigned char *__restrict out); - -//------ decompress buffer into an array of n unsigned values. Return value = end of decompressed buffer in -unsigned char *vbdec16(unsigned char *__restrict in, unsigned n, unsigned short *__restrict out); -unsigned char *vbdec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out); -unsigned char *vbdec64(unsigned char *__restrict in, unsigned n, uint64_t *__restrict out); -//------ increasing integer lists ------------------------------------------------------------- -unsigned char *vbdenc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out, unsigned start); -unsigned char *vbddec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out, unsigned start); - -//----- strictly increasing (never remaining constant or decreasing) integer lists------------ -unsigned char *vbd1enc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out, unsigned start); -unsigned char *vbd1dec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out, unsigned start); - -//------ zigzag encoding integer lists ------------------------------------------------------------- -unsigned char *vbzenc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out, unsigned start); -unsigned char *vbzdec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out, unsigned start); -unsigned char *vbzenc64(uint64_t *__restrict in, unsigned n, unsigned char *__restrict out, uint64_t start); -unsigned char *vbzdec64(unsigned char *__restrict in, unsigned n, uint64_t *__restrict out, uint64_t start); - -//--- 15 bits integer lists ------------ -#define vbput15(__op, __x) do { unsigned _x = __x; if(likely(_x < 0x80)) *__op++ = _x; else { *__op++ = (_x) >> 8 | 0x80; *__op++ = _x; } } while(0) -#define _vbget15(__ip,__x, __act) do { if((__x = *__ip++) > 0x7f) __x = (__x & 0x7f) << 8 | *__ip++; __act; } while(0) - -#define vblen15(__x) ((__x) > 0x7f?2:1) -#define vbget15(__ip) ({ unsigned _x; _vbget15(__ip, _x, ;); _x; }) -unsigned char *vbenc15( unsigned short *__restrict in, unsigned n, unsigned char *__restrict out); -unsigned char *vbdec15( unsigned char *__restrict in, unsigned n, unsigned short *__restrict out); - -#ifdef __cplusplus -} -#endif - -#endif