diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2017-08-12 11:21:29 +0200 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2017-08-12 11:21:29 +0200 |
| commit | 83b49341aad5de030ee5503fa0873eb4d8c6be3a (patch) | |
| tree | 6c10677222e4e9008a4aaed0fff3f84c6330b391 /src | |
| parent | 098dcca9b5abe8064a3db7a280eb504d40bd5b2e (diff) | |
| download | nihav-83b49341aad5de030ee5503fa0873eb4d8c6be3a.tar.gz | |
io: mark some bitstream reading functions as inline
Diffstat (limited to 'src')
| -rw-r--r-- | src/io/bitreader.rs | 8 | ||||
| -rw-r--r-- | src/io/intcode.rs | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/io/bitreader.rs b/src/io/bitreader.rs index b3e478e..ea5f27c 100644 --- a/src/io/bitreader.rs +++ b/src/io/bitreader.rs @@ -70,6 +70,7 @@ impl<'a> BitReader<'a> { } } + #[inline(always)] fn refill(&mut self) -> BitReaderResult<()> { if self.pos >= self.end { return Err(BitstreamEnd) } while self.bits <= 32 { @@ -106,6 +107,7 @@ impl<'a> BitReader<'a> { Ok(()) } + #[inline(always)] fn read_cache(&mut self, nbits: u8) -> u32 { let res = match self.mode { BitReaderMode::LE => ((1u64 << nbits) - 1) & self.cache, @@ -122,6 +124,7 @@ impl<'a> BitReader<'a> { res as i32 } + #[inline(always)] fn skip_cache(&mut self, nbits: u8) { match self.mode { BitReaderMode::LE => self.cache >>= nbits, @@ -130,11 +133,13 @@ impl<'a> BitReader<'a> { self.bits -= nbits; } + #[inline(always)] fn reset_cache(&mut self) { self.bits = 0; self.cache = 0; } + #[inline(always)] pub fn read(&mut self, nbits: u8) -> BitReaderResult<u32> { if nbits == 0 { return Ok(0) } if nbits > 32 { return Err(TooManyBitsRequested) } @@ -158,6 +163,7 @@ impl<'a> BitReader<'a> { Ok(res) } + #[inline(always)] pub fn read_bool(&mut self) -> BitReaderResult<bool> { if self.bits < 1 { if let Err(err) = self.refill() { return Err(err) } @@ -168,12 +174,14 @@ impl<'a> BitReader<'a> { Ok(res == 1) } + #[inline(always)] pub fn peek(&mut self, nbits: u8) -> u32 { if nbits > 32 { return 0 } if self.bits < nbits { let _ = self.refill(); } self.read_cache(nbits) } + #[inline(always)] pub fn skip(&mut self, nbits: u32) -> BitReaderResult<()> { if self.bits as u32 >= nbits { self.skip_cache(nbits as u8); diff --git a/src/io/intcode.rs b/src/io/intcode.rs index 141377d..5e35a15 100644 --- a/src/io/intcode.rs +++ b/src/io/intcode.rs @@ -96,6 +96,7 @@ fn uval_to_sval0pm(uval: u32) -> i32 { } impl<'a> IntCodeReader for BitReader<'a> { + #[inline(always)] fn read_code(&mut self, t: UintCodeType) -> BitReaderResult<u32> { match t { UintCodeType::UnaryOnes => read_unary(self, 0), |