Skip to content

Commit d384930

Browse files
mrcookmrcook
committed
tap: revert using an array of bytes
1 parent fc350f3 commit d384930

File tree

2 files changed

+5
-47
lines changed

2 files changed

+5
-47
lines changed

‎format/tap/tap.go‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ func decodeTapBlock(d *decode.D) {
5858
d.Fatalf("TAP fragments with 0 bytes are not supported")
5959
case 1:
6060
d.FieldStruct("data", func(d *decode.D) {
61-
d.FieldArray("bytes", func(d *decode.D) {
62-
d.FieldU8("byte")
63-
})
61+
d.FieldRawLen("bytes", 8)
6462
})
6563
case 19:
6664
d.FieldStruct("header", func(d *decode.D) {
@@ -167,11 +165,7 @@ func decodeDataBlock(d *decode.D, length uint64) {
167165
return s, nil
168166
}))
169167
// The essential data: length minus the flag/checksum bytes (may be empty)
170-
d.FieldArray("bytes", func(d *decode.D) {
171-
for i := uint64(0); i < length-2; i++ {
172-
d.FieldU8("byte")
173-
}
174-
})
168+
d.FieldRawLen("bytes", int64(length-2)*8)
175169

176170
// Simply all bytes (including flag byte) XORed
177171
d.FieldU8("checksum", d.UintValidate(calculateChecksum(d, blockStartPosition, d.Pos()-blockStartPosition)), scalar.UintHex)

‎format/tap/testdata/basic_prog1.fqtest‎

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15,43 +15,7 @@ $ fq -d tap dv basic_prog1.tap
1515
0x10| 28 00 | (. | length: 40 0x15-0x17 (2)
1616
| | | data{}: 0x17-0x3f (40)
1717
0x10| ff | . | flag: "standard_speed_data" (255) 0x17-0x18 (1)
18-
| | | bytes[0:38]: 0x18-0x3e (38)
19-
0x10| 00 | . | [0]: 0 byte 0x18-0x19 (1)
20-
0x10| 0a | . | [1]: 10 byte 0x19-0x1a (1)
21-
0x10| 14 | . | [2]: 20 byte 0x1a-0x1b (1)
22-
0x10| 00 | . | [3]: 0 byte 0x1b-0x1c (1)
23-
0x10| 20 | | [4]: 32 byte 0x1c-0x1d (1)
24-
0x10| f5 | . | [5]: 245 byte 0x1d-0x1e (1)
25-
0x10| 22 | " | [6]: 34 byte 0x1e-0x1f (1)
26-
0x10| 66| f| [7]: 102 byte 0x1f-0x20 (1)
27-
0x20|71 |q | [8]: 113 byte 0x20-0x21 (1)
28-
0x20| 20 | | [9]: 32 byte 0x21-0x22 (1)
29-
0x20| 69 | i | [10]: 105 byte 0x22-0x23 (1)
30-
0x20| 73 | s | [11]: 115 byte 0x23-0x24 (1)
31-
0x20| 20 | | [12]: 32 byte 0x24-0x25 (1)
32-
0x20| 74 | t | [13]: 116 byte 0x25-0x26 (1)
33-
0x20| 68 | h | [14]: 104 byte 0x26-0x27 (1)
34-
0x20| 65 | e | [15]: 101 byte 0x27-0x28 (1)
35-
0x20| 20 | | [16]: 32 byte 0x28-0x29 (1)
36-
0x20| 62 | b | [17]: 98 byte 0x29-0x2a (1)
37-
0x20| 65 | e | [18]: 101 byte 0x2a-0x2b (1)
38-
0x20| 73 | s | [19]: 115 byte 0x2b-0x2c (1)
39-
0x20| 74 | t | [20]: 116 byte 0x2c-0x2d (1)
40-
0x20| 21 | ! | [21]: 33 byte 0x2d-0x2e (1)
41-
0x20| 22 | " | [22]: 34 byte 0x2e-0x2f (1)
42-
0x20| 0d| .| [23]: 13 byte 0x2f-0x30 (1)
43-
0x30|00 |. | [24]: 0 byte 0x30-0x31 (1)
44-
0x30| 14 | . | [25]: 20 byte 0x31-0x32 (1)
45-
0x30| 0a | . | [26]: 10 byte 0x32-0x33 (1)
46-
0x30| 00 | . | [27]: 0 byte 0x33-0x34 (1)
47-
0x30| ec | . | [28]: 236 byte 0x34-0x35 (1)
48-
0x30| 31 | 1 | [29]: 49 byte 0x35-0x36 (1)
49-
0x30| 30 | 0 | [30]: 48 byte 0x36-0x37 (1)
50-
0x30| 0e | . | [31]: 14 byte 0x37-0x38 (1)
51-
0x30| 00 | . | [32]: 0 byte 0x38-0x39 (1)
52-
0x30| 00 | . | [33]: 0 byte 0x39-0x3a (1)
53-
0x30| 0a | . | [34]: 10 byte 0x3a-0x3b (1)
54-
0x30| 00 | . | [35]: 0 byte 0x3b-0x3c (1)
55-
0x30| 00 | . | [36]: 0 byte 0x3c-0x3d (1)
56-
0x30| 0d | . | [37]: 13 byte 0x3d-0x3e (1)
18+
0x10| 00 0a 14 00 20 f5 22 66| .... ."f| bytes: raw bits 0x18-0x3e (38)
19+
0x20|71 20 69 73 20 74 68 65 20 62 65 73 74 21 22 0d|q is the best!".|
20+
0x30|00 14 0a 00 ec 31 30 0e 00 00 0a 00 00 0d |.....10....... |
5721
0x30| b6| | .|| checksum: 0xb6 (valid) 0x3e-0x3f (1)

0 commit comments

Comments
 (0)