leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add WATCHDOG_RESET to allow LZMA kernel decompression on slow machines

Browse Source 
Signed-off-by: rhabarber1848@web.de
This commit is contained in:
rhabarber1848@web.de 2009-07-24 08:16:30 +02:00 committed by Wolfgang Denk
parent 3c972849f2
commit fafbb2c3e4
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib_generic/lzma/LzmaDec.c
View File

@ -1,6 +1,9 @@
/* LzmaDec.c -- LZMA Decoder
2008-11-06 : Igor Pavlov : Public domain */
#include <config.h>
#include <common.h>
#include <watchdog.h>
#include "LzmaDec.h"
#include <string.h>
@ -156,6 +159,8 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
UInt32 range = p->range;
UInt32 code = p->code;
WATCHDOG_RESET();
do
{
CLzmaProb *prob;
@ -176,6 +181,9 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
if (state < kNumLitStates)
{
symbol = 1;
WATCHDOG_RESET();
do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
}
else
@ -183,6 +191,9 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
unsigned offs = 0x100;
symbol = 1;
WATCHDOG_RESET();
do
{
unsigned bit;
@ -316,6 +327,9 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
{
UInt32 mask = 1;
unsigned i = 1;
WATCHDOG_RESET();
do
{
GET_BIT2(prob + i, i, ; , distance |= mask);
@ -327,6 +341,9 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
else
{
numDirectBits -= kNumAlignBits;
WATCHDOG_RESET();
do
{
NORMALIZE
@ -399,12 +416,18 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
const Byte *lim = dest + curLen;
dicPos += curLen;
WATCHDOG_RESET();
do
*(dest) = (Byte)*(dest + src);
while (++dest != lim);
}
else
{
WATCHDOG_RESET();
do
{
dic[dicPos++] = dic[pos];
@ -417,6 +440,9 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
}
}
while (dicPos < limit && buf < bufLimit);
WATCHDOG_RESET();
NORMALIZE;
p->buf = buf;
p->range = range;

4
lib_generic/lzma/LzmaTools.c
View File

@ -36,6 +36,7 @@
#include <config.h>
#include <common.h>
#include <watchdog.h>
#ifdef CONFIG_LZMA
@ -112,6 +113,9 @@ int lzmaBuffToBuffDecompress (unsigned char *outStream, SizeT *uncompressedSize,
/* Decompress */
outProcessed = outSizeFull;
WATCHDOG_RESET();
res = LzmaDecode(
outStream, &outProcessed,
inStream + LZMA_DATA_OFFSET, &compressedSize,