6502/lzsa
1
0
Fork 0
mirror of https://github.com/emmanuel-marty/lzsa.git synced 2024-11-28 14:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Nicer code

Browse Source
This commit is contained in:
Emmanuel Marty 2020-07-26 16:38:22 +02:00 committed by GitHub
parent 3fb9dc54b1
commit b2971da2b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/shrink_block_v2.c
View File

@ -309,7 +309,7 @@ static void lzsa_optimize_forward_v2(lzsa_compressor *pCompressor, const unsigne
if (nNumLiterals == 1) if (nNumLiterals == 1)
nCodingChoiceCost += nModeSwitchPenalty; nCodingChoiceCost += nModeSwitchPenalty;
lzsa_arrival *pDestSlots = &arrival[(i + 1) << ARRIVALS_PER_POSITION_SHIFT]; lzsa_arrival *pDestSlots = &cur_arrival[1 << ARRIVALS_PER_POSITION_SHIFT];
if (nCodingChoiceCost <= pDestSlots[nArrivalsPerPosition - 1].cost) { if (nCodingChoiceCost <= pDestSlots[nArrivalsPerPosition - 1].cost) {
int nRepOffset = cur_arrival[j].rep_offset; int nRepOffset = cur_arrival[j].rep_offset;
int exists = 0; int exists = 0;
@ -400,7 +400,6 @@ static void lzsa_optimize_forward_v2(lzsa_compressor *pCompressor, const unsigne
int nLen0 = rle_end[i - nRepOffset] - (i - nRepOffset); int nLen0 = rle_end[i - nRepOffset] - (i - nRepOffset);
int nLen1 = rle_end[i] - (i); int nLen1 = rle_end[i] - (i);
int nMinLen = (nLen0 < nLen1) ? nLen0 : nLen1; int nMinLen = (nLen0 < nLen1) ? nLen0 : nLen1;
int nCurMaxRepLen;
if (nMinLen > nMaxRepLen) if (nMinLen > nMaxRepLen)
nMinLen = nMaxRepLen; nMinLen = nMaxRepLen;
@ -412,11 +411,10 @@ static void lzsa_optimize_forward_v2(lzsa_compressor *pCompressor, const unsigne
pInWindowAtPos += 4; pInWindowAtPos += 4;
while (pInWindowAtPos < pInWindowMax && pInWindowAtPos[-nRepOffset] == pInWindowAtPos[0]) while (pInWindowAtPos < pInWindowMax && pInWindowAtPos[-nRepOffset] == pInWindowAtPos[0])
pInWindowAtPos++; pInWindowAtPos++;
nCurMaxRepLen = (int)(pInWindowAtPos - (pInWindow + i)); nMinRepLen[j] = (int)(pInWindowAtPos - (pInWindow + i));
nMinRepLen[j] = nCurMaxRepLen;
if (nMaxOverallRepLen < nCurMaxRepLen) if (nMaxOverallRepLen < nMinRepLen[j])
nMaxOverallRepLen = nCurMaxRepLen; nMaxOverallRepLen = nMinRepLen[j];
} }
} }
} }
@ -458,7 +456,7 @@ static void lzsa_optimize_forward_v2(lzsa_compressor *pCompressor, const unsigne
} }
} }
lzsa_arrival *pDestSlots = &arrival[(i + k) << ARRIVALS_PER_POSITION_SHIFT]; lzsa_arrival *pDestSlots = &cur_arrival[k << ARRIVALS_PER_POSITION_SHIFT];
/* Insert non-repmatch candidates */ /* Insert non-repmatch candidates */