bitfields: Lift 32-bit range limit

knurling-rs · Dec 20, 2020 · 2c3b878 · 2c3b878
1 parent 424fff8
commit 2c3b878
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/decoder/src/lib.rs b/decoder/src/lib.rs
@@ -1604,6 +1604,29 @@ mod tests {
         );
     }
 
+    #[test]
+    fn bitfields_u128() {
+        let bytes = [
+            0, // index
+            2, // timestamp
+            0b1111_0000,
+            0b1110_0101, // u16
+            0b1111_0000,
+            0b1110_0101, // u16
+            0b1111_0000,
+            0b1110_0101, // u16
+            0b1111_0000,
+            0b1110_0101, // u16
+            0b1111_0000,
+            0b1110_0101, // u16
+            0b1111_0000,
+            0b1110_0101, // u16
+            0b1111_0000,
+            0b1110_0101, // u16
+        ];
+        decode_and_expect("x: {0=119..124:b}", &bytes, "0.000002 INFO x: 0b1011");
+    }
+
     #[test]
     fn slice() {
         let bytes = [

diff --git a/parser/src/lib.rs b/parser/src/lib.rs
@@ -127,7 +127,7 @@ fn parse_range(mut s: &str) -> Option<(Range<u8>, usize /* consumed */)> {
         return None;
     }
 
-    if start >= 32 || end >= 32 {
+    if start >= 128 || end >= 128 {
         return None;
     }
 
@@ -886,10 +886,10 @@ mod tests {
         assert!(parse("{=0..0}", ParserMode::Strict).is_err());
         // start > end
         assert!(parse("{=1..0}", ParserMode::Strict).is_err());
-        // out of 32-bit range
-        assert!(parse("{=0..32}", ParserMode::Strict).is_err());
-        // just inside 32-bit range
-        assert!(parse("{=0..31}", ParserMode::Strict).is_ok());
+        // out of 128-bit range
+        assert!(parse("{=0..128}", ParserMode::Strict).is_err());
+        // just inside 128-bit range
+        assert!(parse("{=0..127}", ParserMode::Strict).is_ok());
 
         // missing parts
         assert!(parse("{=0..4", ParserMode::Strict).is_err());