mirror of https://github.com/ArduPilot/ardupilot
AP_ROMFS: added support for compressed files in ROMFS
This commit is contained in:
Andrew Tridgell
Randy Mackay
parent
195550998d
commit
2de747a71e
|
|
@ -17,6 +17,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "AP_ROMFS.h"
|
#include "AP_ROMFS.h"
|
||||||
|
#include "tinf.h"
|
||||||
|
|
||||||
#ifdef HAL_HAVE_AP_ROMFS_EMBEDDED_H
|
#ifdef HAL_HAVE_AP_ROMFS_EMBEDDED_H
|
||||||
#include <ap_romfs_embedded.h>
|
#include <ap_romfs_embedded.h>
|
||||||
|
|
@ -37,3 +38,61 @@ const uint8_t *AP_ROMFS::find_file(const char *name, uint32_t &size)
|
||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
find a compressed file and uncompress it. Space for decompressed
|
||||||
|
data comes from malloc. Caller must be careful to free the resulting
|
||||||
|
data after use.
|
||||||
|
*/
|
||||||
|
uint8_t *AP_ROMFS::find_decompress(const char *name, uint32_t &size)
|
||||||
|
{
|
||||||
|
uint32_t compressed_size;
|
||||||
|
const uint8_t *compressed_data = find_file(name, compressed_size);
|
||||||
|
if (!compressed_data) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
// last 4 bytes of gzip file are length of decompressed data
|
||||||
|
const uint8_t *p = &compressed_data[compressed_size-4];
|
||||||
|
uint32_t decompressed_size = p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24;
|
||||||
|
|
||||||
|
uint8_t *decompressed_data = (uint8_t *)malloc(decompressed_size);
|
||||||
|
if (!decompressed_data) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
TINF_DATA *d = (TINF_DATA *)malloc(sizeof(TINF_DATA));
|
||||||
|
if (!d) {
|
||||||
|
free(decompressed_data);
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
uzlib_uncompress_init(d, NULL, 0);
|
||||||
|
|
||||||
|
d->source = compressed_data;
|
||||||
|
d->source_limit = compressed_data + compressed_size - 4;
|
||||||
|
|
||||||
|
// assume gzip format
|
||||||
|
int res = uzlib_gzip_parse_header(d);
|
||||||
|
if (res != TINF_OK) {
|
||||||
|
free(decompressed_data);
|
||||||
|
free(d);
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
d->dest = decompressed_data;
|
||||||
|
d->destSize = decompressed_size;
|
||||||
|
|
||||||
|
// we don't check CRC, as it just wastes flash space for constant
|
||||||
|
// ROMFS data
|
||||||
|
res = uzlib_uncompress(d);
|
||||||
|
|
||||||
|
free(d);
|
||||||
|
|
||||||
|
if (res != TINF_OK) {
|
||||||
|
free(decompressed_data);
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
size = decompressed_size;
|
||||||
|
return decompressed_data;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,15 @@
|
||||||
|
|
||||||
class AP_ROMFS {
|
class AP_ROMFS {
|
||||||
public:
|
public:
|
||||||
|
// find a file and de-compress, assumning gzip format. The
|
||||||
|
// decompressed data will be allocated with malloc(). You must
|
||||||
|
// call free on the return value after use
|
||||||
|
static uint8_t *find_decompress(const char *name, uint32_t &size);
|
||||||
|
|
||||||
|
private:
|
||||||
// find an embedded file
|
// find an embedded file
|
||||||
static const uint8_t *find_file(const char *name, uint32_t &size);
|
static const uint8_t *find_file(const char *name, uint32_t &size);
|
||||||
|
|
||||||
private:
|
|
||||||
struct embedded_file {
|
struct embedded_file {
|
||||||
const char *filename;
|
const char *filename;
|
||||||
uint32_t size;
|
uint32_t size;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,130 @@
|
||||||
|
/*
|
||||||
|
* uzlib - tiny deflate/inflate library (deflate, gzip, zlib)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2003 by Joergen Ibsen / Jibz
|
||||||
|
* All Rights Reserved
|
||||||
|
* http://www.ibsensoftware.com/
|
||||||
|
*
|
||||||
|
* Copyright (c) 2014-2016 by Paul Sokolovsky
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef TINF_H_INCLUDED
|
||||||
|
#define TINF_H_INCLUDED
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
/* calling convention */
|
||||||
|
#ifndef TINFCC
|
||||||
|
#ifdef __WATCOMC__
|
||||||
|
#define TINFCC __cdecl
|
||||||
|
#else
|
||||||
|
#define TINFCC
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* ok status, more data produced */
|
||||||
|
#define TINF_OK 0
|
||||||
|
/* end of compressed stream reached */
|
||||||
|
#define TINF_DONE 1
|
||||||
|
#define TINF_DATA_ERROR (-3)
|
||||||
|
#define TINF_CHKSUM_ERROR (-4)
|
||||||
|
#define TINF_DICT_ERROR (-5)
|
||||||
|
|
||||||
|
/* checksum types */
|
||||||
|
#define TINF_CHKSUM_NONE 0
|
||||||
|
#define TINF_CHKSUM_ADLER 1
|
||||||
|
#define TINF_CHKSUM_CRC 2
|
||||||
|
|
||||||
|
/* helper macros */
|
||||||
|
#define TINF_ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*(arr)))
|
||||||
|
|
||||||
|
/* data structures */
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
unsigned short table[16]; /* table of code length counts */
|
||||||
|
unsigned short trans[288]; /* code -> symbol translation table */
|
||||||
|
} TINF_TREE;
|
||||||
|
|
||||||
|
struct TINF_DATA;
|
||||||
|
typedef struct TINF_DATA {
|
||||||
|
/* Pointer to the next byte in the input buffer */
|
||||||
|
const unsigned char *source;
|
||||||
|
/* Pointer to the next byte past the input buffer (source_limit = source + len) */
|
||||||
|
const unsigned char *source_limit;
|
||||||
|
/* If source_limit == NULL, or source >= source_limit, this function
|
||||||
|
will be used to read next byte from source stream. The function may
|
||||||
|
also return -1 in
|
||||||
|
case of EOF (or irrecoverable error). Note that besides returning
|
||||||
|
the next byte, it may also update source and sourceRemaining fields,
|
||||||
|
thus allowing for buffered operation. */
|
||||||
|
int (*readSource)(struct TINF_DATA *data);
|
||||||
|
|
||||||
|
unsigned int tag;
|
||||||
|
unsigned int bitcount;
|
||||||
|
|
||||||
|
/* Buffer start */
|
||||||
|
unsigned char *destStart;
|
||||||
|
/* Buffer total size */
|
||||||
|
unsigned int destSize;
|
||||||
|
/* Current pointer in buffer */
|
||||||
|
unsigned char *dest;
|
||||||
|
/* Remaining bytes in buffer */
|
||||||
|
unsigned int destRemaining;
|
||||||
|
|
||||||
|
/* Accumulating checksum */
|
||||||
|
unsigned int checksum;
|
||||||
|
char checksum_type;
|
||||||
|
bool eof;
|
||||||
|
|
||||||
|
int btype;
|
||||||
|
int bfinal;
|
||||||
|
unsigned int curlen;
|
||||||
|
int lzOff;
|
||||||
|
unsigned char *dict_ring;
|
||||||
|
unsigned int dict_size;
|
||||||
|
unsigned int dict_idx;
|
||||||
|
|
||||||
|
TINF_TREE ltree; /* dynamic length/symbol tree */
|
||||||
|
TINF_TREE dtree; /* dynamic distance tree */
|
||||||
|
} TINF_DATA;
|
||||||
|
|
||||||
|
#define TINF_PUT(d, c) \
|
||||||
|
{ \
|
||||||
|
*d->dest++ = c; \
|
||||||
|
if (d->dict_ring) { d->dict_ring[d->dict_idx++] = c; if (d->dict_idx == d->dict_size) d->dict_idx = 0; } \
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned char TINFCC uzlib_get_byte(TINF_DATA *d);
|
||||||
|
|
||||||
|
/* Decompression API */
|
||||||
|
|
||||||
|
void TINFCC uzlib_init(void);
|
||||||
|
void TINFCC uzlib_uncompress_init(TINF_DATA *d, void *dict, unsigned int dictLen);
|
||||||
|
int TINFCC uzlib_uncompress(TINF_DATA *d);
|
||||||
|
int TINFCC uzlib_uncompress_chksum(TINF_DATA *d);
|
||||||
|
|
||||||
|
int TINFCC uzlib_zlib_parse_header(TINF_DATA *d);
|
||||||
|
int TINFCC uzlib_gzip_parse_header(TINF_DATA *d);
|
||||||
|
|
||||||
|
/* Compression API */
|
||||||
|
|
||||||
|
void TINFCC uzlib_compress(void *data, const uint8_t *src, unsigned slen);
|
||||||
|
|
||||||
|
/* Checksum API */
|
||||||
|
|
||||||
|
/* prev_sum is previous value for incremental computation, 1 initially */
|
||||||
|
uint32_t TINFCC uzlib_adler32(const void *data, unsigned int length, uint32_t prev_sum);
|
||||||
|
/* crc is previous value for incremental computation, 0xffffffff initially */
|
||||||
|
uint32_t TINFCC uzlib_crc32(const void *data, unsigned int length, uint32_t crc);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* extern "C" */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* TINF_H_INCLUDED */
|
||||||
|
|
@ -0,0 +1,110 @@
|
||||||
|
/*
|
||||||
|
* tinfgzip - tiny gzip decompressor
|
||||||
|
*
|
||||||
|
* Copyright (c) 2003 by Joergen Ibsen / Jibz
|
||||||
|
* All Rights Reserved
|
||||||
|
*
|
||||||
|
* http://www.ibsensoftware.com/
|
||||||
|
*
|
||||||
|
* Copyright (c) 2014-2016 by Paul Sokolovsky
|
||||||
|
*
|
||||||
|
* This software is provided 'as-is', without any express
|
||||||
|
* or implied warranty. In no event will the authors be
|
||||||
|
* held liable for any damages arising from the use of
|
||||||
|
* this software.
|
||||||
|
*
|
||||||
|
* Permission is granted to anyone to use this software
|
||||||
|
* for any purpose, including commercial applications,
|
||||||
|
* and to alter it and redistribute it freely, subject to
|
||||||
|
* the following restrictions:
|
||||||
|
*
|
||||||
|
* 1. The origin of this software must not be
|
||||||
|
* misrepresented; you must not claim that you
|
||||||
|
* wrote the original software. If you use this
|
||||||
|
* software in a product, an acknowledgment in
|
||||||
|
* the product documentation would be appreciated
|
||||||
|
* but is not required.
|
||||||
|
*
|
||||||
|
* 2. Altered source versions must be plainly marked
|
||||||
|
* as such, and must not be misrepresented as
|
||||||
|
* being the original software.
|
||||||
|
*
|
||||||
|
* 3. This notice may not be removed or altered from
|
||||||
|
* any source distribution.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "tinf.h"
|
||||||
|
|
||||||
|
#define FTEXT 1
|
||||||
|
#define FHCRC 2
|
||||||
|
#define FEXTRA 4
|
||||||
|
#define FNAME 8
|
||||||
|
#define FCOMMENT 16
|
||||||
|
|
||||||
|
void tinf_skip_bytes(TINF_DATA *d, int num);
|
||||||
|
uint16_t tinf_get_uint16(TINF_DATA *d);
|
||||||
|
|
||||||
|
void tinf_skip_bytes(TINF_DATA *d, int num)
|
||||||
|
{
|
||||||
|
while (num--) uzlib_get_byte(d);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint16_t tinf_get_uint16(TINF_DATA *d)
|
||||||
|
{
|
||||||
|
unsigned int v = uzlib_get_byte(d);
|
||||||
|
v = (uzlib_get_byte(d) << 8) | v;
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
|
int uzlib_gzip_parse_header(TINF_DATA *d)
|
||||||
|
{
|
||||||
|
unsigned char flg;
|
||||||
|
|
||||||
|
/* -- check format -- */
|
||||||
|
|
||||||
|
/* check id bytes */
|
||||||
|
if (uzlib_get_byte(d) != 0x1f || uzlib_get_byte(d) != 0x8b) return TINF_DATA_ERROR;
|
||||||
|
|
||||||
|
/* check method is deflate */
|
||||||
|
if (uzlib_get_byte(d) != 8) return TINF_DATA_ERROR;
|
||||||
|
|
||||||
|
/* get flag byte */
|
||||||
|
flg = uzlib_get_byte(d);
|
||||||
|
|
||||||
|
/* check that reserved bits are zero */
|
||||||
|
if (flg & 0xe0) return TINF_DATA_ERROR;
|
||||||
|
|
||||||
|
/* -- find start of compressed data -- */
|
||||||
|
|
||||||
|
/* skip rest of base header of 10 bytes */
|
||||||
|
tinf_skip_bytes(d, 6);
|
||||||
|
|
||||||
|
/* skip extra data if present */
|
||||||
|
if (flg & FEXTRA)
|
||||||
|
{
|
||||||
|
unsigned int xlen = tinf_get_uint16(d);
|
||||||
|
tinf_skip_bytes(d, xlen);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* skip file name if present */
|
||||||
|
if (flg & FNAME) { while (uzlib_get_byte(d)); }
|
||||||
|
|
||||||
|
/* skip file comment if present */
|
||||||
|
if (flg & FCOMMENT) { while (uzlib_get_byte(d)); }
|
||||||
|
|
||||||
|
/* check header crc if present */
|
||||||
|
if (flg & FHCRC)
|
||||||
|
{
|
||||||
|
/*unsigned int hcrc =*/ tinf_get_uint16(d);
|
||||||
|
|
||||||
|
// TODO: Check!
|
||||||
|
// if (hcrc != (tinf_crc32(src, start - src) & 0x0000ffff))
|
||||||
|
// return TINF_DATA_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* initialize for crc32 checksum */
|
||||||
|
d->checksum_type = TINF_CHKSUM_CRC;
|
||||||
|
d->checksum = ~0;
|
||||||
|
|
||||||
|
return TINF_OK;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,601 @@
|
||||||
|
/*
|
||||||
|
* tinflate - tiny inflate
|
||||||
|
*
|
||||||
|
* Copyright (c) 2003 by Joergen Ibsen / Jibz
|
||||||
|
* All Rights Reserved
|
||||||
|
* http://www.ibsensoftware.com/
|
||||||
|
*
|
||||||
|
* Copyright (c) 2014-2016 by Paul Sokolovsky
|
||||||
|
*
|
||||||
|
* This software is provided 'as-is', without any express
|
||||||
|
* or implied warranty. In no event will the authors be
|
||||||
|
* held liable for any damages arising from the use of
|
||||||
|
* this software.
|
||||||
|
*
|
||||||
|
* Permission is granted to anyone to use this software
|
||||||
|
* for any purpose, including commercial applications,
|
||||||
|
* and to alter it and redistribute it freely, subject to
|
||||||
|
* the following restrictions:
|
||||||
|
*
|
||||||
|
* 1. The origin of this software must not be
|
||||||
|
* misrepresented; you must not claim that you
|
||||||
|
* wrote the original software. If you use this
|
||||||
|
* software in a product, an acknowledgment in
|
||||||
|
* the product documentation would be appreciated
|
||||||
|
* but is not required.
|
||||||
|
*
|
||||||
|
* 2. Altered source versions must be plainly marked
|
||||||
|
* as such, and must not be misrepresented as
|
||||||
|
* being the original software.
|
||||||
|
*
|
||||||
|
* 3. This notice may not be removed or altered from
|
||||||
|
* any source distribution.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
minor changes for C++ build for ArduPilot by tridge
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include "tinf.h"
|
||||||
|
|
||||||
|
uint32_t tinf_get_le_uint32(TINF_DATA *d);
|
||||||
|
uint32_t tinf_get_be_uint32(TINF_DATA *d);
|
||||||
|
|
||||||
|
/* --------------------------------------------------- *
|
||||||
|
* -- uninitialized global data (static structures) -- *
|
||||||
|
* --------------------------------------------------- */
|
||||||
|
|
||||||
|
#ifdef RUNTIME_BITS_TABLES
|
||||||
|
|
||||||
|
/* extra bits and base tables for length codes */
|
||||||
|
unsigned char length_bits[30];
|
||||||
|
unsigned short length_base[30];
|
||||||
|
|
||||||
|
/* extra bits and base tables for distance codes */
|
||||||
|
unsigned char dist_bits[30];
|
||||||
|
unsigned short dist_base[30];
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
static const unsigned char length_bits[30] = {
|
||||||
|
0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
|
1, 1, 1, 1, 2, 2, 2, 2,
|
||||||
|
3, 3, 3, 3, 4, 4, 4, 4,
|
||||||
|
5, 5, 5, 5
|
||||||
|
};
|
||||||
|
static const unsigned short length_base[30] = {
|
||||||
|
3, 4, 5, 6, 7, 8, 9, 10,
|
||||||
|
11, 13, 15, 17, 19, 23, 27, 31,
|
||||||
|
35, 43, 51, 59, 67, 83, 99, 115,
|
||||||
|
131, 163, 195, 227, 258
|
||||||
|
};
|
||||||
|
|
||||||
|
static const unsigned char dist_bits[30] = {
|
||||||
|
0, 0, 0, 0, 1, 1, 2, 2,
|
||||||
|
3, 3, 4, 4, 5, 5, 6, 6,
|
||||||
|
7, 7, 8, 8, 9, 9, 10, 10,
|
||||||
|
11, 11, 12, 12, 13, 13
|
||||||
|
};
|
||||||
|
static const unsigned short dist_base[30] = {
|
||||||
|
1, 2, 3, 4, 5, 7, 9, 13,
|
||||||
|
17, 25, 33, 49, 65, 97, 129, 193,
|
||||||
|
257, 385, 513, 769, 1025, 1537, 2049, 3073,
|
||||||
|
4097, 6145, 8193, 12289, 16385, 24577
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* special ordering of code length codes */
|
||||||
|
static const unsigned char clcidx[] = {
|
||||||
|
16, 17, 18, 0, 8, 7, 9, 6,
|
||||||
|
10, 5, 11, 4, 12, 3, 13, 2,
|
||||||
|
14, 1, 15
|
||||||
|
};
|
||||||
|
|
||||||
|
/* ----------------------- *
|
||||||
|
* -- utility functions -- *
|
||||||
|
* ----------------------- */
|
||||||
|
|
||||||
|
#ifdef RUNTIME_BITS_TABLES
|
||||||
|
/* build extra bits and base tables */
|
||||||
|
static void tinf_build_bits_base(unsigned char *bits, unsigned short *base, int delta, int first)
|
||||||
|
{
|
||||||
|
int i, sum;
|
||||||
|
|
||||||
|
/* build bits table */
|
||||||
|
for (i = 0; i < delta; ++i) bits[i] = 0;
|
||||||
|
for (i = 0; i < 30 - delta; ++i) bits[i + delta] = i / delta;
|
||||||
|
|
||||||
|
/* build base table */
|
||||||
|
for (sum = first, i = 0; i < 30; ++i)
|
||||||
|
{
|
||||||
|
base[i] = sum;
|
||||||
|
sum += 1 << bits[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* build the fixed huffman trees */
|
||||||
|
static void tinf_build_fixed_trees(TINF_TREE *lt, TINF_TREE *dt)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
/* build fixed length tree */
|
||||||
|
for (i = 0; i < 7; ++i) lt->table[i] = 0;
|
||||||
|
|
||||||
|
lt->table[7] = 24;
|
||||||
|
lt->table[8] = 152;
|
||||||
|
lt->table[9] = 112;
|
||||||
|
|
||||||
|
for (i = 0; i < 24; ++i) lt->trans[i] = 256 + i;
|
||||||
|
for (i = 0; i < 144; ++i) lt->trans[24 + i] = i;
|
||||||
|
for (i = 0; i < 8; ++i) lt->trans[24 + 144 + i] = 280 + i;
|
||||||
|
for (i = 0; i < 112; ++i) lt->trans[24 + 144 + 8 + i] = 144 + i;
|
||||||
|
|
||||||
|
/* build fixed distance tree */
|
||||||
|
for (i = 0; i < 5; ++i) dt->table[i] = 0;
|
||||||
|
|
||||||
|
dt->table[5] = 32;
|
||||||
|
|
||||||
|
for (i = 0; i < 32; ++i) dt->trans[i] = i;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* given an array of code lengths, build a tree */
|
||||||
|
static void tinf_build_tree(TINF_TREE *t, const unsigned char *lengths, unsigned int num)
|
||||||
|
{
|
||||||
|
unsigned short offs[16];
|
||||||
|
unsigned int i, sum;
|
||||||
|
|
||||||
|
/* clear code length count table */
|
||||||
|
for (i = 0; i < 16; ++i) t->table[i] = 0;
|
||||||
|
|
||||||
|
/* scan symbol lengths, and sum code length counts */
|
||||||
|
for (i = 0; i < num; ++i) t->table[lengths[i]]++;
|
||||||
|
|
||||||
|
t->table[0] = 0;
|
||||||
|
|
||||||
|
/* compute offset table for distribution sort */
|
||||||
|
for (sum = 0, i = 0; i < 16; ++i)
|
||||||
|
{
|
||||||
|
offs[i] = sum;
|
||||||
|
sum += t->table[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
/* create code->symbol translation table (symbols sorted by code) */
|
||||||
|
for (i = 0; i < num; ++i)
|
||||||
|
{
|
||||||
|
if (lengths[i]) t->trans[offs[lengths[i]]++] = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------------------- *
|
||||||
|
* -- decode functions -- *
|
||||||
|
* ---------------------- */
|
||||||
|
|
||||||
|
unsigned char uzlib_get_byte(TINF_DATA *d)
|
||||||
|
{
|
||||||
|
/* If end of source buffer is not reached, return next byte from source
|
||||||
|
buffer. */
|
||||||
|
if (d->source < d->source_limit) {
|
||||||
|
return *d->source++;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Otherwise if there's callback and we haven't seen EOF yet, try to
|
||||||
|
read next byte using it. (Note: the callback can also update ->source
|
||||||
|
and ->source_limit). */
|
||||||
|
if (d->readSource && !d->eof) {
|
||||||
|
int val = d->readSource(d);
|
||||||
|
if (val >= 0) {
|
||||||
|
return (unsigned char)val;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Otherwise, we hit EOF (either from ->readSource() or from exhaustion
|
||||||
|
of the buffer), and it will be "sticky", i.e. further calls to this
|
||||||
|
function will end up here too. */
|
||||||
|
d->eof = true;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t tinf_get_le_uint32(TINF_DATA *d)
|
||||||
|
{
|
||||||
|
uint32_t val = 0;
|
||||||
|
int i;
|
||||||
|
for (i = 4; i--;) {
|
||||||
|
val = val >> 8 | ((uint32_t)uzlib_get_byte(d)) << 24;
|
||||||
|
}
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t tinf_get_be_uint32(TINF_DATA *d)
|
||||||
|
{
|
||||||
|
uint32_t val = 0;
|
||||||
|
int i;
|
||||||
|
for (i = 4; i--;) {
|
||||||
|
val = val << 8 | uzlib_get_byte(d);
|
||||||
|
}
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* get one bit from source stream */
|
||||||
|
static int tinf_getbit(TINF_DATA *d)
|
||||||
|
{
|
||||||
|
unsigned int bit;
|
||||||
|
|
||||||
|
/* check if tag is empty */
|
||||||
|
if (!d->bitcount--)
|
||||||
|
{
|
||||||
|
/* load next tag */
|
||||||
|
d->tag = uzlib_get_byte(d);
|
||||||
|
d->bitcount = 7;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* shift bit out of tag */
|
||||||
|
bit = d->tag & 0x01;
|
||||||
|
d->tag >>= 1;
|
||||||
|
|
||||||
|
return bit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* read a num bit value from a stream and add base */
|
||||||
|
static unsigned int tinf_read_bits(TINF_DATA *d, int num, int base)
|
||||||
|
{
|
||||||
|
unsigned int val = 0;
|
||||||
|
|
||||||
|
/* read num bits */
|
||||||
|
if (num)
|
||||||
|
{
|
||||||
|
unsigned int limit = 1 << (num);
|
||||||
|
unsigned int mask;
|
||||||
|
|
||||||
|
for (mask = 1; mask < limit; mask *= 2)
|
||||||
|
if (tinf_getbit(d)) val += mask;
|
||||||
|
}
|
||||||
|
|
||||||
|
return val + base;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* given a data stream and a tree, decode a symbol */
|
||||||
|
static int tinf_decode_symbol(TINF_DATA *d, TINF_TREE *t)
|
||||||
|
{
|
||||||
|
int sum = 0, cur = 0, len = 0;
|
||||||
|
|
||||||
|
/* get more bits while code value is above sum */
|
||||||
|
do {
|
||||||
|
|
||||||
|
cur = 2*cur + tinf_getbit(d);
|
||||||
|
|
||||||
|
if (++len == TINF_ARRAY_SIZE(t->table)) {
|
||||||
|
return TINF_DATA_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
sum += t->table[len];
|
||||||
|
cur -= t->table[len];
|
||||||
|
|
||||||
|
} while (cur >= 0);
|
||||||
|
|
||||||
|
sum += cur;
|
||||||
|
if (sum < 0 || sum >= (int)(TINF_ARRAY_SIZE(t->trans))) {
|
||||||
|
return TINF_DATA_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
return t->trans[sum];
|
||||||
|
}
|
||||||
|
|
||||||
|
/* given a data stream, decode dynamic trees from it */
|
||||||
|
static int tinf_decode_trees(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
|
||||||
|
{
|
||||||
|
unsigned char lengths[288+32];
|
||||||
|
unsigned int hlit, hdist, hclen, hlimit;
|
||||||
|
unsigned int i, num, length;
|
||||||
|
|
||||||
|
/* get 5 bits HLIT (257-286) */
|
||||||
|
hlit = tinf_read_bits(d, 5, 257);
|
||||||
|
|
||||||
|
/* get 5 bits HDIST (1-32) */
|
||||||
|
hdist = tinf_read_bits(d, 5, 1);
|
||||||
|
|
||||||
|
/* get 4 bits HCLEN (4-19) */
|
||||||
|
hclen = tinf_read_bits(d, 4, 4);
|
||||||
|
|
||||||
|
for (i = 0; i < 19; ++i) lengths[i] = 0;
|
||||||
|
|
||||||
|
/* read code lengths for code length alphabet */
|
||||||
|
for (i = 0; i < hclen; ++i)
|
||||||
|
{
|
||||||
|
/* get 3 bits code length (0-7) */
|
||||||
|
unsigned int clen = tinf_read_bits(d, 3, 0);
|
||||||
|
|
||||||
|
lengths[clcidx[i]] = clen;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* build code length tree, temporarily use length tree */
|
||||||
|
tinf_build_tree(lt, lengths, 19);
|
||||||
|
|
||||||
|
/* decode code lengths for the dynamic trees */
|
||||||
|
hlimit = hlit + hdist;
|
||||||
|
for (num = 0; num < hlimit; )
|
||||||
|
{
|
||||||
|
int sym = tinf_decode_symbol(d, lt);
|
||||||
|
unsigned char fill_value = 0;
|
||||||
|
int lbits, lbase = 3;
|
||||||
|
|
||||||
|
/* error decoding */
|
||||||
|
if (sym < 0) return sym;
|
||||||
|
|
||||||
|
switch (sym)
|
||||||
|
{
|
||||||
|
case 16:
|
||||||
|
/* copy previous code length 3-6 times (read 2 bits) */
|
||||||
|
fill_value = lengths[num - 1];
|
||||||
|
lbits = 2;
|
||||||
|
break;
|
||||||
|
case 17:
|
||||||
|
/* repeat code length 0 for 3-10 times (read 3 bits) */
|
||||||
|
lbits = 3;
|
||||||
|
break;
|
||||||
|
case 18:
|
||||||
|
/* repeat code length 0 for 11-138 times (read 7 bits) */
|
||||||
|
lbits = 7;
|
||||||
|
lbase = 11;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
/* values 0-15 represent the actual code lengths */
|
||||||
|
lengths[num++] = sym;
|
||||||
|
/* continue the for loop */
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* special code length 16-18 are handled here */
|
||||||
|
length = tinf_read_bits(d, lbits, lbase);
|
||||||
|
if (num + length >= hlimit) return TINF_DATA_ERROR;
|
||||||
|
for (; length; --length)
|
||||||
|
{
|
||||||
|
lengths[num++] = fill_value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* build dynamic trees */
|
||||||
|
tinf_build_tree(lt, lengths, hlit);
|
||||||
|
tinf_build_tree(dt, lengths + hlit, hdist);
|
||||||
|
|
||||||
|
return TINF_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ----------------------------- *
|
||||||
|
* -- block inflate functions -- *
|
||||||
|
* ----------------------------- */
|
||||||
|
|
||||||
|
/* given a stream and two trees, inflate a block of data */
|
||||||
|
static int tinf_inflate_block_data(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt)
|
||||||
|
{
|
||||||
|
if (d->curlen == 0) {
|
||||||
|
unsigned int offs;
|
||||||
|
int dist;
|
||||||
|
int sym = tinf_decode_symbol(d, lt);
|
||||||
|
//printf("huff sym: %02x\n", sym);
|
||||||
|
|
||||||
|
if (d->eof) {
|
||||||
|
return TINF_DATA_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* literal byte */
|
||||||
|
if (sym < 256) {
|
||||||
|
TINF_PUT(d, sym);
|
||||||
|
return TINF_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* end of block */
|
||||||
|
if (sym == 256) {
|
||||||
|
return TINF_DONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* substring from sliding dictionary */
|
||||||
|
sym -= 257;
|
||||||
|
/* possibly get more bits from length code */
|
||||||
|
d->curlen = tinf_read_bits(d, length_bits[sym], length_base[sym]);
|
||||||
|
|
||||||
|
dist = tinf_decode_symbol(d, dt);
|
||||||
|
/* possibly get more bits from distance code */
|
||||||
|
offs = tinf_read_bits(d, dist_bits[dist], dist_base[dist]);
|
||||||
|
if (d->dict_ring) {
|
||||||
|
if (offs > d->dict_size) {
|
||||||
|
return TINF_DICT_ERROR;
|
||||||
|
}
|
||||||
|
d->lzOff = d->dict_idx - offs;
|
||||||
|
if (d->lzOff < 0) {
|
||||||
|
d->lzOff += d->dict_size;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
d->lzOff = -offs;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* copy next byte from dict substring */
|
||||||
|
if (d->dict_ring) {
|
||||||
|
TINF_PUT(d, d->dict_ring[d->lzOff]);
|
||||||
|
if ((unsigned)++d->lzOff == d->dict_size) {
|
||||||
|
d->lzOff = 0;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
d->dest[0] = d->dest[d->lzOff];
|
||||||
|
d->dest++;
|
||||||
|
}
|
||||||
|
d->curlen--;
|
||||||
|
return TINF_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* inflate an uncompressed block of data */
|
||||||
|
static int tinf_inflate_uncompressed_block(TINF_DATA *d)
|
||||||
|
{
|
||||||
|
if (d->curlen == 0) {
|
||||||
|
unsigned int length, invlength;
|
||||||
|
|
||||||
|
/* get length */
|
||||||
|
length = uzlib_get_byte(d);
|
||||||
|
length += 256 * uzlib_get_byte(d);
|
||||||
|
/* get one's complement of length */
|
||||||
|
invlength = uzlib_get_byte(d);
|
||||||
|
invlength += 256 * uzlib_get_byte(d);
|
||||||
|
/* check length */
|
||||||
|
if (length != (~invlength & 0x0000ffff)) return TINF_DATA_ERROR;
|
||||||
|
|
||||||
|
/* increment length to properly return TINF_DONE below, without
|
||||||
|
producing data at the same time */
|
||||||
|
d->curlen = length + 1;
|
||||||
|
|
||||||
|
/* make sure we start next block on a byte boundary */
|
||||||
|
d->bitcount = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (--d->curlen == 0) {
|
||||||
|
return TINF_DONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned char c = uzlib_get_byte(d);
|
||||||
|
TINF_PUT(d, c);
|
||||||
|
return TINF_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------------------- *
|
||||||
|
* -- public functions -- *
|
||||||
|
* ---------------------- */
|
||||||
|
|
||||||
|
/* initialize global (static) data */
|
||||||
|
void uzlib_init(void)
|
||||||
|
{
|
||||||
|
#ifdef RUNTIME_BITS_TABLES
|
||||||
|
/* build extra bits and base tables */
|
||||||
|
tinf_build_bits_base(length_bits, length_base, 4, 3);
|
||||||
|
tinf_build_bits_base(dist_bits, dist_base, 2, 1);
|
||||||
|
|
||||||
|
/* fix a special case */
|
||||||
|
length_bits[28] = 0;
|
||||||
|
length_base[28] = 258;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/* initialize decompression structure */
|
||||||
|
void uzlib_uncompress_init(TINF_DATA *d, void *dict, unsigned int dictLen)
|
||||||
|
{
|
||||||
|
d->eof = 0;
|
||||||
|
d->source_limit = NULL;
|
||||||
|
d->readSource = NULL;
|
||||||
|
d->bitcount = 0;
|
||||||
|
d->bfinal = 0;
|
||||||
|
d->btype = -1;
|
||||||
|
d->dict_size = dictLen;
|
||||||
|
d->dict_ring = (unsigned char *)dict;
|
||||||
|
d->dict_idx = 0;
|
||||||
|
d->curlen = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* inflate next byte of compressed stream */
|
||||||
|
int uzlib_uncompress(TINF_DATA *d)
|
||||||
|
{
|
||||||
|
do {
|
||||||
|
int res;
|
||||||
|
|
||||||
|
/* start a new block */
|
||||||
|
if (d->btype == -1) {
|
||||||
|
next_blk:
|
||||||
|
/* read final block flag */
|
||||||
|
d->bfinal = tinf_getbit(d);
|
||||||
|
/* read block type (2 bits) */
|
||||||
|
d->btype = tinf_read_bits(d, 2, 0);
|
||||||
|
|
||||||
|
//printf("Started new block: type=%d final=%d\n", d->btype, d->bfinal);
|
||||||
|
|
||||||
|
if (d->btype == 1) {
|
||||||
|
/* build fixed huffman trees */
|
||||||
|
tinf_build_fixed_trees(&d->ltree, &d->dtree);
|
||||||
|
} else if (d->btype == 2) {
|
||||||
|
/* decode trees from stream */
|
||||||
|
res = tinf_decode_trees(d, &d->ltree, &d->dtree);
|
||||||
|
if (res != TINF_OK) {
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* process current block */
|
||||||
|
switch (d->btype)
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
/* decompress uncompressed block */
|
||||||
|
res = tinf_inflate_uncompressed_block(d);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
case 2:
|
||||||
|
/* decompress block with fixed/dynamic huffman trees */
|
||||||
|
/* trees were decoded previously, so it's the same routine for both */
|
||||||
|
res = tinf_inflate_block_data(d, &d->ltree, &d->dtree);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return TINF_DATA_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (res == TINF_DONE && !d->bfinal) {
|
||||||
|
/* the block has ended (without producing more data), but we
|
||||||
|
can't return without data, so start procesing next block */
|
||||||
|
goto next_blk;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (res != TINF_OK) {
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
} while (--d->destSize);
|
||||||
|
|
||||||
|
return TINF_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
int uzlib_uncompress_chksum(TINF_DATA *d)
|
||||||
|
{
|
||||||
|
int res;
|
||||||
|
unsigned char *data = d->dest;
|
||||||
|
|
||||||
|
res = uzlib_uncompress(d);
|
||||||
|
|
||||||
|
if (res < 0) return res;
|
||||||
|
|
||||||
|
switch (d->checksum_type) {
|
||||||
|
|
||||||
|
case TINF_CHKSUM_ADLER:
|
||||||
|
d->checksum = uzlib_adler32(data, d->dest - data, d->checksum);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case TINF_CHKSUM_CRC:
|
||||||
|
d->checksum = uzlib_crc32(data, d->dest - data, d->checksum);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (res == TINF_DONE) {
|
||||||
|
unsigned int val;
|
||||||
|
|
||||||
|
switch (d->checksum_type) {
|
||||||
|
|
||||||
|
case TINF_CHKSUM_ADLER:
|
||||||
|
val = tinf_get_be_uint32(d);
|
||||||
|
if (d->checksum != val) {
|
||||||
|
return TINF_CHKSUM_ERROR;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case TINF_CHKSUM_CRC:
|
||||||
|
val = tinf_get_le_uint32(d);
|
||||||
|
if (~d->checksum != val) {
|
||||||
|
return TINF_CHKSUM_ERROR;
|
||||||
|
}
|
||||||
|
// Uncompressed size. TODO: Check
|
||||||
|
val = tinf_get_le_uint32(d);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
Loading…
Reference in New Issue