mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-22 16:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

(7z) Prevent redefinitions of macros for Griffin builds

Browse Source
This commit is contained in:
twinaphex 2014-09-02 20:13:59 +02:00
parent 4942d268e7
commit 600e0524b0
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
decompress/7zip/Bcj2.c
View File

@ -24,11 +24,11 @@
#define RC_INIT2 code = 0; range = 0xFFFFFFFF; \ #define RC_INIT2 code = 0; range = 0xFFFFFFFF; \
{ int i; for (i = 0; i < 5; i++) { RC_TEST; code = (code << 8) | RC_READ_BYTE; }} { int i; for (i = 0; i < 5; i++) { RC_TEST; code = (code << 8) | RC_READ_BYTE; }}
#define NORMALIZE if (range < kTopValue) { RC_TEST; range <<= 8; code = (code << 8) | RC_READ_BYTE; } #define BCJ2_NORMALIZE if (range < kTopValue) { RC_TEST; range <<= 8; code = (code << 8) | RC_READ_BYTE; }
#define IF_BIT_0(p) ttt = *(p); bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound) #define BCJ2_IF_BIT_0(p) ttt = *(p); bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
#define UPDATE_0(p) range = bound; *(p) = (CProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits)); NORMALIZE; #define BCJ2_UPDATE_0(p) range = bound; *(p) = (CProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits)); BCJ2_NORMALIZE;
#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CProb)(ttt - (ttt >> kNumMoveBits)); NORMALIZE; #define BCJ2_UPDATE_1(p) range -= bound; code -= bound; *(p) = (CProb)(ttt - (ttt >> kNumMoveBits)); BCJ2_NORMALIZE;
int Bcj2_Decode( int Bcj2_Decode(
const Byte *buf0, SizeT size0, const Byte *buf0, SizeT size0,
@ -88,16 +88,16 @@ int Bcj2_Decode(
else else
prob = p + 257; prob = p + 257;
IF_BIT_0(prob) BCJ2_IF_BIT_0(prob)
{ {
UPDATE_0(prob) BCJ2_UPDATE_0(prob)
prevByte = b; prevByte = b;
} }
else else
{ {
UInt32 dest; UInt32 dest;
const Byte *v; const Byte *v;
UPDATE_1(prob) BCJ2_UPDATE_1(prob)
if (b == 0xE8) if (b == 0xE8)
{ {
v = buf1; v = buf1;

46
decompress/7zip/LzmaDec.c
View File

@ -14,14 +14,14 @@
#define RC_INIT_SIZE 5 #define RC_INIT_SIZE 5
#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); } #define LZMADEC_NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound) #define LZMADEC_IF_BIT_0(p) ttt = *(p); LZMADEC_NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits)); #define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits)); #define LZMADEC_UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \ #define GET_BIT2(p, i, A0, A1) LZMADEC_IF_BIT_0(p) \
{ UPDATE_0(p); i = (i + i); A0; } else \ { UPDATE_0(p); i = (i + i); A0; } else \
{ UPDATE_1(p); i = (i + i) + 1; A1; } { LZMADEC_UPDATE_1(p); i = (i + i) + 1; A1; }
#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;) #define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); } #define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
@ -158,7 +158,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
unsigned posState = processedPos & pbMask; unsigned posState = processedPos & pbMask;
prob = probs + IsMatch + (state << kNumPosBitsMax) + posState; prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
IF_BIT_0(prob) LZMADEC_IF_BIT_0(prob)
{ {
unsigned symbol; unsigned symbol;
UPDATE_0(prob); UPDATE_0(prob);
@ -196,9 +196,9 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
} }
else else
{ {
UPDATE_1(prob); LZMADEC_UPDATE_1(prob);
prob = probs + IsRep + state; prob = probs + IsRep + state;
IF_BIT_0(prob) LZMADEC_IF_BIT_0(prob)
{ {
UPDATE_0(prob); UPDATE_0(prob);
state += kNumStates; state += kNumStates;
@ -206,15 +206,15 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
} }
else else
{ {
UPDATE_1(prob); LZMADEC_UPDATE_1(prob);
if (checkDicSize == 0 && processedPos == 0) if (checkDicSize == 0 && processedPos == 0)
return SZ_ERROR_DATA; return SZ_ERROR_DATA;
prob = probs + IsRepG0 + state; prob = probs + IsRepG0 + state;
IF_BIT_0(prob) LZMADEC_IF_BIT_0(prob)
{ {
UPDATE_0(prob); UPDATE_0(prob);
prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState; prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
IF_BIT_0(prob) LZMADEC_IF_BIT_0(prob)
{ {
UPDATE_0(prob); UPDATE_0(prob);
dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)]; dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
@ -223,30 +223,30 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
state = state < kNumLitStates ? 9 : 11; state = state < kNumLitStates ? 9 : 11;
continue; continue;
} }
UPDATE_1(prob); LZMADEC_UPDATE_1(prob);
} }
else else
{ {
UInt32 distance; UInt32 distance;
UPDATE_1(prob); LZMADEC_UPDATE_1(prob);
prob = probs + IsRepG1 + state; prob = probs + IsRepG1 + state;
IF_BIT_0(prob) LZMADEC_IF_BIT_0(prob)
{ {
UPDATE_0(prob); UPDATE_0(prob);
distance = rep1; distance = rep1;
} }
else else
{ {
UPDATE_1(prob); LZMADEC_UPDATE_1(prob);
prob = probs + IsRepG2 + state; prob = probs + IsRepG2 + state;
IF_BIT_0(prob) LZMADEC_IF_BIT_0(prob)
{ {
UPDATE_0(prob); UPDATE_0(prob);
distance = rep2; distance = rep2;
} }
else else
{ {
UPDATE_1(prob); LZMADEC_UPDATE_1(prob);
distance = rep3; distance = rep3;
rep3 = rep2; rep3 = rep2;
} }
@ -261,7 +261,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
{ {
unsigned limit, offset; unsigned limit, offset;
CLzmaProb *probLen = prob + LenChoice; CLzmaProb *probLen = prob + LenChoice;
IF_BIT_0(probLen) LZMADEC_IF_BIT_0(probLen)
{ {
UPDATE_0(probLen); UPDATE_0(probLen);
probLen = prob + LenLow + (posState << kLenNumLowBits); probLen = prob + LenLow + (posState << kLenNumLowBits);
@ -270,9 +270,9 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
} }
else else
{ {
UPDATE_1(probLen); LZMADEC_UPDATE_1(probLen);
probLen = prob + LenChoice2; probLen = prob + LenChoice2;
IF_BIT_0(probLen) LZMADEC_IF_BIT_0(probLen)
{ {
UPDATE_0(probLen); UPDATE_0(probLen);
probLen = prob + LenMid + (posState << kLenNumMidBits); probLen = prob + LenMid + (posState << kLenNumMidBits);
@ -281,7 +281,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
} }
else else
{ {
UPDATE_1(probLen); LZMADEC_UPDATE_1(probLen);
probLen = prob + LenHigh; probLen = prob + LenHigh;
offset = kLenNumLowSymbols + kLenNumMidSymbols; offset = kLenNumLowSymbols + kLenNumMidSymbols;
limit = (1 << kLenNumHighBits); limit = (1 << kLenNumHighBits);
@ -322,7 +322,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
numDirectBits -= kNumAlignBits; numDirectBits -= kNumAlignBits;
do do
{ {
NORMALIZE LZMADEC_NORMALIZE
range >>= 1; range >>= 1;
{ {
@ -409,7 +409,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
} }
} }
while (dicPos < limit && buf < bufLimit); while (dicPos < limit && buf < bufLimit);
NORMALIZE; LZMADEC_NORMALIZE;
p->buf = buf; p->buf = buf;
p->range = range; p->range = range;
p->code = code; p->code = code;