authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-08-27 19:51:12-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-08-29 11:11:59-07:00
log558bea2a76179fcc00779fdd326e5a866956fc9b
tree6070f8eb4c330ed37ef566a1e3085bbb0326e10f
parent4b948e8556b80cbc874415aa7c4bf9ac0027ffed

std.Io: delete CountingReader

7 files changed, 77 insertions(+), 174 deletions(-)

lib/std/Build/Step/CheckObject.zig+16-42
......@@ -1224,14 +1224,12 @@ const MachODumper = struct {
12241224 }
12251225
12261226 fn parseRebaseInfo(ctx: ObjectContext, data: []const u8, rebases: *std.array_list.Managed(u64)) !void {
1227 var stream = std.io.fixedBufferStream(data);
1228 var creader = std.io.countingReader(stream.reader());
1229 const reader = creader.reader();
1227 var reader: std.Io.Reader = .fixed(data);
12301228
12311229 var seg_id: ?u8 = null;
12321230 var offset: u64 = 0;
12331231 while (true) {
1234 const byte = reader.readByte() catch break;
1232 const byte = reader.takeByte() catch break;
12351233 const opc = byte & macho.REBASE_OPCODE_MASK;
12361234 const imm = byte & macho.REBASE_IMMEDIATE_MASK;
12371235 switch (opc) {
......@@ -1239,17 +1237,17 @@ const MachODumper = struct {
12391237 macho.REBASE_OPCODE_SET_TYPE_IMM => {},
12401238 macho.REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB => {
12411239 seg_id = imm;
1242 offset = try std.leb.readUleb128(u64, reader);
1240 offset = try reader.takeLeb128(u64);
12431241 },
12441242 macho.REBASE_OPCODE_ADD_ADDR_IMM_SCALED => {
12451243 offset += imm * @sizeOf(u64);
12461244 },
12471245 macho.REBASE_OPCODE_ADD_ADDR_ULEB => {
1248 const addend = try std.leb.readUleb128(u64, reader);
1246 const addend = try reader.takeLeb128(u64);
12491247 offset += addend;
12501248 },
12511249 macho.REBASE_OPCODE_DO_REBASE_ADD_ADDR_ULEB => {
1252 const addend = try std.leb.readUleb128(u64, reader);
1250 const addend = try reader.takeLeb128(u64);
12531251 const seg = ctx.segments.items[seg_id.?];
12541252 const addr = seg.vmaddr + offset;
12551253 try rebases.append(addr);
......@@ -1266,11 +1264,11 @@ const MachODumper = struct {
12661264 ntimes = imm;
12671265 },
12681266 macho.REBASE_OPCODE_DO_REBASE_ULEB_TIMES => {
1269 ntimes = try std.leb.readUleb128(u64, reader);
1267 ntimes = try reader.takeLeb128(u64);
12701268 },
12711269 macho.REBASE_OPCODE_DO_REBASE_ULEB_TIMES_SKIPPING_ULEB => {
1272 ntimes = try std.leb.readUleb128(u64, reader);
1273 skip = try std.leb.readUleb128(u64, reader);
1270 ntimes = try reader.takeLeb128(u64);
1271 skip = try reader.takeLeb128(u64);
12741272 },
12751273 else => unreachable,
12761274 }
......@@ -1431,7 +1429,7 @@ const MachODumper = struct {
14311429 defer arena.deinit();
14321430
14331431 var exports = std.array_list.Managed(Export).init(arena.allocator());
1434 var it = TrieIterator{ .data = data };
1432 var it: TrieIterator = .{ .stream = .fixed(data) };
14351433 try parseTrieNode(arena.allocator(), &it, "", &exports);
14361434
14371435 mem.sort(Export, exports.items, {}, Export.lessThan);
......@@ -1462,42 +1460,18 @@ const MachODumper = struct {
14621460 }
14631461
14641462 const TrieIterator = struct {
1465 data: []const u8,
1466 pos: usize = 0,
1467
1468 fn getStream(it: *TrieIterator) std.io.FixedBufferStream([]const u8) {
1469 return std.io.fixedBufferStream(it.data[it.pos..]);
1470 }
1463 stream: std.Io.Reader,
14711464
14721465 fn readUleb128(it: *TrieIterator) !u64 {
1473 var stream = it.getStream();
1474 var creader = std.io.countingReader(stream.reader());
1475 const reader = creader.reader();
1476 const value = try std.leb.readUleb128(u64, reader);
1477 it.pos += creader.bytes_read;
1478 return value;
1466 return it.stream.takeLeb128(u64);
14791467 }
14801468
14811469 fn readString(it: *TrieIterator) ![:0]const u8 {
1482 var stream = it.getStream();
1483 const reader = stream.reader();
1484
1485 var count: usize = 0;
1486 while (true) : (count += 1) {
1487 const byte = try reader.readByte();
1488 if (byte == 0) break;
1489 }
1490
1491 const str = @as([*:0]const u8, @ptrCast(it.data.ptr + it.pos))[0..count :0];
1492 it.pos += count + 1;
1493 return str;
1470 return it.stream.takeSentinel(0);
14941471 }
14951472
14961473 fn readByte(it: *TrieIterator) !u8 {
1497 var stream = it.getStream();
1498 const value = try stream.reader().readByte();
1499 it.pos += 1;
1500 return value;
1474 return it.stream.takeByte();
15011475 }
15021476 };
15031477
......@@ -1594,10 +1568,10 @@ const MachODumper = struct {
15941568 const label = try it.readString();
15951569 const off = try it.readUleb128();
15961570 const prefix_label = try std.fmt.allocPrint(arena, "{s}{s}", .{ prefix, label });
1597 const curr = it.pos;
1598 it.pos = off;
1571 const curr = it.stream.seek;
1572 it.stream.seek = off;
15991573 try parseTrieNode(arena, it, prefix_label, exports);
1600 it.pos = curr;
1574 it.stream.seek = curr;
16011575 }
16021576 }
16031577
lib/std/Io.zig-5
......@@ -277,10 +277,6 @@ pub const AnyReader = @import("Io/DeprecatedReader.zig");
277277pub const FixedBufferStream = @import("Io/fixed_buffer_stream.zig").FixedBufferStream;
278278/// Deprecated in favor of `Reader`.
279279pub const fixedBufferStream = @import("Io/fixed_buffer_stream.zig").fixedBufferStream;
280/// Deprecated with no replacement; inefficient pattern
281pub const CountingReader = @import("Io/counting_reader.zig").CountingReader;
282/// Deprecated with no replacement; inefficient pattern
283pub const countingReader = @import("Io/counting_reader.zig").countingReader;
284280
285281pub const tty = @import("Io/tty.zig");
286282
......@@ -750,7 +746,6 @@ pub fn PollFiles(comptime StreamEnum: type) type {
750746test {
751747 _ = Reader;
752748 _ = Writer;
753 _ = CountingReader;
754749 _ = FixedBufferStream;
755750 _ = tty;
756751 _ = @import("Io/test.zig");
lib/std/Io/counting_reader.zig deleted-43
......@@ -1,43 +0,0 @@
1const std = @import("../std.zig");
2const io = std.io;
3const testing = std.testing;
4
5/// A Reader that counts how many bytes has been read from it.
6pub fn CountingReader(comptime ReaderType: anytype) type {
7 return struct {
8 child_reader: ReaderType,
9 bytes_read: u64 = 0,
10
11 pub const Error = ReaderType.Error;
12 pub const Reader = io.GenericReader(*@This(), Error, read);
13
14 pub fn read(self: *@This(), buf: []u8) Error!usize {
15 const amt = try self.child_reader.read(buf);
16 self.bytes_read += amt;
17 return amt;
18 }
19
20 pub fn reader(self: *@This()) Reader {
21 return .{ .context = self };
22 }
23 };
24}
25
26pub fn countingReader(reader: anytype) CountingReader(@TypeOf(reader)) {
27 return .{ .child_reader = reader };
28}
29
30test CountingReader {
31 const bytes = "yay" ** 100;
32 var fbs = io.fixedBufferStream(bytes);
33
34 var counting_stream = countingReader(fbs.reader());
35 const stream = counting_stream.reader();
36
37 //read and discard all bytes
38 while (stream.readByte()) |_| {} else |err| {
39 try testing.expect(err == error.EndOfStream);
40 }
41
42 try testing.expect(counting_stream.bytes_read == bytes.len);
43}
src/arch/x86_64/Disassembler.zig+23-19
......@@ -17,12 +17,16 @@ const Rex = encoder.Rex;
1717
1818pub const Error = error{
1919 EndOfStream,
20 /// After the TODO below is solved this will make sense.
21 ReadFailed,
2022 LegacyPrefixAfterRex,
2123 UnknownOpcode,
2224 Overflow,
2325 Todo,
2426};
2527
28// TODO these fields should be replaced by std.Io.Reader
29
2630code: []const u8,
2731pos: usize = 0,
2832
......@@ -388,20 +392,20 @@ fn parseGpRegister(low_enc: u3, is_extended: bool, rex: Rex, bit_size: u64) Regi
388392}
389393
390394fn parseImm(dis: *Disassembler, kind: Encoding.Op) !Immediate {
391 var stream = std.io.fixedBufferStream(dis.code[dis.pos..]);
392 var creader = std.io.countingReader(stream.reader());
393 const reader = creader.reader();
395 var reader: std.Io.Reader = .fixed(dis.code);
396 reader.seek = dis.pos;
397 defer dis.pos = reader.seek;
398
394399 const imm = switch (kind) {
395 .imm8s, .rel8 => Immediate.s(try reader.readInt(i8, .little)),
396 .imm16s, .rel16 => Immediate.s(try reader.readInt(i16, .little)),
397 .imm32s, .rel32 => Immediate.s(try reader.readInt(i32, .little)),
398 .imm8 => Immediate.u(try reader.readInt(u8, .little)),
399 .imm16 => Immediate.u(try reader.readInt(u16, .little)),
400 .imm32 => Immediate.u(try reader.readInt(u32, .little)),
401 .imm64 => Immediate.u(try reader.readInt(u64, .little)),
400 .imm8s, .rel8 => Immediate.s(try reader.takeInt(i8, .little)),
401 .imm16s, .rel16 => Immediate.s(try reader.takeInt(i16, .little)),
402 .imm32s, .rel32 => Immediate.s(try reader.takeInt(i32, .little)),
403 .imm8 => Immediate.u(try reader.takeInt(u8, .little)),
404 .imm16 => Immediate.u(try reader.takeInt(u16, .little)),
405 .imm32 => Immediate.u(try reader.takeInt(u32, .little)),
406 .imm64 => Immediate.u(try reader.takeInt(u64, .little)),
402407 else => unreachable,
403408 };
404 dis.pos += std.math.cast(usize, creader.bytes_read) orelse return error.Overflow;
405409 return imm;
406410}
407411
......@@ -483,25 +487,25 @@ fn parseSibByte(dis: *Disassembler) !Sib {
483487}
484488
485489fn parseDisplacement(dis: *Disassembler, modrm: ModRm, sib: ?Sib) !i32 {
486 var stream = std.io.fixedBufferStream(dis.code[dis.pos..]);
487 var creader = std.io.countingReader(stream.reader());
488 const reader = creader.reader();
490 var reader: std.Io.Reader = .fixed(dis.code);
491 reader.seek = dis.pos;
492 defer dis.pos = reader.seek;
493
489494 const disp = disp: {
490495 if (sib) |info| {
491496 if (info.base == 0b101 and modrm.mod == 0) {
492 break :disp try reader.readInt(i32, .little);
497 break :disp try reader.takeInt(i32, .little);
493498 }
494499 }
495500 if (modrm.rip()) {
496 break :disp try reader.readInt(i32, .little);
501 break :disp try reader.takeInt(i32, .little);
497502 }
498503 break :disp switch (modrm.mod) {
499504 0b00 => 0,
500 0b01 => try reader.readInt(i8, .little),
501 0b10 => try reader.readInt(i32, .little),
505 0b01 => try reader.takeInt(i8, .little),
506 0b10 => try reader.takeInt(i32, .little),
502507 0b11 => unreachable,
503508 };
504509 };
505 dis.pos += std.math.cast(usize, creader.bytes_read) orelse return error.Overflow;
506510 return disp;
507511}
src/link/MachO/Dwarf.zig+15-15
......@@ -273,19 +273,19 @@ pub const InfoReader = struct {
273273 }
274274
275275 pub fn readUleb128(p: *InfoReader, comptime Type: type) !Type {
276 var stream = std.io.fixedBufferStream(p.bytes()[p.pos..]);
277 var creader = std.io.countingReader(stream.reader());
278 const value: Type = try leb.readUleb128(Type, creader.reader());
279 p.pos += math.cast(usize, creader.bytes_read) orelse return error.Overflow;
280 return value;
276 var reader: std.Io.Reader = .fixed(p.bytes());
277 reader.seek = p.pos;
278 defer p.pos = reader.seek;
279
280 return reader.takeLeb128(Type);
281281 }
282282
283283 pub fn readIleb128(p: *InfoReader, comptime Type: type) !Type {
284 var stream = std.io.fixedBufferStream(p.bytes()[p.pos..]);
285 var creader = std.io.countingReader(stream.reader());
286 const value: Type = try leb.readIleb128(Type, creader.reader());
287 p.pos += math.cast(usize, creader.bytes_read) orelse return error.Overflow;
288 return value;
284 var reader: std.Io.Reader = .fixed(p.bytes());
285 reader.seek = p.pos;
286 defer p.pos = reader.seek;
287
288 return reader.takeLeb128(Type);
289289 }
290290
291291 pub fn seekTo(p: *InfoReader, off: u64) !void {
......@@ -340,11 +340,11 @@ pub const AbbrevReader = struct {
340340 }
341341
342342 pub fn readUleb128(p: *AbbrevReader, comptime Type: type) !Type {
343 var stream = std.io.fixedBufferStream(p.bytes()[p.pos..]);
344 var creader = std.io.countingReader(stream.reader());
345 const value: Type = try leb.readUleb128(Type, creader.reader());
346 p.pos += math.cast(usize, creader.bytes_read) orelse return error.Overflow;
347 return value;
343 var reader: std.Io.Reader = .fixed(p.bytes());
344 reader.seek = p.pos;
345 defer p.pos = reader.seek;
346
347 return reader.takeLeb128(Type);
348348 }
349349
350350 pub fn seekTo(p: *AbbrevReader, off: u64) !void {
src/link/MachO/Dylib.zig+8-32
......@@ -159,42 +159,18 @@ fn parseBinary(self: *Dylib, macho_file: *MachO) !void {
159159}
160160
161161const TrieIterator = struct {
162 data: []const u8,
163 pos: usize = 0,
164
165 fn getStream(it: *TrieIterator) std.io.FixedBufferStream([]const u8) {
166 return std.io.fixedBufferStream(it.data[it.pos..]);
167 }
162 stream: std.Io.Reader,
168163
169164 fn readUleb128(it: *TrieIterator) !u64 {
170 var stream = it.getStream();
171 var creader = std.io.countingReader(stream.reader());
172 const reader = creader.reader();
173 const value = try std.leb.readUleb128(u64, reader);
174 it.pos += math.cast(usize, creader.bytes_read) orelse return error.Overflow;
175 return value;
165 return it.stream.takeLeb128(u64);
176166 }
177167
178168 fn readString(it: *TrieIterator) ![:0]const u8 {
179 var stream = it.getStream();
180 const reader = stream.reader();
181
182 var count: usize = 0;
183 while (true) : (count += 1) {
184 const byte = try reader.readByte();
185 if (byte == 0) break;
186 }
187
188 const str = @as([*:0]const u8, @ptrCast(it.data.ptr + it.pos))[0..count :0];
189 it.pos += count + 1;
190 return str;
169 return it.stream.takeSentinel(0);
191170 }
192171
193172 fn readByte(it: *TrieIterator) !u8 {
194 var stream = it.getStream();
195 const value = try stream.reader().readByte();
196 it.pos += 1;
197 return value;
173 return it.stream.takeByte();
198174 }
199175};
200176
......@@ -243,10 +219,10 @@ fn parseTrieNode(
243219 const label = try it.readString();
244220 const off = try it.readUleb128();
245221 const prefix_label = try std.fmt.allocPrint(arena, "{s}{s}", .{ prefix, label });
246 const curr = it.pos;
247 it.pos = math.cast(usize, off) orelse return error.Overflow;
222 const curr = it.stream.seek;
223 it.stream.seek = math.cast(usize, off) orelse return error.Overflow;
248224 try self.parseTrieNode(it, allocator, arena, prefix_label);
249 it.pos = curr;
225 it.stream.seek = curr;
250226 }
251227}
252228
......@@ -257,7 +233,7 @@ fn parseTrie(self: *Dylib, data: []const u8, macho_file: *MachO) !void {
257233 var arena = std.heap.ArenaAllocator.init(gpa);
258234 defer arena.deinit();
259235
260 var it: TrieIterator = .{ .data = data };
236 var it: TrieIterator = .{ .stream = .fixed(data) };
261237 try self.parseTrieNode(&it, gpa, arena.allocator(), "");
262238}
263239
src/link/MachO/eh_frame.zig+15-18
......@@ -17,31 +17,29 @@ pub const Cie = struct {
1717
1818 if (aug[0] != 'z') return; // TODO should we error out?
1919
20 var stream = std.io.fixedBufferStream(data[9 + aug.len + 1 ..]);
21 var creader = std.io.countingReader(stream.reader());
22 const reader = creader.reader();
20 var reader: std.Io.Reader = .fixed(data[9 + aug.len + 1 ..]);
2321
24 _ = try leb.readUleb128(u64, reader); // code alignment factor
25 _ = try leb.readUleb128(u64, reader); // data alignment factor
26 _ = try leb.readUleb128(u64, reader); // return address register
27 _ = try leb.readUleb128(u64, reader); // augmentation data length
22 _ = try reader.takeLeb128(u64); // code alignment factor
23 _ = try reader.takeLeb128(u64); // data alignment factor
24 _ = try reader.takeLeb128(u64); // return address register
25 _ = try reader.takeLeb128(u64); // augmentation data length
2826
2927 for (aug[1..]) |ch| switch (ch) {
3028 'R' => {
31 const enc = try reader.readByte();
29 const enc = try reader.takeByte();
3230 if (enc != DW_EH_PE.pcrel | DW_EH_PE.absptr) {
3331 @panic("unexpected pointer encoding"); // TODO error
3432 }
3533 },
3634 'P' => {
37 const enc = try reader.readByte();
35 const enc = try reader.takeByte();
3836 if (enc != DW_EH_PE.pcrel | DW_EH_PE.indirect | DW_EH_PE.sdata4) {
3937 @panic("unexpected personality pointer encoding"); // TODO error
4038 }
41 _ = try reader.readInt(u32, .little); // personality pointer
39 _ = try reader.takeInt(u32, .little); // personality pointer
4240 },
4341 'L' => {
44 const enc = try reader.readByte();
42 const enc = try reader.takeByte();
4543 switch (enc & DW_EH_PE.type_mask) {
4644 DW_EH_PE.sdata4 => cie.lsda_size = .p32,
4745 DW_EH_PE.absptr => cie.lsda_size = .p64,
......@@ -163,14 +161,13 @@ pub const Fde = struct {
163161
164162 // Parse LSDA atom index if any
165163 if (cie.lsda_size) |lsda_size| {
166 var stream = std.io.fixedBufferStream(data[24..]);
167 var creader = std.io.countingReader(stream.reader());
168 const reader = creader.reader();
169 _ = try leb.readUleb128(u64, reader); // augmentation length
170 fde.lsda_ptr_offset = @intCast(creader.bytes_read + 24);
164 var reader: std.Io.Reader = .fixed(data);
165 reader.seek = 24;
166 _ = try reader.takeLeb128(u64); // augmentation length
167 fde.lsda_ptr_offset = @intCast(reader.seek);
171168 const lsda_ptr = switch (lsda_size) {
172 .p32 => try reader.readInt(i32, .little),
173 .p64 => try reader.readInt(i64, .little),
169 .p32 => try reader.takeInt(i32, .little),
170 .p64 => try reader.takeInt(i64, .little),
174171 };
175172 const lsda_addr: u64 = @intCast(@as(i64, @intCast(sect.addr + fde.offset + fde.lsda_ptr_offset)) + lsda_ptr);
176173 fde.lsda = object.findAtom(lsda_addr) orelse {