Variable byte
This commit is contained in:
293
vint.c
293
vint.c
@ -24,132 +24,157 @@
|
||||
// vint.c - "Integer Compression" variable byte
|
||||
#include <stdio.h>
|
||||
|
||||
#ifndef USIZE
|
||||
#include "conf.h"
|
||||
#include "vint.h"
|
||||
#include "bitutil.h"
|
||||
|
||||
//-------------------------------------- variable byte : 32 bits ----------------------------------------------------------------
|
||||
//------------- 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);
|
||||
#define UN 8
|
||||
|
||||
#define USIZE 32
|
||||
#include __FILE__
|
||||
#undef USIZE
|
||||
|
||||
#define USIZE 64
|
||||
#include __FILE__
|
||||
#undef USIZE
|
||||
|
||||
#define USIZE 16
|
||||
#include __FILE__
|
||||
#undef USIZE
|
||||
|
||||
#define USIZE 15
|
||||
#include __FILE__
|
||||
#undef USIZE
|
||||
|
||||
#else
|
||||
#if USIZE == 15
|
||||
#define uint_t uint16_t
|
||||
#define zigzagenc15 zigzagenc16
|
||||
#define zigzagdec15 zigzagdec16
|
||||
#else
|
||||
#define uint_t TEMPLATE3(uint, USIZE, _t)
|
||||
#endif
|
||||
|
||||
unsigned char *TEMPLATE2(vbdec, USIZE)(unsigned char *__restrict in, unsigned n, uint_t *__restrict out) {
|
||||
register uint_t x, *op;
|
||||
for(op = out; op != out+(n&~(UN-1)); op += UN) {
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, op[0] = x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, op[1] = x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, op[2] = x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, op[3] = x); __builtin_prefetch(in+8*USIZE, 0);
|
||||
#if UN > 4
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, op[4] = x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, op[5] = x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, op[6] = x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, op[7] = x);
|
||||
#endif
|
||||
}
|
||||
while(op != out+n) _vbget32(in, x, *op++ = x );
|
||||
while(op != out+n)
|
||||
TEMPLATE2(_vbget, USIZE)(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, ;);
|
||||
unsigned char *TEMPLATE2(vbenc, USIZE)(uint_t *__restrict in, unsigned n, unsigned char *__restrict out) {
|
||||
register uint_t x, *ip;
|
||||
for(ip = in; ip != in+(n&~(UN-1)); ip += UN) { __builtin_prefetch(ip+USIZE*8, 0);
|
||||
x = ip[0]; TEMPLATE2(_vbput, USIZE)(out, x, ;);
|
||||
x = ip[1]; TEMPLATE2(_vbput, USIZE)(out, x, ;);
|
||||
x = ip[2]; TEMPLATE2(_vbput, USIZE)(out, x, ;);
|
||||
x = ip[3]; TEMPLATE2(_vbput, USIZE)(out, x, ;);
|
||||
#if UN > 4
|
||||
x = ip[4]; TEMPLATE2(_vbput, USIZE)(out, x, ;);
|
||||
x = ip[5]; TEMPLATE2(_vbput, USIZE)(out, x, ;);
|
||||
x = ip[6]; TEMPLATE2(_vbput, USIZE)(out, x, ;);
|
||||
x = ip[7]; TEMPLATE2(_vbput, USIZE)(out, x, ;);
|
||||
#endif
|
||||
}
|
||||
while(ip != in+n) {
|
||||
x = *ip++; TEMPLATE2(_vbput, USIZE)(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;
|
||||
unsigned char *TEMPLATE2(vbdenc, USIZE)(uint_t *__restrict in, unsigned n, unsigned char *__restrict out, uint_t start) {
|
||||
uint_t *ip,v;
|
||||
for(ip = in; ip != in+(n&~(4-1)); ) {
|
||||
vbput64(out, *ip++);
|
||||
vbput64(out, *ip++);
|
||||
vbput64(out, *ip++);
|
||||
vbput64(out, *ip++);
|
||||
v = (*ip)-start; start = *ip++; TEMPLATE2(_vbput, USIZE)(out, v, ;);
|
||||
v = (*ip)-start; start = *ip++; TEMPLATE2(_vbput, USIZE)(out, v, ;);
|
||||
v = (*ip)-start; start = *ip++; TEMPLATE2(_vbput, USIZE)(out, v, ;);
|
||||
v = (*ip)-start; start = *ip++; TEMPLATE2(_vbput, USIZE)(out, v, ;);
|
||||
}
|
||||
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++; TEMPLATE2(_vbput, USIZE)(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);
|
||||
unsigned char *TEMPLATE2(vbddec, USIZE)(unsigned char *__restrict in, unsigned n, uint_t *__restrict out, uint_t start) {
|
||||
uint_t x,*op;
|
||||
for(op = out; op != out+(n&~(UN-1)); ) {
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += x);
|
||||
#if UN > 4
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += x);
|
||||
#endif
|
||||
}
|
||||
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;
|
||||
#define VINT_Z 32
|
||||
unsigned char *TEMPLATE2(vbd1enc, USIZE)(uint_t *__restrict in, unsigned n, unsigned char *__restrict out, uint_t start) {
|
||||
uint_t *ip, v;
|
||||
unsigned char *op = out;
|
||||
#ifdef VINT_Z
|
||||
|
||||
#if VINT_Z == USIZE
|
||||
#define VINTZ(x) x
|
||||
uint_t b = 0;
|
||||
v = in[0] - start - 1;
|
||||
unsigned long long u = (unsigned long long)v<<1;
|
||||
if(n == 1) u |= 1;
|
||||
_vbput32(op, u, ;);
|
||||
TEMPLATE2(_vbput, USIZE)(op, u, ;);
|
||||
if(!--n) return op;
|
||||
start = *in++;
|
||||
#else
|
||||
#define VINTZ(x)
|
||||
#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;
|
||||
v = (*ip)-start-1; start = *ip++; TEMPLATE2(_vbput, USIZE)(op, v, ;); VINTZ(b |= v);
|
||||
v = (*ip)-start-1; start = *ip++; TEMPLATE2(_vbput, USIZE)(op, v, ;); VINTZ(b |= v);
|
||||
v = (*ip)-start-1; start = *ip++; TEMPLATE2(_vbput, USIZE)(op, v, ;); VINTZ(b |= v);
|
||||
v = (*ip)-start-1; start = *ip++; TEMPLATE2(_vbput, USIZE)(op, v, ;); VINTZ(b |= v);
|
||||
}
|
||||
while(ip != in+n) { v = (*ip)-start-1; start = *ip++; _vbput32(op, v, ;); b |= v; }
|
||||
#ifdef VINT_Z
|
||||
while(ip != in+n) {
|
||||
v = (*ip)-start-1; start = *ip++; TEMPLATE2(_vbput, USIZE)(op, v, ;); VINTZ(b |= v);
|
||||
}
|
||||
|
||||
#if VINT_Z == USIZE
|
||||
if(!b) {
|
||||
u = (unsigned long long)in[-1] << 1 | 1;
|
||||
_vbput32(out, u, ;);
|
||||
TEMPLATE2(_vbput, USIZE)(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);
|
||||
|
||||
unsigned char *TEMPLATE2(vbd1dec, USIZE)(unsigned char *__restrict in, unsigned n, uint_t *__restrict out, uint_t start) {
|
||||
uint_t x,*op;
|
||||
#if VINT_Z == USIZE
|
||||
unsigned long long u; TEMPLATE2(_vbget, USIZE)(in, u, ;); x = u>>1; *out = (start += x+1);
|
||||
if(u & 1) {
|
||||
#ifdef __SSE2__
|
||||
out++; --n; BITDIZERO32(out, n, start, 1);
|
||||
@ -162,75 +187,55 @@ unsigned char *vbd1dec32(unsigned char *__restrict in, unsigned n, unsigned *__r
|
||||
#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);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ++x); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ++x); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ++x); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ++x); *op++ = (start += x);
|
||||
#if UN > 4
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ++x); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ++x); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ++x); *op++ = (start += x);
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ++x); *op++ = (start += x);
|
||||
#endif
|
||||
}
|
||||
while(op != out+n) {
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ++x); *op++ = (start += x);
|
||||
}
|
||||
while(op != out+n) { _vbget32(in, x, ++x); *op++ = (start += x); }
|
||||
return in;
|
||||
}
|
||||
#undef VINT_Z
|
||||
|
||||
//--------------------------------------- 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;
|
||||
unsigned char *TEMPLATE2(vbzenc, USIZE)(uint_t *__restrict in, unsigned n, unsigned char *__restrict out, uint_t start) {
|
||||
uint_t *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, ;);
|
||||
v = TEMPLATE2(zigzagenc, USIZE)((*ip)-start); start=*ip++; TEMPLATE2(_vbput, USIZE)(out, v, ;);
|
||||
v = TEMPLATE2(zigzagenc, USIZE)((*ip)-start); start=*ip++; TEMPLATE2(_vbput, USIZE)(out, v, ;);
|
||||
v = TEMPLATE2(zigzagenc, USIZE)((*ip)-start); start=*ip++; TEMPLATE2(_vbput, USIZE)(out, v, ;);
|
||||
v = TEMPLATE2(zigzagenc, USIZE)((*ip)-start); start=*ip++; TEMPLATE2(_vbput, USIZE)(out, v, ;);
|
||||
}
|
||||
while(ip < in+n) {
|
||||
v = TEMPLATE2(zigzagenc, USIZE)((*ip)-start); start=*ip++; TEMPLATE2(_vbput, USIZE)(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));
|
||||
unsigned char *TEMPLATE2(vbzdec, USIZE)(unsigned char *__restrict in, unsigned n, uint_t *__restrict out, uint_t start) {
|
||||
uint_t x,*op;
|
||||
for(op = out; op != out+(n&~(UN-1)); ) {
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += TEMPLATE2(zigzagdec, USIZE)(x));
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += TEMPLATE2(zigzagdec, USIZE)(x));
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += TEMPLATE2(zigzagdec, USIZE)(x));
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += TEMPLATE2(zigzagdec, USIZE)(x));
|
||||
#if UN > 4
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += TEMPLATE2(zigzagdec, USIZE)(x));
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += TEMPLATE2(zigzagdec, USIZE)(x));
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += TEMPLATE2(zigzagdec, USIZE)(x));
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += TEMPLATE2(zigzagdec, USIZE)(x));
|
||||
#endif
|
||||
}
|
||||
while(op != out+n) {
|
||||
TEMPLATE2(_vbget, USIZE)(in, x, ;); *op++ = (start += TEMPLATE2(zigzagdec, USIZE)(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;
|
||||
}
|
||||
#endif
|
||||
167
vint.h
167
vint.h
@ -29,101 +29,124 @@
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
//--------------------------- 32 bits ---------------------------------------------------------------------------------------
|
||||
//----------------------------------- Variable byte single value macros (low level) -----------------------------------------------
|
||||
//------------- 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 _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;}\
|
||||
#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;}\
|
||||
//------------- 64 bits -----------
|
||||
#define _vbput64(_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_;}\
|
||||
else if(_x_ < 1 <<28) { ctou32(_op_) = _x_ << 4 | 0x07; _op_ += 4; _act_;}\
|
||||
else if(_x_ < 1ull<<35) { ctou32(_op_) = _x_ << 5 | 0x0f; _op_ += 4; *_op_++ = _x_ >> 27; _act_;}\
|
||||
else if(_x_ < 1ull<<42) { ctou32(_op_) = _x_ << 6 | 0x1f; _op_ += 4; ctou16(_op_) = _x_ >> 26; _op_+=2; _act_;}\
|
||||
else if(_x_ < 1ull<<49) { ctou32(_op_) = _x_ << 7 | 0x3f; _op_ += 4; ctou16(_op_) = _x_ >> 25; *(_op_+2) = _x_ >> 41; _op_+=3; _act_;}\
|
||||
else if(_x_ < 1ull<<56) { ctou64(_op_) = _x_ << 8 | 0x7f; _op_ += 8; _act_;}\
|
||||
else { *_op_++ = 0xff; ctou64(_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;}\
|
||||
#define _vbget64(_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_;}\
|
||||
else if(!(_x_ & 1<<3)) { _x_ = ctou32(_ip_) >> 4; _ip_ += 4; _act_;}\
|
||||
else if(!(_x_ & 1<<4)) { _x_ = ctou32(_ip_) >> 5 | (unsigned long long)_ip_[4] << 27; _ip_ += 5; _act_;}\
|
||||
else if(!(_x_ & 1<<5)) { _x_ = ctou32(_ip_) >> 6 | (unsigned long long)ctou16(_ip_+4) << 26; _ip_ += 6; _act_;}\
|
||||
else if(!(_x_ & 1<<6)) { _x_ = ctou32(_ip_) >> 7 | (unsigned long long)ctou16(_ip_+4) << 25 | (unsigned long long)(_ip_[6]) << 41; _ip_ += 7; _act_;}\
|
||||
else if(!(_x_ & 1<<7)) { _x_ = ctou64(_ip_) >> 8; _ip_ += 8; _act_;}\
|
||||
else { _x_ = ctou64(_ip_+1); _ip_ += 9; _act_;}\
|
||||
} while(0)
|
||||
|
||||
//------------- 16 bits -----------
|
||||
#define _vbput16(_op_, _x_, _act_) _vbput32(_op_, _x_, _act_)
|
||||
#define _vbget16(_ip_, _x_, _act_) _vbget32(_ip_, _x_, _act_)
|
||||
|
||||
//------------- 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)
|
||||
|
||||
//----------------------------- 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; })
|
||||
// ---- Variable byte length after compressiing 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)
|
||||
|
||||
//------- encode/decode single value ----------
|
||||
#define vbput16(__op, __x) vbput32(__op, __x)
|
||||
#define vbget16(__ip) vbget32(__ip)
|
||||
// ---- Length of compressed value. Input _x_ is the compressed buffer start
|
||||
#define vbvlen32(_x_) vtab[((unsigned char)(_x_))>>4]
|
||||
|
||||
#define vbput32(__op, __x) { register unsigned _x_ = __x; _vbput32(__op, _x_, ;); }
|
||||
#define vbget32(__ip) ({ register unsigned _x_; _vbget32(__ip, _x_, ;); _x_; })
|
||||
//----- encode/decode 16/32/64 single value and advance output/input pointer
|
||||
#define vbput64(_op_, _x_) { unsigned long long _x = _x_; _vbput64(_op_, _x, ;); }
|
||||
#define vbput32(_op_, _x_) { register unsigned _x = _x_; _vbput32(_op_, _x, ;); }
|
||||
#define vbput16(_op_, _x_) vbput32(_op_, _x_)
|
||||
#define vbput15(_op_, _x_) { unsigned _x = _x_; _vbput15(_op_, _x, ;); }
|
||||
|
||||
#define vbput64(__op, __x) { unsigned long long _x_ = __x; _vbput64(__op, _x_, ;); }
|
||||
#define vbget64(__ip) ({ unsigned long long _x_; _vbget64(__ip, _x_, ;); _x_; })
|
||||
#define vbget64(_ip_) ({ unsigned long long _x; _vbget64(_ip_, _x, ;); _x; })
|
||||
#define vbget32(_ip_) ({ register unsigned _x; _vbget32(_ip_, _x, ;); _x; })
|
||||
#define vbget16(_ip_) vbget32(_ip_)
|
||||
#define vbget15(_ip_) ({ unsigned _x; _vbget15(_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);
|
||||
// ---- Encode array with n integer 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);
|
||||
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);
|
||||
|
||||
//------ 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);
|
||||
//----- Decode Return value = end of decompressed buffer in
|
||||
unsigned char *vbdec64(unsigned char *__restrict in, unsigned n, uint64_t *__restrict out);
|
||||
//------ increasing integer lists -------------------------------------------------------------
|
||||
unsigned char *vbdec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out);
|
||||
unsigned char *vbdec16(unsigned char *__restrict in, unsigned n, unsigned short *__restrict out);
|
||||
unsigned char *vbdec15(unsigned char *__restrict in, unsigned n, unsigned short *__restrict out);
|
||||
|
||||
//----- Delta encoding for increasing integer lists. Return value = end of compressed buffer out
|
||||
unsigned char *vbdenc64(uint64_t *__restrict in, unsigned n, unsigned char *__restrict out, uint64_t start);
|
||||
unsigned char *vbdenc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out, unsigned start);
|
||||
unsigned char *vbdenc16(unsigned short *__restrict in, unsigned n, unsigned char *__restrict out, unsigned short start);
|
||||
unsigned char *vbdenc15(unsigned short *__restrict in, unsigned n, unsigned char *__restrict out, unsigned short start);
|
||||
|
||||
//----- Delta decode Return value = end of decompressed buffer in
|
||||
unsigned char *vbddec64(unsigned char *__restrict in, unsigned n, uint64_t *__restrict out, uint64_t start);
|
||||
unsigned char *vbddec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out, unsigned start);
|
||||
unsigned char *vbddec16(unsigned char *__restrict in, unsigned n, unsigned short *__restrict out, unsigned short start);
|
||||
unsigned char *vbddec15(unsigned char *__restrict in, unsigned n, unsigned short *__restrict out, unsigned short 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);
|
||||
//----- Delta encoding for strictly increasing (never remaining constant or decreasing) integer lists. Return value = end of compressed buffer out
|
||||
unsigned char *vbd1enc64(uint64_t *__restrict in, unsigned n, unsigned char *__restrict out, uint64_t start);
|
||||
unsigned char *vbd1enc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out, unsigned start);
|
||||
unsigned char *vbd1enc16(unsigned short *__restrict in, unsigned n, unsigned char *__restrict out, unsigned short start);
|
||||
unsigned char *vbd1enc15(unsigned short *__restrict in, unsigned n, unsigned char *__restrict out, unsigned short 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);
|
||||
//----- Delta decode Return value = end of decompressed buffer in
|
||||
unsigned char *vbd1dec64(unsigned char *__restrict in, unsigned n, uint64_t *__restrict out, uint64_t start);
|
||||
unsigned char *vbd1dec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out, unsigned start);
|
||||
unsigned char *vbd1dec16(unsigned char *__restrict in, unsigned n, unsigned short *__restrict out, unsigned short start);
|
||||
unsigned char *vbd1dec15(unsigned char *__restrict in, unsigned n, unsigned short *__restrict out, unsigned short start);
|
||||
|
||||
//----- Zigzag encoding for unsorted integer lists. Return value = end of compressed buffer out
|
||||
unsigned char *vbzenc64(uint64_t *__restrict in, unsigned n, unsigned char *__restrict out, uint64_t start);
|
||||
unsigned char *vbzenc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out, unsigned start);
|
||||
unsigned char *vbzenc16(unsigned short *__restrict in, unsigned n, unsigned char *__restrict out, unsigned short start);
|
||||
unsigned char *vbzenc15(unsigned short *__restrict in, unsigned n, unsigned char *__restrict out, unsigned short start);
|
||||
|
||||
//----- Zigzag decode Return value = end of decompressed buffer in
|
||||
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);
|
||||
unsigned char *vbzdec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out, unsigned start);
|
||||
unsigned char *vbzdec16(unsigned char *__restrict in, unsigned n, unsigned short *__restrict out, unsigned short start);
|
||||
unsigned char *vbzdec15(unsigned char *__restrict in, unsigned n, unsigned short *__restrict out, unsigned short start);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user