1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
use std::{
io::{Cursor, Read},
ops::{BitOrAssign, ShlAssign},
};
use thiserror::Error;
use crate::{bit_seek::{BitSeek, BitSeekFrom}, bit_read::BitRead};
#[derive(Debug, Error)]
pub enum BitCursorError {
#[error("BufferOverflow: {0}")]
BufferOverflow(String),
#[error("BufferUnderflow: {0}")]
BufferUnderflow(String),
#[error("IO error: {0}")]
IoError(std::io::Error),
}
impl From<std::io::Error> for BitCursorError {
fn from(io_err: std::io::Error) -> Self {
BitCursorError::IoError(io_err)
}
}
pub type BitCursorResult<T> = Result<T, BitCursorError>;
#[derive(Debug)]
pub struct BitCursor {
byte_cursor: Cursor<Vec<u8>>,
bit_pos: u8,
}
impl Read for BitCursor {
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
match self.bit_pos {
0 => self.byte_cursor.read(buf),
bp => Err(std::io::Error::new(
std::io::ErrorKind::Other,
format!(
"Cannot do a byte-level read when not on a byte boundary; cursor is currently on bit {}",
bp
),
)),
}
}
}
fn bit_read_helper<T>(buf: &mut BitCursor, num_bits: usize) -> BitCursorResult<T>
where
T: Default + ShlAssign<u8> + BitOrAssign + From<u8>,
{
let mut result = Default::default();
for _ in 0..num_bits {
result <<= 1;
result |= buf.read_bit()?.into();
}
Ok(result)
}
impl BitCursor {
pub fn new(data: Vec<u8>) -> Self {
BitCursor {
byte_cursor: Cursor::new(data),
bit_pos: 0,
}
}
fn increment_bit_pos(&mut self, num_bits: usize) {
self.bit_pos += num_bits as u8;
if self.bit_pos >= 7 {
let num_bytes = self.bit_pos / 8;
self.bit_pos %= 8;
self.byte_cursor
.set_position(self.curr_byte_position() + num_bytes as u64);
}
}
fn length(&self) -> usize {
self.byte_cursor.get_ref().len()
}
fn curr_byte_position(&self) -> u64 {
self.byte_cursor.position()
}
fn get_curr_byte(&self) -> BitCursorResult<u8> {
if self.curr_byte_position() >= self.length() as u64 {
return Err(BitCursorError::BufferOverflow(format!(
"tried to access index {}, but underlying data has size {}",
self.curr_byte_position(),
self.byte_cursor.get_ref().len()
)));
}
Ok(self.byte_cursor.get_ref()[self.curr_byte_position() as usize])
}
pub fn read_bit(&mut self) -> BitCursorResult<u8> {
let mask = 1u8 << (7 - self.bit_pos);
let curr_byte = self.get_curr_byte()?;
let result = (curr_byte & mask) >> (7 - self.bit_pos);
self.increment_bit_pos(1);
Ok(result)
}
pub fn bytes_remaining(&self) -> usize {
match self.bit_pos {
0 => self.byte_cursor.get_ref().len() - self.curr_byte_position() as usize,
_ => self.byte_cursor.get_ref().len() - self.curr_byte_position() as usize - 1,
}
}
pub fn read_bits_as_u8(&mut self, num_bits: usize) -> BitCursorResult<u8> {
bit_read_helper::<u8>(self, num_bits)
}
pub fn read_bits_as_u16(&mut self, num_bits: usize) -> BitCursorResult<u16> {
bit_read_helper::<u16>(self, num_bits)
}
pub fn read_bits_as_u32(&mut self, num_bits: usize) -> BitCursorResult<u32> {
bit_read_helper::<u32>(self, num_bits)
}
pub fn bit_read<T: BitRead>(&mut self) -> BitCursorResult<T> {
T::bit_read(self)
}
}
impl BitSeek for BitCursor {
fn seek(&mut self, pos: BitSeekFrom) -> BitCursorResult<(u64, u64)> {
let new_total_bit_pos: i64 = match pos {
BitSeekFrom::Start(bytes, bits) => {
(bytes * 8 + bits) as i64
},
BitSeekFrom::Current(bytes, bits) => {
let total_bit_delta = bytes * 8 + bits;
let curr_total_bit_pos = self.curr_byte_position() * 8 + self.bit_pos as u64;
curr_total_bit_pos as i64 + total_bit_delta
},
BitSeekFrom::End(bytes, bits) => {
let total_bit_delta = bytes * 8 + bits;
let end_bit_pos = (self.length() * 8) as i64;
end_bit_pos + total_bit_delta
},
};
let max_bit_pos = (self.length() * 8) as i64;
if new_total_bit_pos > max_bit_pos {
return Err(BitCursorError::BufferOverflow(format!(
"Tried to seek past end of buffer (position {} bits, but buffer has length {} bits)", new_total_bit_pos, max_bit_pos)));
} else if new_total_bit_pos < 0 {
return Err(BitCursorError::BufferUnderflow(format!(
"Tried to seek past beginning of buffer (position {} bits)", new_total_bit_pos)));
}
let new_byte_pos = new_total_bit_pos / 8;
let new_bit_pos = new_total_bit_pos % 8;
self.byte_cursor.set_position(new_byte_pos as u64);
self.bit_pos = new_bit_pos as u8;
Ok((new_byte_pos as u64, new_bit_pos as u64))
}
}
#[cfg(test)]
mod tests {
use ux::*;
use crate::{bitcursor::BitCursor, bit_read::BitRead, bit_seek::BitSeekFrom, bit_seek::BitSeek};
#[test]
fn test_read() {
let data: Vec<u8> = vec![0b11110000, 0b00001111];
let mut cursor = BitCursor::new(data);
assert_eq!(cursor.bit_read::<u4>().unwrap(), u4::new(15));
assert_eq!(cursor.bit_read::<u4>().unwrap(), u4::new(0));
assert_eq!(cursor.bit_read::<u2>().unwrap(), u2::new(0));
assert_eq!(cursor.bit_read::<u6>().unwrap(), u6::new(15));
}
#[test]
fn read_on_non_byte_boundary() {
let data: Vec<u8> = vec![0b11110000, 0b00001111];
let mut cursor = BitCursor::new(data);
let _ = cursor.bit_read::<u4>().unwrap();
assert!(cursor.bit_read::<u8>().is_err());
}
#[test]
fn read_too_far() {
let data: Vec<u8> = vec![0b11110000];
let mut cursor = BitCursor::new(data);
assert!(cursor.bit_read::<u16>().is_err());
}
#[test]
fn read_too_far_bits() {
let data: Vec<u8> = vec![0b11110000];
let mut cursor = BitCursor::new(data);
let _ = cursor.bit_read::<u7>();
assert!(cursor.bit_read::<u3>().is_err());
}
#[test]
fn seek_from_start() {
let data: Vec<u8> = vec![
0b00001111,
0b11110000,
0b00001111,
0b11110000,
0b00001111,
];
let mut cursor = BitCursor::new(data);
assert_eq!((2, 2), cursor.seek(BitSeekFrom::Start(2, 2)).unwrap());
assert_eq!(u4::new(0b0011), cursor.bit_read::<u4>().unwrap());
assert_eq!((2, 2), cursor.seek(BitSeekFrom::Start(0, 18)).unwrap());
assert_eq!(u4::new(0b0011), cursor.bit_read::<u4>().unwrap());
assert_eq!((2, 2), cursor.seek(BitSeekFrom::Start(1, 10)).unwrap());
assert_eq!(u4::new(0b0011), cursor.bit_read::<u4>().unwrap());
assert!(cursor.seek(BitSeekFrom::Start(6, 0)).is_err());
assert!(cursor.seek(BitSeekFrom::Start(0, 48)).is_err());
assert!(cursor.seek(BitSeekFrom::Start(2, 32)).is_err());
}
#[test]
fn seek_from_current() {
let data: Vec<u8> = vec![
0b00001111,
0b11110000,
0b00001111,
0b11110000,
0b00001111,
];
let mut cursor = BitCursor::new(data);
let reset = |c: &mut BitCursor| c.seek(BitSeekFrom::Start(1, 2)).unwrap();
reset(&mut cursor);
assert_eq!((2, 4), cursor.seek(BitSeekFrom::Current(1, 2)).unwrap());
assert_eq!(u4::new(0b1111), cursor.bit_read::<u4>().unwrap());
reset(&mut cursor);
assert_eq!((2, 4), cursor.seek(BitSeekFrom::Current(0, 10)).unwrap());
assert_eq!(u4::new(0b1111), cursor.bit_read::<u4>().unwrap());
reset(&mut cursor);
assert_eq!((3, 4), cursor.seek(BitSeekFrom::Current(1, 10)).unwrap());
assert_eq!(u4::new(0b0000), cursor.bit_read::<u4>().unwrap());
reset(&mut cursor);
assert_eq!((3, 1), cursor.seek(BitSeekFrom::Current(1, 7)).unwrap());
assert_eq!(u4::new(0b1110), cursor.bit_read::<u4>().unwrap());
reset(&mut cursor);
assert_eq!((0, 2), cursor.seek(BitSeekFrom::Current(-1, 0)).unwrap());
assert_eq!(u4::new(0b0011), cursor.bit_read::<u4>().unwrap());
reset(&mut cursor);
assert_eq!((0, 0), cursor.seek(BitSeekFrom::Current(0, -10)).unwrap());
assert_eq!(u4::new(0b0000), cursor.bit_read::<u4>().unwrap());
reset(&mut cursor);
assert_eq!((0, 7), cursor.seek(BitSeekFrom::Current(0, -3)).unwrap());
assert_eq!(u4::new(0b1111), cursor.bit_read::<u4>().unwrap());
assert!(cursor.seek(BitSeekFrom::Current(6, 0)).is_err());
reset(&mut cursor);
assert!(cursor.seek(BitSeekFrom::Current(0, 48)).is_err());
reset(&mut cursor);
assert!(cursor.seek(BitSeekFrom::Current(2, 32)).is_err());
reset(&mut cursor);
assert!(cursor.seek(BitSeekFrom::Current(3, 7)).is_err());
assert!(cursor.seek(BitSeekFrom::Current(0, -15)).is_err());
reset(&mut cursor);
assert!(cursor.seek(BitSeekFrom::Current(-1, -3)).is_err());
reset(&mut cursor);
}
#[test]
fn test_seek_from_end() {
let data: Vec<u8> = vec![
0b00001111,
0b11110000,
0b00001111,
0b11110000,
0b00001111,
];
let mut cursor = BitCursor::new(data);
assert_eq!((5, 0), cursor.seek(BitSeekFrom::End(0, 0)).unwrap());
assert!(bool::bit_read(&mut cursor).is_err());
assert_eq!((3, 6), cursor.seek(BitSeekFrom::End(-1, -2)).unwrap());
assert_eq!(u4::new(0b0000), cursor.bit_read::<u4>().unwrap());
assert_eq!((2, 6), cursor.seek(BitSeekFrom::End(-1, -10)).unwrap());
assert_eq!(u4::new(0b1111), cursor.bit_read::<u4>().unwrap());
assert!(cursor.seek(BitSeekFrom::End(-6, 0)).is_err());
}
}