authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2019-04-28 17:06:20+02:00
committergravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2019-04-28 18:07:40+02:00
logfbcc559cdbe67b711ea24a152aa7bb3a10bb06c7
treefcbad1d82f4f9dbf1d7d4e9d756d84e9d89a9a04
parent205e501e42b9a2e1d35afa0873311165100863ae

Make io offsets/sizes u64 instead of usize

Decouple the concepts of address-space size and file size. Closes #637

4 files changed, 32 insertions(+), 31 deletions(-)

std/io.zig+5-5
......@@ -195,8 +195,8 @@ pub fn InStream(comptime ReadError: type) type {
195195 return mem.readVarInt(ReturnType, bytes, endian);
196196 }
197197
198 pub fn skipBytes(self: *Self, num_bytes: usize) !void {
199 var i: usize = 0;
198 pub fn skipBytes(self: *Self, num_bytes: u64) !void {
199 var i: u64 = 0;
200200 while (i < num_bytes) : (i += 1) {
201201 _ = try self.readByte();
202202 }
......@@ -232,9 +232,9 @@ pub fn OutStream(comptime WriteError: type) type {
232232 return self.writeFn(self, slice);
233233 }
234234
235 pub fn writeByteNTimes(self: *Self, byte: u8, n: usize) Error!void {
235 pub fn writeByteNTimes(self: *Self, byte: u8, n: u64) Error!void {
236236 const slice = (*const [1]u8)(&byte)[0..];
237 var i: usize = 0;
237 var i: u64 = 0;
238238 while (i < n) : (i += 1) {
239239 try self.writeFn(self, slice);
240240 }
......@@ -743,7 +743,7 @@ pub fn CountingOutStream(comptime OutStreamError: type) type {
743743 pub const Error = OutStreamError;
744744
745745 pub stream: Stream,
746 pub bytes_written: usize,
746 pub bytes_written: u64,
747747 child_stream: *Stream,
748748
749749 pub fn init(child_stream: *Stream) Self {
std/io/seekable_stream.zig+8-8
......@@ -7,25 +7,25 @@ pub fn SeekableStream(comptime SeekErrorType: type, comptime GetSeekPosErrorType
77 pub const SeekError = SeekErrorType;
88 pub const GetSeekPosError = GetSeekPosErrorType;
99
10 seekToFn: fn (self: *Self, pos: usize) SeekError!void,
11 seekForwardFn: fn (self: *Self, pos: isize) SeekError!void,
10 seekToFn: fn (self: *Self, pos: u64) SeekError!void,
11 seekForwardFn: fn (self: *Self, pos: i64) SeekError!void,
1212
13 getPosFn: fn (self: *Self) GetSeekPosError!usize,
14 getEndPosFn: fn (self: *Self) GetSeekPosError!usize,
13 getPosFn: fn (self: *Self) GetSeekPosError!u64,
14 getEndPosFn: fn (self: *Self) GetSeekPosError!u64,
1515
16 pub fn seekTo(self: *Self, pos: usize) SeekError!void {
16 pub fn seekTo(self: *Self, pos: u64) SeekError!void {
1717 return self.seekToFn(self, pos);
1818 }
1919
20 pub fn seekForward(self: *Self, amt: isize) SeekError!void {
20 pub fn seekForward(self: *Self, amt: i64) SeekError!void {
2121 return self.seekForwardFn(self, amt);
2222 }
2323
24 pub fn getEndPos(self: *Self) GetSeekPosError!usize {
24 pub fn getEndPos(self: *Self) GetSeekPosError!u64 {
2525 return self.getEndPosFn(self);
2626 }
2727
28 pub fn getPos(self: *Self) GetSeekPosError!usize {
28 pub fn getPos(self: *Self) GetSeekPosError!u64 {
2929 return self.getPosFn(self);
3030 }
3131 };
std/os/file.zig+12-12
......@@ -235,7 +235,7 @@ pub const File = struct {
235235 Unexpected,
236236 };
237237
238 pub fn seekForward(self: File, amount: isize) SeekError!void {
238 pub fn seekForward(self: File, amount: i64) SeekError!void {
239239 switch (builtin.os) {
240240 Os.linux, Os.macosx, Os.ios, Os.freebsd, Os.netbsd => {
241241 const result = posix.lseek(self.handle, amount, posix.SEEK_CUR);
......@@ -266,7 +266,7 @@ pub const File = struct {
266266 }
267267 }
268268
269 pub fn seekTo(self: File, pos: usize) SeekError!void {
269 pub fn seekTo(self: File, pos: u64) SeekError!void {
270270 switch (builtin.os) {
271271 Os.linux, Os.macosx, Os.ios, Os.freebsd, Os.netbsd => {
272272 const ipos = try math.cast(isize, pos);
......@@ -307,7 +307,7 @@ pub const File = struct {
307307 Unexpected,
308308 };
309309
310 pub fn getPos(self: File) GetSeekPosError!usize {
310 pub fn getPos(self: File) GetSeekPosError!u64 {
311311 switch (builtin.os) {
312312 Os.linux, Os.macosx, Os.ios, Os.freebsd, Os.netbsd => {
313313 const result = posix.lseek(self.handle, 0, posix.SEEK_CUR);
......@@ -324,7 +324,7 @@ pub const File = struct {
324324 else => os.unexpectedErrorPosix(err),
325325 };
326326 }
327 return result;
327 return @intCast(u64, result);
328328 },
329329 Os.windows => {
330330 var pos: windows.LARGE_INTEGER = undefined;
......@@ -337,16 +337,16 @@ pub const File = struct {
337337 }
338338
339339 assert(pos >= 0);
340 return math.cast(usize, pos);
340 return math.cast(u64, pos);
341341 },
342342 else => @compileError("unsupported OS"),
343343 }
344344 }
345345
346 pub fn getEndPos(self: File) GetSeekPosError!usize {
346 pub fn getEndPos(self: File) GetSeekPosError!u64 {
347347 if (is_posix) {
348348 const stat = try os.posixFStat(self.handle);
349 return @intCast(usize, stat.size);
349 return @intCast(u64, stat.size);
350350 } else if (is_windows) {
351351 var file_size: windows.LARGE_INTEGER = undefined;
352352 if (windows.GetFileSizeEx(self.handle, &file_size) == 0) {
......@@ -357,7 +357,7 @@ pub const File = struct {
357357 }
358358 if (file_size < 0)
359359 return error.Overflow;
360 return math.cast(usize, @intCast(u64, file_size));
360 return @intCast(u64, file_size);
361361 } else {
362362 @compileError("TODO support getEndPos on this OS");
363363 }
......@@ -492,22 +492,22 @@ pub const File = struct {
492492
493493 pub const Stream = io.SeekableStream(SeekError, GetSeekPosError);
494494
495 pub fn seekToFn(seekable_stream: *Stream, pos: usize) SeekError!void {
495 pub fn seekToFn(seekable_stream: *Stream, pos: u64) SeekError!void {
496496 const self = @fieldParentPtr(SeekableStream, "stream", seekable_stream);
497497 return self.file.seekTo(pos);
498498 }
499499
500 pub fn seekForwardFn(seekable_stream: *Stream, amt: isize) SeekError!void {
500 pub fn seekForwardFn(seekable_stream: *Stream, amt: i64) SeekError!void {
501501 const self = @fieldParentPtr(SeekableStream, "stream", seekable_stream);
502502 return self.file.seekForward(amt);
503503 }
504504
505 pub fn getEndPosFn(seekable_stream: *Stream) GetSeekPosError!usize {
505 pub fn getEndPosFn(seekable_stream: *Stream) GetSeekPosError!u64 {
506506 const self = @fieldParentPtr(SeekableStream, "stream", seekable_stream);
507507 return self.file.getEndPos();
508508 }
509509
510 pub fn getPosFn(seekable_stream: *Stream) GetSeekPosError!usize {
510 pub fn getPosFn(seekable_stream: *Stream) GetSeekPosError!u64 {
511511 const self = @fieldParentPtr(SeekableStream, "stream", seekable_stream);
512512 return self.file.getPos();
513513 }
std/pdb.zig+7-6
......@@ -588,7 +588,7 @@ const SuperBlock = packed struct {
588588
589589const MsfStream = struct {
590590 in_file: os.File,
591 pos: usize,
591 pos: u64,
592592 blocks: []u32,
593593 block_size: u32,
594594
......@@ -598,7 +598,7 @@ const MsfStream = struct {
598598 pub const Error = @typeOf(read).ReturnType.ErrorSet;
599599 pub const Stream = io.InStream(Error);
600600
601 fn init(block_size: u32, block_count: u32, pos: usize, file: os.File, allocator: *mem.Allocator) !MsfStream {
601 fn init(block_size: u32, block_count: u32, pos: u64, file: os.File, allocator: *mem.Allocator) !MsfStream {
602602 var stream = MsfStream{
603603 .in_file = file,
604604 .pos = 0,
......@@ -660,23 +660,24 @@ const MsfStream = struct {
660660 return size;
661661 }
662662
663 fn seekForward(self: *MsfStream, len: usize) !void {
663 // XXX: The `len` parameter should be signed
664 fn seekForward(self: *MsfStream, len: u64) !void {
664665 self.pos += len;
665666 if (self.pos >= self.blocks.len * self.block_size)
666667 return error.EOF;
667668 }
668669
669 fn seekTo(self: *MsfStream, len: usize) !void {
670 fn seekTo(self: *MsfStream, len: u64) !void {
670671 self.pos = len;
671672 if (self.pos >= self.blocks.len * self.block_size)
672673 return error.EOF;
673674 }
674675
675 fn getSize(self: *const MsfStream) usize {
676 fn getSize(self: *const MsfStream) u64 {
676677 return self.blocks.len * self.block_size;
677678 }
678679
679 fn getFilePos(self: MsfStream) usize {
680 fn getFilePos(self: MsfStream) u64 {
680681 const block_id = self.pos / self.block_size;
681682 const block = self.blocks[block_id];
682683 const offset = self.pos % self.block_size;