Skip to content

Decompress shrink more fields #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
folkertdev merged 18 commits into from
Jan 14, 2025
Merged

Decompress shrink more fields #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
95b7d93
make `GET_BITS` return its value
folkertdev Jan 13, 2025
a8c41c4
make `GET_BYTE` return its value
folkertdev Jan 13, 2025
b986383
make `GET_BIT` return its value
folkertdev Jan 13, 2025
3e4c6c2
remove `GetBitsConvert`
folkertdev Jan 13, 2025
bd677b0
make `zj` a `bool`
folkertdev Jan 13, 2025
b00d963
make `nGroups` a `u8`
folkertdev Jan 13, 2025
1ffe52a
make `nSelectors` a `u16`
folkertdev Jan 13, 2025
a51c97b
make `curr` a `u8`
folkertdev Jan 13, 2025
008cdf1
make `zn` a `u8`
folkertdev Jan 13, 2025
cfe1f05
make `nInUse` a `u16` (its range is `0..=256`)
folkertdev Jan 13, 2025
8f6d044
make `EOB` a `u16`
folkertdev Jan 13, 2025
fb693dc
shrink `nblockMAX`
folkertdev Jan 13, 2025
7decd8a
shrink `groupPos`
folkertdev Jan 13, 2025
e2549f0
clippy
folkertdev Jan 13, 2025
2febacf
make `nblock` a `u32`
folkertdev Jan 13, 2025
f421dbf
store `N` as `logN` instead, shrinking its size
folkertdev Jan 13, 2025
55c2b30
remove the padding fields
folkertdev Jan 13, 2025
8423213
refactor checking whether logN is too large
folkertdev Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 30 additions & 29 deletions libbz2-rs-sys/src/bzlib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@
pub storedCombinedCRC: u32,
pub calculatedBlockCRC: u32,
pub calculatedCombinedCRC: u32,
pub nInUse: i32,
pub nInUse: u16,
pub inUse: [bool; 256],
pub inUse16: [bool; 16],
pub seqToUnseq: [u8; 256],
Expand All @@ -563,25 +563,26 @@
}

#[derive(Default)]
#[repr(C)]
pub(crate) struct SaveArea {
pub i: i32,
pub j: i32,
pub t: i32,
pub alphaSize: i32,
pub nGroups: i32,
pub nSelectors: i32,
pub EOB: i32,
pub alphaSize: u16,
pub EOB: u16,
pub groupNo: i32,
pub groupPos: i32,
pub groupPos: u8,
pub nextSym: i32,
pub nblockMAX: i32,
pub nblock: i32,
pub nblock: u32,
pub es: i32,
pub N: i32,
pub curr: i32,
pub zn: i32,
pub zvec: i32,
pub zj: i32,
pub nSelectors: u16,
pub zn: u8,
pub nGroups: u8,
pub curr: u8,
pub nblockMAX100k: u8,
pub logN: u8, // the log_2 of N
pub zj: bool,
pub gMinlen: u8,
pub gSel: u8,
pub gLimit: u8,
Expand Down Expand Up @@ -1267,12 +1268,12 @@
}

/* can a new run be started? */
if s.nblock_used == s.save.nblock + 1 {
if s.nblock_used == s.save.nblock as i32 + 1 {
return false;
}

/* Only caused by corrupt data stream? */
if s.nblock_used > s.save.nblock + 1 {
if s.nblock_used > s.save.nblock as i32 + 1 {
return true;
}

Expand All @@ -1283,7 +1284,7 @@
BZ_RAND_UPD_MASK!(s);
k1 ^= BZ_RAND_MASK!(s);
s.nblock_used += 1;
if s.nblock_used == s.save.nblock + 1 {
if s.nblock_used == s.save.nblock as i32 + 1 {
continue;
};
if k1 != s.k0 {
Expand All @@ -1296,7 +1297,7 @@
BZ_RAND_UPD_MASK!(s);
k1 ^= BZ_RAND_MASK!(s);
s.nblock_used += 1;
if s.nblock_used == s.save.nblock + 1 {
if s.nblock_used == s.save.nblock as i32 + 1 {
continue;
};
if k1 != s.k0 {
Expand All @@ -1309,7 +1310,7 @@
BZ_RAND_UPD_MASK!(s);
k1 ^= BZ_RAND_MASK!(s);
s.nblock_used += 1;
if s.nblock_used == s.save.nblock + 1 {
if s.nblock_used == s.save.nblock as i32 + 1 {
continue;
};
if k1 != s.k0 {
Expand Down Expand Up @@ -1341,7 +1342,7 @@
/* end restore */

let avail_out_INIT: u32 = cs_avail_out;
let s_save_nblockPP: i32 = s.save.nblock + 1;
let s_save_nblockPP: i32 = s.save.nblock as i32 + 1;

let tt = &s.tt.as_slice()[..100000usize.wrapping_mul(ro_blockSize100k as usize)];

Expand Down Expand Up @@ -1540,12 +1541,12 @@
}

/* can a new run be started? */
if s.nblock_used == s.save.nblock + 1 {
if s.nblock_used == s.save.nblock as i32 + 1 {
return false;
}

/* Only caused by corrupt data stream? */
if s.nblock_used > s.save.nblock + 1 {
if s.nblock_used > s.save.nblock as i32 + 1 {
return true;
}

Expand All @@ -1556,7 +1557,7 @@
BZ_RAND_UPD_MASK!(s);
k1 ^= BZ_RAND_MASK!(s);
s.nblock_used += 1;
if s.nblock_used == s.save.nblock + 1 {
if s.nblock_used == s.save.nblock as i32 + 1 {
continue;
};
if k1 != s.k0 {
Expand All @@ -1569,7 +1570,7 @@
BZ_RAND_UPD_MASK!(s);
k1 ^= BZ_RAND_MASK!(s);
s.nblock_used += 1;
if s.nblock_used == s.save.nblock + 1 {
if s.nblock_used == s.save.nblock as i32 + 1 {
continue;
}
if k1 != s.k0 {
Expand All @@ -1582,7 +1583,7 @@
BZ_RAND_UPD_MASK!(s);
k1 ^= BZ_RAND_MASK!(s);
s.nblock_used += 1;
if s.nblock_used == s.save.nblock + 1 {
if s.nblock_used == s.save.nblock as i32 + 1 {
continue;
}
if k1 != s.k0 {
Expand Down Expand Up @@ -1616,18 +1617,18 @@
BZ_UPDATE_CRC!(s.calculatedBlockCRC, s.state_out_ch);
s.state_out_len -= 1;
}
if s.nblock_used == s.save.nblock + 1 {
if s.nblock_used == s.save.nblock as i32 + 1 {
return false;
}
if s.nblock_used > s.save.nblock + 1 {
if s.nblock_used > s.save.nblock as i32 + 1 {
return true;
}

s.state_out_len = 1;
s.state_out_ch = s.k0;
BZ_GET_SMALL!(s, k1);
s.nblock_used += 1;
if s.nblock_used == s.save.nblock + 1 {
if s.nblock_used == s.save.nblock as i32 + 1 {
continue;
}
if k1 != s.k0 {
Expand All @@ -1638,7 +1639,7 @@
s.state_out_len = 2;
BZ_GET_SMALL!(s, k1);
s.nblock_used += 1;
if s.nblock_used == s.save.nblock + 1 {
if s.nblock_used == s.save.nblock as i32 + 1 {
continue;
}
if k1 != s.k0 {
Expand All @@ -1649,7 +1650,7 @@
s.state_out_len = 3;
BZ_GET_SMALL!(s, k1);
s.nblock_used += 1;
if s.nblock_used == s.save.nblock + 1 {
if s.nblock_used == s.save.nblock as i32 + 1 {

Check warning on line 1653 in libbz2-rs-sys/src/bzlib.rs

View check run for this annotation

Codecov / codecov/patch

libbz2-rs-sys/src/bzlib.rs#L1653 

Added line #L1653 was not covered by tests
continue;
}
if k1 != s.k0 {
Expand Down Expand Up @@ -1730,7 +1731,7 @@
return ReturnCode::BZ_DATA_ERROR;
}

if s.nblock_used == s.save.nblock + 1 && s.state_out_len == 0 {
if s.nblock_used == s.save.nblock as i32 + 1 && s.state_out_len == 0 {
s.calculatedBlockCRC = !s.calculatedBlockCRC;
if s.verbosity >= 3 {
debug_log!(
Expand Down
Loading
Loading