Commit 3640c682a2ed8a0f554224936a3c634215543ffe | zig

author	LemonBoy <thatlemon@gmail.com> 2020-02-01 11:32:53+01:00
committer	LemonBoy <thatlemon@gmail.com> 2020-02-01 11:32:53+01:00
log	3640c682a2ed8a0f554224936a3c634215543ffe
tree	d15c5f7fdb73c3ef71d691a7b9e7cd60104cb59f
parent	8309ee875236b9fd2fb80482010464e218173c4c

8 files changed, 15 insertions(+), 21 deletions(-)

lib/std/c/parse.zig-1

lib/std/c/tokenizer.zig+1-1

lib/std/hash/benchmark.zig+2-2

...	...	@@ -250,13 +250,13 @@ pub fn main() !void {
250	250	if (H.has_iterative_api) {
251	251	prng.seed(seed);
252	252	const result = try benchmarkHash(H, count);
253		try stdout.print(" iterative: {:4} MiB/s [{x:0<16}]\n", .{result.throughput / (1 * MiB), result.hash});
	253	try stdout.print(" iterative: {:4} MiB/s [{x:0<16}]\n", .{ result.throughput / (1 * MiB), result.hash });
254	254	}
255	255
256	256	if (!test_iterative_only) {
257	257	prng.seed(seed);
258	258	const result_small = try benchmarkHashSmallKeys(H, key_size, count);
259		try stdout.print(" small keys: {:4} MiB/s [{x:0<16}]\n", .{result_small.throughput / (1 * MiB), result_small.hash});
	259	try stdout.print(" small keys: {:4} MiB/s [{x:0<16}]\n", .{ result_small.throughput / (1 * MiB), result_small.hash });
260	260	}
261	261	}
262	262	}

lib/std/os/uefi.zig+2-1

...	...	@@ -40,7 +40,8 @@ pub const Guid = extern struct {
40	40	self.time_mid,
41	41	self.time_high_and_version,
42	42	self.clock_seq_high_and_reserved,
43		self.clock_seq_low, self.node,
	43	self.clock_seq_low,
	44	self.node,
44	45	});
45	46	} else {
46	47	@compileError("Unknown format character: '" ++ f ++ "'");

lib/std/os/windows/bits.zig+7-13

...	...	@@ -928,10 +928,7 @@ pub usingnamespace switch (builtin.arch) {
928	928	SegSs: DWORD,
929	929	ExtendedRegisters: [512]BYTE,
930	930
931		pub fn getRegs(ctx: *const CONTEXT) struct {
932		bp: usize,
933		ip: usize,
934		} {
	931	pub fn getRegs(ctx: *const CONTEXT) struct { bp: usize, ip: usize } {
935	932	return .{ .bp = ctx.Ebp, .ip = ctx.Eip };
936	933	}
937	934	};
...	...	@@ -1034,10 +1031,7 @@ pub usingnamespace switch (builtin.arch) {
1034	1031	LastExceptionToRip: DWORD64,
1035	1032	LastExceptionFromRip: DWORD64,
1036	1033
1037		pub fn getRegs(ctx: *const CONTEXT) struct {
1038		bp: usize,
1039		ip: usize,
1040		} {
	1034	pub fn getRegs(ctx: *const CONTEXT) struct { bp: usize, ip: usize } {
1041	1035	return .{ .bp = ctx.Rbp, .ip = ctx.Rip };
1042	1036	}
1043	1037	};
...	...	@@ -1105,11 +1099,11 @@ pub usingnamespace switch (builtin.arch) {
1105	1099	Wcr: [2]DWORD,
1106	1100	Wvr: [2]DWORD64,
1107	1101
1108		pub fn getRegs(ctx: *const CONTEXT) struct {
1109		bp: usize,
1110		ip: usize,
1111		} {
1112		return .{ .bp = ctx.DUMMYUNIONNAME.DUMMYSTRUCTNAME.Fp, .ip = ctx.Pc };
	1102	pub fn getRegs(ctx: *const CONTEXT) struct { bp: usize, ip: usize } {
	1103	return .{
	1104	.bp = ctx.DUMMYUNIONNAME.DUMMYSTRUCTNAME.Fp,
	1105	.ip = ctx.Pc,
	1106	};
1113	1107	}
1114	1108	};
1115	1109

lib/std/zig/perf_test.zig+1-1

...	...	@@ -25,7 +25,7 @@ pub fn main() !void {
25	25
26	26	var stdout_file = std.io.getStdOut();
27	27	const stdout = &stdout_file.outStream().stream;
28		try stdout.print("{:.3} MiB/s, {} KiB used \n", .{mb_per_sec, memory_used / 1024});
	28	try stdout.print("{:.3} MiB/s, {} KiB used \n", .{ mb_per_sec, memory_used / 1024 });
29	29	}
30	30
31	31	fn testOnce() usize {

src-self-hosted/dep_tokenizer.zig+1-1

...	...	@@ -894,7 +894,7 @@ fn printSection(out: var, label: []const u8, bytes: []const u8) !void {
894	894
895	895	fn printLabel(out: var, label: []const u8, bytes: []const u8) !void {
896	896	var buf: [80]u8 = undefined;
897		var text = try std.fmt.bufPrint(buf[0..], "{} {} bytes ", .{label, bytes.len});
	897	var text = try std.fmt.bufPrint(buf[0..], "{} {} bytes ", .{ label, bytes.len });
898	898	try out.write(text);
899	899	var i: usize = text.len;
900	900	const end = 79;

src-self-hosted/link.zig+1-1

...	...	@@ -105,7 +105,7 @@ extern fn ZigLLDLink(
105	105	context: *c_void,
106	106	) bool;
107	107
108		extern fn linkDiagCallback(context: c_void, ptr: []const u8, len: usize) void {
	108	fn linkDiagCallback(context: c_void, ptr: []const u8, len: usize) callconv(.C) void {
109	109	const ctx = @ptrCast(*Context, @alignCast(@alignOf(Context), context));
110	110	ctx.link_err = linkDiagCallbackErrorable(ctx, ptr[0..len]);
111	111	}