Index: uspace/dist/src/bithenge/basic.bh =================================================================== --- uspace/dist/src/bithenge/basic.bh (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/basic.bh (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,11 @@ +transform main = struct { + .u8 <- uint8; + .u16le <- uint16le; + .u16be <- uint16be; + .u32le <- uint32le; + .u32be <- uint32be; + .u64le <- uint64le; + .u64be <- uint64be; + .empty_blob <- known_length(0); + .ascii <- ascii <- known_length(8); +}; Index: uspace/dist/src/bithenge/basic.dat =================================================================== --- uspace/dist/src/bithenge/basic.dat (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/basic.dat (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,2 @@ +ªðð!Ce‡‡eC!þܺ˜vT22Tv˜ºÜþ0~ +\"'  Index: uspace/dist/src/bithenge/basic.out =================================================================== --- uspace/dist/src/bithenge/basic.out (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/basic.out (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,11 @@ +{ + "u8": 170, + "u16le": 4080, + "u16be": 4080, + "u32le": 2271560481, + "u32be": 2271560481, + "u64le": 1167088121787636990, + "u64be": 1167088121787636990, + "empty_blob": b"", + "ascii": "0~\u000a\\\"'\u0009\u001b" +} Index: uspace/dist/src/bithenge/bits.bh =================================================================== --- uspace/dist/src/bithenge/bits.bh (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/bits.bh (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,25 @@ +transform main = struct { + .bits_le <- repeat(8) { bit } <- bits_le <- known_length(1); + .bits_be <- repeat(8) { bit } <- bits_be <- known_length(1); + <- struct { + .le0 <- uint_le(0); + .le1 <- uint_le(1); + .le2 <- uint_le(2); + .le3 <- uint_le(3); + .le4 <- uint_le(4); + .le5 <- uint_le(5); + .le6 <- uint_le(6); + .le7 <- uint_le(7); + .le8 <- uint_le(8); + + .be8 <- uint_be(8); + .be7 <- uint_be(7); + .be6 <- uint_be(6); + .be5 <- uint_be(5); + .be4 <- uint_be(4); + .be3 <- uint_be(3); + .be2 <- uint_be(2); + .be1 <- uint_be(1); + .be0 <- uint_be(0); + } <- bits_be <- known_length(9); +}; Index: uspace/dist/src/bithenge/bits.dat =================================================================== --- uspace/dist/src/bithenge/bits.dat (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/bits.dat (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,1 @@ +ee¤BB% Index: uspace/dist/src/bithenge/bits.out =================================================================== --- uspace/dist/src/bithenge/bits.out (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/bits.out (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,40 @@ +{ + "bits_le": { + 0: True, + 1: False, + 2: True, + 3: False, + 4: False, + 5: True, + 6: True, + 7: False + }, + "bits_be": { + 0: False, + 1: True, + 2: True, + 3: False, + 4: False, + 5: True, + 6: False, + 7: True + }, + "le0": 0, + "le1": 1, + "le2": 2, + "le3": 4, + "le4": 8, + "le5": 16, + "le6": 32, + "le7": 64, + "le8": 128, + "be8": 128, + "be7": 64, + "be6": 32, + "be5": 16, + "be4": 8, + "be3": 4, + "be2": 2, + "be1": 1, + "be0": 0 +} Index: uspace/dist/src/bithenge/cond.bh =================================================================== --- uspace/dist/src/bithenge/cond.bh (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/cond.bh (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,36 @@ +transform pascal_string = struct { + <- struct { # An inner struct for testing purposes + .len <- uint8; + }; + .string <- ascii <- known_length(.len); +}; + +transform u32(little_endian) = + if (little_endian) { + uint32le + } else { + uint32be + }; + +transform item(little_endian, len) = struct { + .type <- (3 * in + 1) <- u32(little_endian); + .name <- pascal_string; + switch (.type) { + 10: { + .val <- u32(little_endian); + }; + 11: { + .text <- ascii <- known_length(len); + }; + else: { + .unknown <- known_length(len); + }; + } +}; + +transform main() = struct { + .first_len <- (3); + .second_len <- (6 - 2); + .first_item <- item(true, .first_len); + .second_item <- item(false, .second_len); +}; Index: uspace/dist/src/bithenge/cond.out =================================================================== --- uspace/dist/src/bithenge/cond.out (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/cond.out (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,20 @@ +{ + "first_len": 3, + "second_len": 4, + "first_item": { + "type": 52, + "name": { + "len": 6, + "string": "Item 1" + }, + "unknown": b"\xcf\x80\x78" + }, + "second_item": { + "type": 10, + "name": { + "len": 6, + "string": "Item 2" + }, + "val": 12345 + } +} Index: uspace/dist/src/bithenge/expression.bh =================================================================== --- uspace/dist/src/bithenge/expression.bh (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/expression.bh (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,54 @@ +transform compare_ints(a, b) = struct { + .l <- (a < b); + .g <- (a > b); + .ge <- (a >= b); + .le <- (a <= b); + .eq <- (a == b); + .ne <- (a != b); +}; + +transform arithmetic(a, b) = struct { + .sum <- (a + b); + .difference <- (a - b); + .product <- (a * b); + if (b > 0) { + .quotient <- (a // b); + .remainder <- (a % b); + } +}; + +transform concat_bits(a, b) = uint_le(24) <- (in.concat_bits) <- struct { + .bits0 <- bits_le <- (a); + .bits1 <- bits_be <- (b); + .concat_bits <- (.bits0 ++ (.bits1 ++ .bits0)); +}; + +transform equality(bytes0, bytes1, str0, str1) = struct { + .neqs <- ((0 != 1) != (2 != 3)); + .bytes0_eq_bytes1 <- (bytes0 == bytes1); + .bytes0_ne_bytes0 <- (bytes0 != bytes0); + .str0_ne_str1 <- (str0 != str1); + .str1_eq_str1 <- (str1 == str1); + .bytes1_eq_1 <- (bytes1 == 1); +}; + +transform subblob(bytes0) = struct { + .subblob <- (bytes0[0:][0,1][0:1]); +}; + +transform main = struct { + .bytes0 <- known_length(1); + .bytes1 <- known_length(1); + .str0 <- ascii <- (.bytes0); + .str1 <- ascii <- (.bytes1); + .compare_ints_0_1 <- compare_ints(0, 1); + .compare_ints_0_0 <- compare_ints(0, 0); + .compare_ints_1_0 <- compare_ints(1, 0); + .arithmetic_0_1 <- arithmetic(0, 1); + .arithmetic_17_n3 <- arithmetic(17, 0 - 3); + .arithmetic_n17_3 <- arithmetic(0 - 17, 3); + .concat_bytes <- (.bytes0 ++ (.bytes1 ++ .bytes0)); + .concat_bits <- concat_bits(.bytes0, .bytes1); + .equality <- equality(.bytes0, .bytes1, .str0, .str1); + .subblob <- subblob(.bytes0); +}; Index: uspace/dist/src/bithenge/expression.dat =================================================================== --- uspace/dist/src/bithenge/expression.dat (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/expression.dat (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,1 @@ +17 Index: uspace/dist/src/bithenge/expression.out =================================================================== --- uspace/dist/src/bithenge/expression.out (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/expression.out (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,62 @@ +{ + "bytes0": b"\x31", + "bytes1": b"\x37", + "str0": "1", + "str1": "7", + "compare_ints_0_1": { + "l": True, + "g": False, + "ge": False, + "le": True, + "eq": False, + "ne": True + }, + "compare_ints_0_0": { + "l": False, + "g": False, + "ge": True, + "le": True, + "eq": True, + "ne": False + }, + "compare_ints_1_0": { + "l": False, + "g": True, + "ge": True, + "le": False, + "eq": False, + "ne": True + }, + "arithmetic_0_1": { + "sum": 1, + "difference": -1, + "product": 0, + "quotient": 0, + "remainder": 0 + }, + "arithmetic_17_n3": { + "sum": 14, + "difference": 20, + "product": -51 + }, + "arithmetic_n17_3": { + "sum": -14, + "difference": -20, + "product": -51, + "quotient": -6, + "remainder": 1 + }, + "concat_bytes": b"\x31\x37\x31", + "concat_bits": 3271729, + "equality": { + "neqs": False, + "bytes0_eq_bytes1": False, + "bytes0_ne_bytes0": False, + "str0_ne_str1": True, + "str1_eq_str1": True, + "bytes1_eq_1": False + }, + "subblob": { + "subblob": b"\x31" + } +} Index: uspace/dist/src/bithenge/fat.bh =================================================================== --- uspace/dist/src/bithenge/fat.bh (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ uspace/dist/src/bithenge/fat.bh (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -76,5 +76,5 @@ .size_shown <- if (.size > 32) { (32) } else { (.size) }; - if (.start != 0 && .start != self_start && .start != parent) { + if (.start != 0 && .start != self_start && .start != parent && .filename[0] != 229) { .data <- if (.attrs.subdirectory) { Index: uspace/dist/src/bithenge/fat.out =================================================================== --- uspace/dist/src/bithenge/fat.out (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/fat.out (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,908 @@ +{ + "super": { + "jump_instruction": b"\xeb\x3c\x90", + "oem_name": "mkdosfs", + "bytes_per_sector": 512, + "sectors_per_cluster": 1, + "num_reserved_sectors": 1, + "num_fats": 1, + "num_root_entries": 16, + "num_sectors_16": 66, + "media_descriptor": 248, + "sectors_per_fat": 1, + "sectors_per_track": 32, + "num_heads": 64, + "bpb331": { + "ignore": True, + "num_hidden_sectors": 0, + "num_sectors_32": 0 + }, + "drive_number": 0, + "chkdsk_flags": 0, + "extended_boot_signature": 41, + "volume_id": 1045880152, + "volume_label": "Test ", + "type": "FAT12 ", + "boot_signature": b"\x55\xaa" + }, + "num_sectors": 66, + "cluster_size": 512, + "first_root_sector": 2, + "first_data_sector": 3, + "num_clusters": 65, + "bits": 12, + "fats": { + 0: { + 0: 4088, + 1: 4095, + 2: 0, + 3: 4095, + 4: 0, + 5: 0, + 6: 0, + 7: 0, + 8: 0, + 9: 0, + 10: 0, + 11: 0, + 12: 0, + 13: 0, + 14: 0, + 15: 0, + 16: 0, + 17: 0, + 18: 0, + 19: 0, + 20: 0, + 21: 0, + 22: 0, + 23: 0, + 24: 0, + 25: 0, + 26: 0, + 27: 0, + 28: 0, + 29: 0, + 30: 0, + 31: 0, + 32: 0, + 33: 0, + 34: 0, + 35: 0, + 36: 0, + 37: 38, + 38: 4095, + 39: 0, + 40: 0, + 41: 0, + 42: 0, + 43: 0, + 44: 0, + 45: 0, + 46: 0, + 47: 0, + 48: 0, + 49: 0, + 50: 0, + 51: 0, + 52: 0, + 53: 0, + 54: 0, + 55: 0, + 56: 0, + 57: 0, + 58: 0, + 59: 0, + 60: 0, + 61: 0, + 62: 0, + 63: 0, + 64: 0 + } + }, + "root": { + 0: { + "filename": b"\x54\x65\x73\x74\x20\x20\x20\x20", + "extension": b"\x20\x20\x20", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": True, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 35030, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 35030, + "mdate": 16658, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 1: { + "filename": b"\x41\x73\x00\x75\x00\x62\x00\x64", + "extension": b"\x00\x69\x00", + "attrs": { + "read_only": True, + "hidden": True, + "system": True, + "volume_label": True, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 173, + "ctime": 114, + "cdate": 0, + "adate": 65535, + "permissions": 65535, + "mtime": 65535, + "mdate": 65535, + "start": 0, + "size": 4294967295, + "size_shown": 32 + }, + 2: { + "filename": b"\x53\x55\x42\x44\x49\x52\x20\x20", + "extension": b"\x20\x20\x20", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": True, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 100, + "ctime": 43267, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 43290, + "mdate": 16658, + "start": 3, + "size": 0, + "size_shown": 0, + "data": { + 0: { + "filename": b"\x2e\x20\x20\x20\x20\x20\x20\x20", + "extension": b"\x20\x20\x20", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": True, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 100, + "ctime": 43236, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 43236, + "mdate": 16658, + "start": 3, + "size": 0, + "size_shown": 0 + }, + 1: { + "filename": b"\x2e\x2e\x20\x20\x20\x20\x20\x20", + "extension": b"\x20\x20\x20", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": True, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 100, + "ctime": 43236, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 43236, + "mdate": 16658, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 2: { + "filename": b"\xe5\x2e\x00\x66\x00\x69\x00\x6c", + "extension": b"\x00\x65\x00", + "attrs": { + "read_only": True, + "hidden": True, + "system": True, + "volume_label": True, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 103, + "ctime": 46, + "cdate": 116, + "adate": 120, + "permissions": 116, + "mtime": 46, + "mdate": 115, + "start": 0, + "size": 7340151, + "size_shown": 32 + }, + 3: { + "filename": b"\xe5\x49\x4c\x45\x54\x58\x7e\x31", + "extension": b"\x53\x57\x50", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": True, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 43287, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 43287, + "mdate": 16658, + "start": 13, + "size": 12288, + "size_shown": 32 + }, + 4: { + "filename": b"\x41\x66\x00\x69\x00\x6c\x00\x65", + "extension": b"\x00\x2e\x00", + "attrs": { + "read_only": True, + "hidden": True, + "system": True, + "volume_label": True, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 25, + "ctime": 116, + "cdate": 120, + "adate": 116, + "permissions": 0, + "mtime": 65535, + "mdate": 65535, + "start": 0, + "size": 4294967295, + "size_shown": 32 + }, + 5: { + "filename": b"\x46\x49\x4c\x45\x20\x20\x20\x20", + "extension": b"\x54\x58\x54", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": True, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 43290, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 43290, + "mdate": 16658, + "start": 37, + "size": 951, + "size_shown": 32, + "data": b"\x22\x4a\x61\x62\x62\x65\x72\x77\x6f\x63\x6b\x79\x22\x0a\x0a\x27\x54\x77\x61\x73\x20\x62\x72\x69\x6c\x6c\x69\x67\x2c\x20\x61\x6e" + }, + 6: { + "filename": b"\xe5\x2e\x00\x66\x00\x69\x00\x6c", + "extension": b"\x00\x65\x00", + "attrs": { + "read_only": True, + "hidden": True, + "system": True, + "volume_label": True, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 111, + "ctime": 46, + "cdate": 116, + "adate": 120, + "permissions": 116, + "mtime": 46, + "mdate": 115, + "start": 0, + "size": 7864439, + "size_shown": 32 + }, + 7: { + "filename": b"\xe5\x49\x4c\x45\x54\x58\x7e\x31", + "extension": b"\x53\x57\x58", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": True, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 100, + "ctime": 43267, + "cdate": 16658, + "adate": 16658, + "permissions": 0, + "mtime": 43267, + "mdate": 16658, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 8: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 9: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 10: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 11: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 12: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 13: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 14: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 15: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + } + } + }, + 3: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 4: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 5: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 6: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 7: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 8: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 9: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 10: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 11: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 12: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 13: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 14: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + }, + 15: { + "filename": b"\x00\x00\x00\x00\x00\x00\x00\x00", + "extension": b"\x00\x00\x00", + "attrs": { + "read_only": False, + "hidden": False, + "system": False, + "volume_label": False, + "subdirectory": False, + "archive": False, + "device": False, + "reserved": False + }, + "flags": 0, + "ctime_fine": 0, + "ctime": 0, + "cdate": 0, + "adate": 0, + "permissions": 0, + "mtime": 0, + "mdate": 0, + "start": 0, + "size": 0, + "size_shown": 0 + } + } +} Index: uspace/dist/src/bithenge/repeat.bh =================================================================== --- uspace/dist/src/bithenge/repeat.bh (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/repeat.bh (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,27 @@ +transform with_count = struct { + .none <- repeat(0) { uint8 }; + .one <- repeat(1) { uint8 }; + .count <- uint8; + if (true) { # test whether .count is still accessible + .many <- repeat(.count) { uint8 }; + } +}; + +transform without_count = struct { + .until_error <- repeat { uint8 <- zero_terminated }; + .until_end <- repeat { uint8 }; +}; + +transform do_while = do { + struct { + .valid <- nonzero_boolean <- uint8; + .val <- uint8; + } +} while (.valid); + +transform main = struct { + .with_count <- with_count; + .without_count <- without_count <- known_length(9); + .do_while <- do_while; + .do_while_item <- (.do_while[1]); +}; Index: uspace/dist/src/bithenge/repeat.out =================================================================== --- uspace/dist/src/bithenge/repeat.out (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) +++ uspace/dist/src/bithenge/repeat.out (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -0,0 +1,48 @@ +{ + "with_count": { + "none": {}, + "one": { + 0: 127 + }, + "count": 7, + "many": { + 0: 2, + 1: 3, + 2: 5, + 3: 7, + 4: 11, + 5: 13, + 6: 17 + } + }, + "without_count": { + "until_error": { + 0: 2, + 1: 4, + 2: 8 + }, + "until_end": { + 0: 16, + 1: 32, + 2: 64 + } + }, + "do_while": { + 0: { + "valid": True, + "val": 1 + }, + 1: { + "valid": True, + "val": 4 + }, + 2: { + "valid": False, + "val": 9 + } + }, + "do_while_item": { + "valid": True, + "val": 4 + } +} Index: pace/dist/src/bithenge/test-bits.bh =================================================================== --- uspace/dist/src/bithenge/test-bits.bh (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ (revision ) @@ -1,25 +1,0 @@ -transform main = struct { - .bits_le <- repeat(8) { bit } <- bits_le <- known_length(1); - .bits_be <- repeat(8) { bit } <- bits_be <- known_length(1); - <- struct { - .le0 <- uint_le(0); - .le1 <- uint_le(1); - .le2 <- uint_le(2); - .le3 <- uint_le(3); - .le4 <- uint_le(4); - .le5 <- uint_le(5); - .le6 <- uint_le(6); - .le7 <- uint_le(7); - .le8 <- uint_le(8); - - .be8 <- uint_be(8); - .be7 <- uint_be(7); - .be6 <- uint_be(6); - .be5 <- uint_be(5); - .be4 <- uint_be(4); - .be3 <- uint_be(3); - .be2 <- uint_be(2); - .be1 <- uint_be(1); - .be0 <- uint_be(0); - } <- bits_be <- known_length(9); -}; Index: pace/dist/src/bithenge/test-bits.dat =================================================================== --- uspace/dist/src/bithenge/test-bits.dat (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ (revision ) @@ -1,1 +1,0 @@ -ee¤BB% Index: pace/dist/src/bithenge/test-bits.out =================================================================== --- uspace/dist/src/bithenge/test-bits.out (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ (revision ) @@ -1,40 +1,0 @@ -{ - "bits_le": { - 0: True, - 1: False, - 2: True, - 3: False, - 4: False, - 5: True, - 6: True, - 7: False - }, - "bits_be": { - 0: False, - 1: True, - 2: True, - 3: False, - 4: False, - 5: True, - 6: False, - 7: True - }, - "le0": 0, - "le1": 1, - "le2": 2, - "le3": 4, - "le4": 8, - "le5": 16, - "le6": 32, - "le7": 64, - "le8": 128, - "be8": 128, - "be7": 64, - "be6": 32, - "be5": 16, - "be4": 8, - "be3": 4, - "be2": 2, - "be1": 1, - "be0": 0 -} Index: pace/dist/src/bithenge/test-repeat.bh =================================================================== --- uspace/dist/src/bithenge/test-repeat.bh (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ (revision ) @@ -1,26 +1,0 @@ -transform with_count = struct { - .none <- repeat(0) { uint8 }; - .one <- repeat(1) { uint8 }; - .count <- uint8; - if (true) { # test whether .count is still accessible - .many <- repeat(.count) { uint8 }; - } -}; - -transform without_count = struct { - .until_error <- repeat { uint8 <- zero_terminated }; - .until_end <- repeat { uint8 }; -}; - -transform do_while = do { - struct { - .valid <- nonzero_boolean <- uint8; - .val <- uint8; - } -} while (.valid); - -transform main = struct { - .with_count <- with_count; - .without_count <- without_count <- known_length(9); - .do_while <- do_while; -}; Index: pace/dist/src/bithenge/test-repeat.out =================================================================== --- uspace/dist/src/bithenge/test-repeat.out (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ (revision ) @@ -1,44 +1,0 @@ -{ - "with_count": { - "none": {}, - "one": { - 0: 127 - }, - "count": 7, - "many": { - 0: 2, - 1: 3, - 2: 5, - 3: 7, - 4: 11, - 5: 13, - 6: 17 - } - }, - "without_count": { - "until_error": { - 0: 2, - 1: 4, - 2: 8 - }, - "until_end": { - 0: 16, - 1: 32, - 2: 64 - } - }, - "do_while": { - 0: { - "valid": True, - "val": 1 - }, - 1: { - "valid": True, - "val": 4 - }, - 2: { - "valid": False, - "val": 9 - } - } -} Index: pace/dist/src/bithenge/test.bh =================================================================== --- uspace/dist/src/bithenge/test.bh (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ (revision ) @@ -1,36 +1,0 @@ -transform pascal_string = struct { - <- struct { # An inner struct for testing purposes - .len <- uint8; - }; - .string <- ascii <- known_length(.len); -}; - -transform u32(little_endian) = - if (little_endian) { - uint32le - } else { - uint32be - }; - -transform item(little_endian, len) = struct { - .type <- (3 * in + 1) <- u32(little_endian); - .name <- pascal_string; - switch (.type) { - 10: { - .val <- u32(little_endian); - }; - 11: { - .text <- ascii <- known_length(len); - }; - else: { - .unknown <- known_length(len); - }; - } -}; - -transform main() = struct { - .first_len <- (3); - .second_len <- (6 - 2); - .first_item <- item(true, .first_len); - .second_item <- item(false, .second_len); -}; Index: pace/dist/src/bithenge/test.out =================================================================== --- uspace/dist/src/bithenge/test.out (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ (revision ) @@ -1,20 +1,0 @@ -{ - "first_len": 3, - "second_len": 4, - "first_item": { - "type": 52, - "name": { - "len": 6, - "string": "Item 1" - }, - "unknown": b"\xcf\x80\x78" - }, - "second_item": { - "type": 10, - "name": { - "len": 6, - "string": "Item 2" - }, - "val": 12345 - } -} Index: uspace/dist/src/bithenge/test.sh =================================================================== --- uspace/dist/src/bithenge/test.sh (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ uspace/dist/src/bithenge/test.sh (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -12,4 +12,9 @@ fi +test_file() { + echo "Testing $1 on $2..." + ${BITHENGE} $1 $2 2>&1|diff $3 - +} + for BH in *.bh do @@ -19,8 +24,10 @@ [ -e ${DAT} ] || continue [ -e ${OUT} ] || continue - echo "Testing ${BH} on ${DAT}..." - ${BITHENGE} ${BH} ${DAT} 2>&1|diff ${OUT} - + test_file ${BH} ${DAT} ${OUT} done done +test_file trip.bh file:trip.dat trip.out +test_file repeat.bh hex:7f07020305070b0D11020004000800102040010101040009 repeat.out + echo "Done!" Index: uspace/lib/bithenge/expression.c =================================================================== --- uspace/lib/bithenge/expression.c (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ uspace/lib/bithenge/expression.c (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -1066,8 +1066,9 @@ if (rc != EOK) return rc; - b_size = offset + *size - self->a_size; + b_size = *size - a_size; + assert(a_size % 8 == 0); /* TODO: don't require this */ rc = bithenge_blob_read_bits(self->b, - offset + a_size - self->a_size, buffer + a_size, &b_size, - little_endian); + offset + a_size - self->a_size, buffer + a_size / 8, + &b_size, little_endian); if (rc != EOK) return rc; Index: uspace/lib/bithenge/sequence.c =================================================================== --- uspace/lib/bithenge/sequence.c (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ uspace/lib/bithenge/sequence.c (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -915,5 +915,4 @@ typedef struct { seq_node_t base; - bool prefix; bithenge_expression_t *expr; bithenge_transform_t *xform; @@ -995,13 +994,4 @@ } - if (!self->prefix) { - bool complete; - rc = seq_node_complete(do_while_as_seq(self), &complete); - if (rc != EOK) - return rc; - if (!complete) - return EINVAL; - } - return rc; } @@ -1035,6 +1025,5 @@ static int do_while_transform_make_node(do_while_transform_t *self, - bithenge_node_t **out, bithenge_scope_t *scope, bithenge_blob_t *blob, - bool prefix) + bithenge_node_t **out, bithenge_scope_t *scope, bithenge_blob_t *blob) { do_while_node_t *node = malloc(sizeof(*node)); @@ -1060,18 +1049,7 @@ bithenge_expression_inc_ref(self->expr); node->expr = self->expr; - node->prefix = prefix; node->count = -1; *out = do_while_as_node(node); return EOK; -} - -static int do_while_transform_apply(bithenge_transform_t *base, - bithenge_scope_t *scope, bithenge_node_t *in, bithenge_node_t **out) -{ - do_while_transform_t *self = transform_as_do_while(base); - if (bithenge_node_type(in) != BITHENGE_NODE_BLOB) - return EINVAL; - return do_while_transform_make_node(self, out, scope, - bithenge_node_as_blob(in), false); } @@ -1089,6 +1067,5 @@ { do_while_transform_t *self = transform_as_do_while(base); - int rc = do_while_transform_make_node(self, out_node, scope, blob, - true); + int rc = do_while_transform_make_node(self, out_node, scope, blob); if (rc != EOK) return rc; @@ -1121,5 +1098,4 @@ static const bithenge_transform_ops_t do_while_transform_ops = { - .apply = do_while_transform_apply, .prefix_apply = do_while_transform_prefix_apply, .destroy = do_while_transform_destroy, Index: uspace/lib/bithenge/transform.c =================================================================== --- uspace/lib/bithenge/transform.c (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ uspace/lib/bithenge/transform.c (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -892,6 +892,6 @@ MAKE_UINT_TRANSFORM(uint32le, uint32_t, uint32_t_le2host, prefix_length_4); MAKE_UINT_TRANSFORM(uint32be, uint32_t, uint32_t_be2host, prefix_length_4); -MAKE_UINT_TRANSFORM(uint64le, uint64_t, uint32_t_le2host, prefix_length_8); -MAKE_UINT_TRANSFORM(uint64be, uint64_t, uint32_t_be2host, prefix_length_8); +MAKE_UINT_TRANSFORM(uint64le, uint64_t, uint64_t_le2host, prefix_length_8); +MAKE_UINT_TRANSFORM(uint64be, uint64_t, uint64_t_be2host, prefix_length_8); Index: uspace/lib/bithenge/tree.c =================================================================== --- uspace/lib/bithenge/tree.c (revision 1f9c9a457f0580a6445d1e795d6b219e18973861) +++ uspace/lib/bithenge/tree.c (revision 1c79996e4cd922c6012ceb0b80e17b06cc0ed5e5) @@ -102,7 +102,8 @@ /** Get a child of a node. Takes ownership of the key. If the node does not * provide this function, for_each will be used as an alternative, which may be - * very slow. - * @memberof bithenge_node_t - * @param self The internal node to find a child of. + * very slow. Also works for blob nodes to find the byte value at a given + * index. + * @memberof bithenge_node_t + * @param self The internal/blob node to find a child of. * @param key The key to search for. * @param[out] out Holds the found node. @@ -112,4 +113,23 @@ bithenge_node_t **out) { + if (self->type == BITHENGE_NODE_BLOB) { + if (bithenge_node_type(key) != BITHENGE_NODE_INTEGER) { + bithenge_node_dec_ref(key); + return ENOENT; + } + bithenge_int_t offset = bithenge_integer_node_value(key); + bithenge_node_dec_ref(key); + uint8_t byte; + aoff64_t size = 1; + int rc = bithenge_blob_read(bithenge_node_as_blob(self), + offset, (char *)&byte, &size); + if (rc != EOK) + return rc; + if (size != 1) + return ENOENT; + + return bithenge_new_integer_node(out, byte); + } + assert(self->type == BITHENGE_NODE_INTERNAL); if (self->internal_ops->get)