zig fmt on the standard library

std/c/freebsd.zig

@@ -44,16 +44,22 @@ pub const pthread_attr_t = extern struct {
 pub const msghdr = extern struct {
     /// optional address
     msg_name: ?*sockaddr,
+
     /// size of address
     msg_namelen: socklen_t,
+
     /// scatter/gather array
     msg_iov: [*]iovec,
+
     /// # elements in msg_iov
     msg_iovlen: i32,
+
     /// ancillary data
     msg_control: ?*c_void,
+
     /// ancillary data buffer len
     msg_controllen: socklen_t,
+
     /// flags on received message
     msg_flags: i32,
 };
@@ -61,16 +67,22 @@ pub const msghdr = extern struct {
 pub const msghdr_const = extern struct {
     /// optional address
     msg_name: ?*const sockaddr,
+
     /// size of address
     msg_namelen: socklen_t,
+
     /// scatter/gather array
     msg_iov: [*]iovec_const,
+
     /// # elements in msg_iov
     msg_iovlen: i32,
+
     /// ancillary data
     msg_control: ?*c_void,
+
     /// ancillary data buffer len
     msg_controllen: socklen_t,
+
     /// flags on received message
     msg_flags: i32,
 };

std/c/netbsd.zig

@@ -44,16 +44,22 @@ pub const pthread_attr_t = extern struct {
 pub const msghdr = extern struct {
     /// optional address
     msg_name: ?*sockaddr,
+
     /// size of address
     msg_namelen: socklen_t,
+
     /// scatter/gather array
     msg_iov: [*]iovec,
+
     /// # elements in msg_iov
     msg_iovlen: i32,
+
     /// ancillary data
     msg_control: ?*c_void,
+
     /// ancillary data buffer len
     msg_controllen: socklen_t,
+
     /// flags on received message
     msg_flags: i32,
 };
@@ -61,16 +67,22 @@ pub const msghdr = extern struct {
 pub const msghdr_const = extern struct {
     /// optional address
     msg_name: ?*const sockaddr,
+
     /// size of address
     msg_namelen: socklen_t,
+
     /// scatter/gather array
     msg_iov: [*]iovec_const,
+
     /// # elements in msg_iov
     msg_iovlen: i32,
+
     /// ancillary data
     msg_control: ?*c_void,
+
     /// ancillary data buffer len
     msg_controllen: socklen_t,
+
     /// flags on received message
     msg_flags: i32,
 };

std/dynamic_library.zig

@@ -71,12 +71,12 @@ pub fn linkmap_iterator(phdrs: []elf.Phdr) !LinkMap.Iterator {
         for (phdrs) |*phdr| {
             if (phdr.p_type == elf.PT_DYNAMIC) {
                 const ptr = @intToPtr([*]elf.Dyn, va_offset + phdr.p_vaddr);
-                break :init ptr[0..phdr.p_memsz / @sizeOf(elf.Dyn)];
+                break :init ptr[0 .. phdr.p_memsz / @sizeOf(elf.Dyn)];
             }
         }
         // No PT_DYNAMIC means this is either a statically-linked program or a
         // badly corrupted one
-        return LinkMap.Iterator{.current = null};
+        return LinkMap.Iterator{ .current = null };
     };
 
     const link_map_ptr = init: {
@@ -93,13 +93,13 @@ pub fn linkmap_iterator(phdrs: []elf.Phdr) !LinkMap.Iterator {
                     // second slot
                     break :init @intToPtr(?*LinkMap, got_table[1]);
                 },
-                else => { }
+                else => {},
             }
         }
         return error.InvalidExe;
     };
 
-    return LinkMap.Iterator{.current = link_map_ptr};
+    return LinkMap.Iterator{ .current = link_map_ptr };
 }
 
 pub const LinuxDynLib = struct {

std/fmt.zig

@@ -183,7 +183,7 @@ pub fn formatType(
                         }
                         try output(context, @memberName(T, field_i));
                         try output(context, " = ");
-                        try formatType(@field(value, @memberName(T, field_i)), "", context, Errors, output, max_depth-1);
+                        try formatType(@field(value, @memberName(T, field_i)), "", context, Errors, output, max_depth - 1);
                     }
                     try output(context, " }");
                 },
@@ -198,7 +198,7 @@ pub fn formatType(
                         try output(context, " = ");
                         inline for (info.fields) |u_field| {
                             if (@enumToInt(UnionTagType(value)) == u_field.enum_field.?.value) {
-                                try formatType(@field(value, u_field.name), "", context, Errors, output, max_depth-1);
+                                try formatType(@field(value, u_field.name), "", context, Errors, output, max_depth - 1);
                             }
                         }
                         try output(context, " }");

std/hash_map.zig

@@ -155,7 +155,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn (key: K) u3
         /// capacity is greater than the current capacity.
         /// New capacity must be a power of two.
         fn ensureCapacityExact(self: *Self, new_capacity: usize) !void {
-            const is_power_of_two = new_capacity & (new_capacity-1) == 0;
+            const is_power_of_two = new_capacity & (new_capacity - 1) == 0;
             assert(is_power_of_two);
 
             if (new_capacity <= self.entries.len) {
@@ -474,9 +474,9 @@ test "ensure capacity" {
     try map.ensureCapacity(20);
     const initialCapacity = map.entries.len;
     testing.expect(initialCapacity >= 20);
-    var i : i32 = 0;
+    var i: i32 = 0;
     while (i < 20) : (i += 1) {
-        testing.expect(map.putAssumeCapacity(i, i+10) == null);
+        testing.expect(map.putAssumeCapacity(i, i + 10) == null);
     }
     // shouldn't resize from putAssumeCapacity
     testing.expect(initialCapacity == map.entries.len);

std/os/linux/tls.zig

@@ -86,8 +86,7 @@ const tls_dtv_offset = switch (builtin.arch) {
 };
 
 // Per-thread storage for Zig's use
-const CustomData = packed struct {
+const CustomData = packed struct {};
-};
 
 // Dynamic Thread Vector
 const DTV = packed struct {
@@ -109,14 +108,14 @@ pub var tls_image: ?TLSImage = null;
 pub fn setThreadPointer(addr: usize) void {
     switch (builtin.arch) {
         .x86_64 => {
-            const rc = std.os.linux.syscall2(std.os.linux.SYS_arch_prctl,
+            const rc = std.os.linux.syscall2(std.os.linux.SYS_arch_prctl, std.os.linux.ARCH_SET_FS, addr);
-                                             std.os.linux.ARCH_SET_FS, addr);
             assert(rc == 0);
         },
         .aarch64 => {
             asm volatile (
                 \\ msr tpidr_el0, %[addr]
-                : : [addr] "r" (addr)
+                            :
+                : [addr] "r" (addr)
             );
         },
         else => @compileError("Unsupported architecture"),
@@ -194,7 +193,7 @@ pub fn initTLS() void {
                 dtv_offset = l;
                 l += @sizeOf(DTV);
                 break :blk l;
-            }
+            },
         };
 
         tls_image = TLSImage{
@@ -238,8 +237,7 @@ pub fn allocateTLS(size: usize) usize {
         return @ptrToInt(&main_thread_tls_buffer);
     }
 
-    const addr = posix.mmap(null, size, posix.PROT_READ | posix.PROT_WRITE,
+    const addr = posix.mmap(null, size, posix.PROT_READ | posix.PROT_WRITE, posix.MAP_PRIVATE | posix.MAP_ANONYMOUS, -1, 0);
-                            posix.MAP_PRIVATE | posix.MAP_ANONYMOUS, -1, 0);
 
     if (posix.getErrno(addr) != 0) @panic("out of memory");
 

std/os/windows/shell32.zig

@@ -1,4 +1,3 @@
 use @import("../windows.zig");
 
 pub extern "shell32" stdcallcc fn SHGetKnownFolderPath(rfid: *const KNOWNFOLDERID, dwFlags: DWORD, hToken: ?HANDLE, ppszPath: *[*]WCHAR) HRESULT;
-

std/special/compiler_rt.zig

@@ -338,7 +338,10 @@ extern fn __umoddi3(a: u64, b: u64) u64 {
     return r;
 }
 
-extern fn __aeabi_uidivmod(n: u32, d: u32) extern struct{q: u32, r: u32} {
+extern fn __aeabi_uidivmod(n: u32, d: u32) extern struct {
+    q: u32,
+    r: u32,
+} {
     @setRuntimeSafety(is_test);
 
     var result: @typeOf(__aeabi_uidivmod).ReturnType = undefined;
@@ -346,7 +349,10 @@ extern fn __aeabi_uidivmod(n: u32, d: u32) extern struct{q: u32, r: u32} {
     return result;
 }
 
-extern fn __aeabi_uldivmod(n: u64, d: u64) extern struct{q: u64, r: u64} {
+extern fn __aeabi_uldivmod(n: u64, d: u64) extern struct {
+    q: u64,
+    r: u64,
+} {
     @setRuntimeSafety(is_test);
 
     var result: @typeOf(__aeabi_uldivmod).ReturnType = undefined;
@@ -354,7 +360,10 @@ extern fn __aeabi_uldivmod(n: u64, d: u64) extern struct{q: u64, r: u64} {
     return result;
 }
 
-extern fn __aeabi_idivmod(n: i32, d: i32) extern struct{q: i32, r: i32} {
+extern fn __aeabi_idivmod(n: i32, d: i32) extern struct {
+    q: i32,
+    r: i32,
+} {
     @setRuntimeSafety(is_test);
 
     var result: @typeOf(__aeabi_idivmod).ReturnType = undefined;
@@ -362,7 +371,10 @@ extern fn __aeabi_idivmod(n: i32, d: i32) extern struct{q: i32, r: i32} {
     return result;
 }
 
-extern fn __aeabi_ldivmod(n: i64, d: i64) extern struct{q: i64, r:i64} {
+extern fn __aeabi_ldivmod(n: i64, d: i64) extern struct {
+    q: i64,
+    r: i64,
+} {
     @setRuntimeSafety(is_test);
 
     var result: @typeOf(__aeabi_ldivmod).ReturnType = undefined;

std/special/compiler_rt/ashrti3_test.zig

@@ -4,7 +4,7 @@ const testing = @import("std").testing;
 fn test__ashrti3(a: i128, b: i32, expected: i128) void {
     const x = __ashrti3(a, b);
     // @import("std").debug.warn("got 0x{x}\nexp 0x{x}\n", @truncate(u64,
-// @bitCast(u128, x) >> 64), @truncate(u64, @bitCast(u128, expected)) >> 64);
+    // @bitCast(u128, x) >> 64), @truncate(u64, @bitCast(u128, expected)) >> 64);
     testing.expect(x == expected);
 }
 

std/special/compiler_rt/fixdfdi_test.zig

@@ -12,7 +12,6 @@ fn test__fixdfdi(a: f64, expected: i64) void {
 
 test "fixdfdi" {
     //warn("\n");
-
     test__fixdfdi(-math.f64_max, math.minInt(i64));
 
     test__fixdfdi(-0x1.FFFFFFFFFFFFFp+1023, math.minInt(i64));

std/special/compiler_rt/fixdfsi_test.zig

@@ -12,7 +12,6 @@ fn test__fixdfsi(a: f64, expected: i32) void {
 
 test "fixdfsi" {
     //warn("\n");
-
     test__fixdfsi(-math.f64_max, math.minInt(i32));
 
     test__fixdfsi(-0x1.FFFFFFFFFFFFFp+1023, math.minInt(i32));

std/special/compiler_rt/fixdfti_test.zig

@@ -12,7 +12,6 @@ fn test__fixdfti(a: f64, expected: i128) void {
 
 test "fixdfti" {
     //warn("\n");
-
     test__fixdfti(-math.f64_max, math.minInt(i128));
 
     test__fixdfti(-0x1.FFFFFFFFFFFFFp+1023, math.minInt(i128));

std/special/compiler_rt/fixint_test.zig

@@ -82,7 +82,7 @@ test "fixint.i32" {
     test__fixint(f64, i32, -math.inf_f64, math.minInt(i32));
     test__fixint(f64, i32, -math.f64_max, math.minInt(i32));
     test__fixint(f64, i32, f64(math.minInt(i32)), math.minInt(i32));
-    test__fixint(f64, i32, f64(math.minInt(i32))+1, math.minInt(i32)+1);
+    test__fixint(f64, i32, f64(math.minInt(i32)) + 1, math.minInt(i32) + 1);
     test__fixint(f64, i32, -2.0, -2);
     test__fixint(f64, i32, -1.9, -1);
     test__fixint(f64, i32, -1.1, -1);
@@ -96,7 +96,7 @@ test "fixint.i32" {
     test__fixint(f64, i32, 0.1, 0);
     test__fixint(f64, i32, 0.9, 0);
     test__fixint(f64, i32, 1.0, 1);
-    test__fixint(f64, i32, f64(math.maxInt(i32))-1, math.maxInt(i32)-1);
+    test__fixint(f64, i32, f64(math.maxInt(i32)) - 1, math.maxInt(i32) - 1);
     test__fixint(f64, i32, f64(math.maxInt(i32)), math.maxInt(i32));
     test__fixint(f64, i32, math.f64_max, math.maxInt(i32));
     test__fixint(f64, i32, math.inf_f64, math.maxInt(i32));
@@ -106,8 +106,8 @@ test "fixint.i64" {
     test__fixint(f64, i64, -math.inf_f64, math.minInt(i64));
     test__fixint(f64, i64, -math.f64_max, math.minInt(i64));
     test__fixint(f64, i64, f64(math.minInt(i64)), math.minInt(i64));
-    test__fixint(f64, i64, f64(math.minInt(i64))+1, math.minInt(i64));
+    test__fixint(f64, i64, f64(math.minInt(i64)) + 1, math.minInt(i64));
-    test__fixint(f64, i64, f64(math.minInt(i64)/2), math.minInt(i64)/2);
+    test__fixint(f64, i64, f64(math.minInt(i64) / 2), math.minInt(i64) / 2);
     test__fixint(f64, i64, -2.0, -2);
     test__fixint(f64, i64, -1.9, -1);
     test__fixint(f64, i64, -1.1, -1);
@@ -121,7 +121,7 @@ test "fixint.i64" {
     test__fixint(f64, i64, 0.1, 0);
     test__fixint(f64, i64, 0.9, 0);
     test__fixint(f64, i64, 1.0, 1);
-    test__fixint(f64, i64, f64(math.maxInt(i64))-1, math.maxInt(i64));
+    test__fixint(f64, i64, f64(math.maxInt(i64)) - 1, math.maxInt(i64));
     test__fixint(f64, i64, f64(math.maxInt(i64)), math.maxInt(i64));
     test__fixint(f64, i64, math.f64_max, math.maxInt(i64));
     test__fixint(f64, i64, math.inf_f64, math.maxInt(i64));
@@ -131,7 +131,7 @@ test "fixint.i128" {
     test__fixint(f64, i128, -math.inf_f64, math.minInt(i128));
     test__fixint(f64, i128, -math.f64_max, math.minInt(i128));
     test__fixint(f64, i128, f64(math.minInt(i128)), math.minInt(i128));
-    test__fixint(f64, i128, f64(math.minInt(i128))+1, math.minInt(i128));
+    test__fixint(f64, i128, f64(math.minInt(i128)) + 1, math.minInt(i128));
     test__fixint(f64, i128, -2.0, -2);
     test__fixint(f64, i128, -1.9, -1);
     test__fixint(f64, i128, -1.1, -1);
@@ -145,7 +145,7 @@ test "fixint.i128" {
     test__fixint(f64, i128, 0.1, 0);
     test__fixint(f64, i128, 0.9, 0);
     test__fixint(f64, i128, 1.0, 1);
-    test__fixint(f64, i128, f64(math.maxInt(i128))-1, math.maxInt(i128));
+    test__fixint(f64, i128, f64(math.maxInt(i128)) - 1, math.maxInt(i128));
     test__fixint(f64, i128, f64(math.maxInt(i128)), math.maxInt(i128));
     test__fixint(f64, i128, math.f64_max, math.maxInt(i128));
     test__fixint(f64, i128, math.inf_f64, math.maxInt(i128));

std/special/compiler_rt/fixsfdi_test.zig

@@ -12,7 +12,6 @@ fn test__fixsfdi(a: f32, expected: i64) void {
 
 test "fixsfdi" {
     //warn("\n");
-
     test__fixsfdi(-math.f32_max, math.minInt(i64));
 
     test__fixsfdi(-0x1.FFFFFFFFFFFFFp+1023, math.minInt(i64));

std/special/compiler_rt/fixsfsi_test.zig

@@ -12,7 +12,6 @@ fn test__fixsfsi(a: f32, expected: i32) void {
 
 test "fixsfsi" {
     //warn("\n");
-
     test__fixsfsi(-math.f32_max, math.minInt(i32));
 
     test__fixsfsi(-0x1.FFFFFFFFFFFFFp+1023, math.minInt(i32));

std/special/compiler_rt/fixsfti_test.zig

@@ -12,7 +12,6 @@ fn test__fixsfti(a: f32, expected: i128) void {
 
 test "fixsfti" {
     //warn("\n");
-
     test__fixsfti(-math.f32_max, math.minInt(i128));
 
     test__fixsfti(-0x1.FFFFFFFFFFFFFp+1023, math.minInt(i128));

std/special/compiler_rt/fixtfdi_test.zig

@@ -12,7 +12,6 @@ fn test__fixtfdi(a: f128, expected: i64) void {
 
 test "fixtfdi" {
     //warn("\n");
-
     test__fixtfdi(-math.f128_max, math.minInt(i64));
 
     test__fixtfdi(-0x1.FFFFFFFFFFFFFp+1023, math.minInt(i64));

std/special/compiler_rt/fixtfsi_test.zig

@@ -12,7 +12,6 @@ fn test__fixtfsi(a: f128, expected: i32) void {
 
 test "fixtfsi" {
     //warn("\n");
-
     test__fixtfsi(-math.f128_max, math.minInt(i32));
 
     test__fixtfsi(-0x1.FFFFFFFFFFFFFp+1023, math.minInt(i32));

std/special/compiler_rt/fixtfti_test.zig

@@ -12,7 +12,6 @@ fn test__fixtfti(a: f128, expected: i128) void {
 
 test "fixtfti" {
     //warn("\n");
-
     test__fixtfti(-math.f128_max, math.minInt(i128));
 
     test__fixtfti(-0x1.FFFFFFFFFFFFFp+1023, math.minInt(i128));

std/special/compiler_rt/stack_probe.zig

@@ -51,7 +51,7 @@ pub nakedcc fn zig_probe_stack() void {
                 \\        ret
             );
         },
-        else => { }
+        else => {},
     }
 
     unreachable;
@@ -103,7 +103,7 @@ fn win_probe_stack_only() void {
                 \\         ret
             );
         },
-        else => { }
+        else => {},
     }
 
     unreachable;
@@ -161,7 +161,7 @@ fn win_probe_stack_adjust_sp() void {
                 \\         ret
             );
         },
-        else => { },
+        else => {},
     }
 
     unreachable;
@@ -189,7 +189,7 @@ pub nakedcc fn __chkstk() void {
     switch (builtin.arch) {
         .i386 => @inlineCall(win_probe_stack_adjust_sp),
         .x86_64 => @inlineCall(win_probe_stack_only),
-        else => unreachable
+        else => unreachable,
     }
 }
 pub nakedcc fn ___chkstk() void {

std/valgrind.zig

@@ -1,11 +1,7 @@
 const builtin = @import("builtin");
 const math = @import("index.zig").math;
 
-
+pub fn doClientRequest(default: usize, request: usize, a1: usize, a2: usize, a3: usize, a4: usize, a5: usize) usize {
-pub fn doClientRequest(default: usize, request: usize,
-        a1: usize, a2: usize, a3: usize, a4: usize, a5: usize
-    ) usize
-{
     if (!builtin.valgrind_support) {
         return default;
     }
@@ -17,7 +13,7 @@ pub fn doClientRequest(default: usize, request: usize,
                 \\ roll $29, %%edi ; roll $19, %%edi
                 \\ xchgl %%ebx,%%ebx
                             : [_] "={edx}" (-> usize)
-                : [_] "{eax}" (&[]usize{request, a1, a2, a3, a4, a5}),
+                : [_] "{eax}" (&[]usize{ request, a1, a2, a3, a4, a5 }),
                   [_] "0" (default)
                 : "cc", "memory"
             );
@@ -28,7 +24,7 @@ pub fn doClientRequest(default: usize, request: usize,
                 \\ rolq $61, %%rdi ; rolq $51, %%rdi
                 \\ xchgq %%rbx,%%rbx
                             : [_] "={rdx}" (-> usize)
-                : [_] "{rax}" (&[]usize{request, a1, a2, a3, a4, a5}),
+                : [_] "{rax}" (&[]usize{ request, a1, a2, a3, a4, a5 }),
                   [_] "0" (default)
                 : "cc", "memory"
             );
@@ -42,11 +38,10 @@ pub fn doClientRequest(default: usize, request: usize,
         // mips64
         else => {
             return default;
-        }
+        },
     }
 }
 
-
 pub const ClientRequest = extern enum {
     RunningOnValgrind = 4097,
     DiscardTranslations = 4098,
@@ -81,59 +76,39 @@ pub const ClientRequest = extern enum {
     InnerThreads = 6402,
 };
 pub fn ToolBase(base: [2]u8) u32 {
-    return (u32(base[0]&0xff) << 24) | (u32(base[1]&0xff) << 16);
+    return (u32(base[0] & 0xff) << 24) | (u32(base[1] & 0xff) << 16);
 }
 pub fn IsTool(base: [2]u8, code: usize) bool {
     return ToolBase(base) == (code & 0xffff0000);
 }
 
-fn doClientRequestExpr(default: usize, request: ClientRequest,
+fn doClientRequestExpr(default: usize, request: ClientRequest, a1: usize, a2: usize, a3: usize, a4: usize, a5: usize) usize {
-        a1: usize, a2: usize, a3: usize, a4: usize, a5: usize
+    return doClientRequest(default, @intCast(usize, @enumToInt(request)), a1, a2, a3, a4, a5);
-    ) usize
-{
-    return doClientRequest(
-        default,
-        @intCast(usize, @enumToInt(request)),
-        a1, a2, a3, a4, a5);
 }
 
-fn doClientRequestStmt(request: ClientRequest,
+fn doClientRequestStmt(request: ClientRequest, a1: usize, a2: usize, a3: usize, a4: usize, a5: usize) void {
-        a1: usize, a2: usize, a3: usize, a4: usize, a5: usize
-    ) void
-{
     _ = doClientRequestExpr(0, request, a1, a2, a3, a4, a5);
 }
 
-
-
 /// Returns the number of Valgrinds this code is running under.  That
 /// is, 0 if running natively, 1 if running under Valgrind, 2 if
 /// running under Valgrind which is running under another Valgrind,
 /// etc.
 pub fn runningOnValgrind() usize {
-    return doClientRequestExpr(0,
+    return doClientRequestExpr(0, ClientRequest.RunningOnValgrind, 0, 0, 0, 0, 0);
-        ClientRequest.RunningOnValgrind,
-        0, 0, 0, 0, 0);
 }
 
-
 /// Discard translation of code in the slice qzz.  Useful if you are debugging
 /// a JITter or some such, since it provides a way to make sure valgrind will
 /// retranslate the invalidated area.  Returns no value.
 pub fn discardTranslations(qzz: []const u8) void {
-    doClientRequestStmt(ClientRequest.DiscardTranslations,
+    doClientRequestStmt(ClientRequest.DiscardTranslations, @ptrToInt(qzz.ptr), qzz.len, 0, 0, 0);
-        @ptrToInt(qzz.ptr), qzz.len,
-        0, 0, 0);
 }
 
-
 pub fn innerThreads(qzz: [*]u8) void {
-    doClientRequestStmt(ClientRequest.InnerThreads,
+    doClientRequestStmt(ClientRequest.InnerThreads, qzz, 0, 0, 0, 0);
-        qzz,
-        0, 0, 0, 0);
 }
 
-
 //pub fn printf(format: [*]const u8, args: ...) usize {
 //    return doClientRequestExpr(0,
 //        ClientRequest.PrintfValistByRef,
@@ -141,7 +116,6 @@ pub fn innerThreads(qzz: [*]u8) void {
 //        0, 0, 0);
 //}
 
-
 //pub fn printfBacktrace(format: [*]const u8, args: ...) usize {
 //    return doClientRequestExpr(0,
 //        ClientRequest.PrintfBacktraceValistByRef,
@@ -149,161 +123,105 @@ pub fn innerThreads(qzz: [*]u8) void {
 //        0, 0, 0);
 //}
 
-
+pub fn nonSIMDCall0(func: fn (usize) usize) usize {
-pub fn nonSIMDCall0(func: fn(usize) usize) usize {
+    return doClientRequestExpr(0, ClientRequest.ClientCall0, @ptrToInt(func), 0, 0, 0, 0);
-    return doClientRequestExpr(0,
-        ClientRequest.ClientCall0,
-        @ptrToInt(func),
-        0, 0, 0, 0);
 }
 
-pub fn nonSIMDCall1(func: fn(usize, usize) usize, a1: usize) usize {
+pub fn nonSIMDCall1(func: fn (usize, usize) usize, a1: usize) usize {
-    return doClientRequestExpr(0,
+    return doClientRequestExpr(0, ClientRequest.ClientCall1, @ptrToInt(func), a1, 0, 0, 0);
-        ClientRequest.ClientCall1,
-        @ptrToInt(func), a1,
-        0, 0, 0);
 }
 
-pub fn nonSIMDCall2(func: fn(usize, usize, usize) usize,
+pub fn nonSIMDCall2(func: fn (usize, usize, usize) usize, a1: usize, a2: usize) usize {
-    a1: usize, a2: usize) usize
+    return doClientRequestExpr(0, ClientRequest.ClientCall2, @ptrToInt(func), a1, a2, 0, 0);
-{
-    return doClientRequestExpr(0,
-        ClientRequest.ClientCall2,
-        @ptrToInt(func), a1, a2,
-        0, 0);
 }
 
-pub fn nonSIMDCall3(func: fn(usize, usize, usize, usize) usize,
+pub fn nonSIMDCall3(func: fn (usize, usize, usize, usize) usize, a1: usize, a2: usize, a3: usize) usize {
-    a1: usize, a2: usize, a3: usize) usize
+    return doClientRequestExpr(0, ClientRequest.ClientCall3, @ptrToInt(func), a1, a2, a3, 0);
-{
-    return doClientRequestExpr(0,
-        ClientRequest.ClientCall3,
-        @ptrToInt(func), a1, a2, a3,
-        0);
 }
 
-
 /// Counts the number of errors that have been recorded by a tool.  Nb:
 /// the tool must record the errors with VG_(maybe_record_error)() or
 /// VG_(unique_error)() for them to be counted.
 pub fn countErrors() usize {
     return doClientRequestExpr(0, // default return
-        ClientRequest.CountErrors,
+        ClientRequest.CountErrors, 0, 0, 0, 0, 0);
-        0, 0, 0, 0, 0);
 }
 
-
 pub fn mallocLikeBlock(mem: []u8, rzB: usize, is_zeroed: bool) void {
-    doClientRequestStmt(ClientRequest.MalloclikeBlock,
+    doClientRequestStmt(ClientRequest.MalloclikeBlock, @ptrToInt(mem.ptr), mem.len, rzB, @boolToInt(is_zeroed), 0);
-        @ptrToInt(mem.ptr), mem.len, rzB, @boolToInt(is_zeroed),
-        0);
 }
 
-
 pub fn resizeInPlaceBlock(oldmem: []u8, newsize: usize, rzB: usize) void {
-    doClientRequestStmt(ClientRequest.ResizeinplaceBlock,
+    doClientRequestStmt(ClientRequest.ResizeinplaceBlock, @ptrToInt(oldmem.ptr), oldmem.len, newsize, rzB, 0);
-        @ptrToInt(oldmem.ptr), oldmem.len, newsize, rzB,
-        0);
 }
 
-
 pub fn freeLikeBlock(addr: [*]u8, rzB: usize) void {
-    doClientRequestStmt(ClientRequest.FreelikeBlock,
+    doClientRequestStmt(ClientRequest.FreelikeBlock, @ptrToInt(addr), rzB, 0, 0, 0);
-        @ptrToInt(addr), rzB,
-        0, 0, 0);
 }
 
-
 /// Create a memory pool.
 pub const MempoolFlags = extern enum {
     AutoFree = 1,
     MetaPool = 2,
 };
 pub fn createMempool(pool: [*]u8, rzB: usize, is_zeroed: bool, flags: usize) void {
-    doClientRequestStmt(ClientRequest.CreateMempool,
+    doClientRequestStmt(ClientRequest.CreateMempool, @ptrToInt(pool), rzB, @boolToInt(is_zeroed), flags, 0);
-        @ptrToInt(pool), rzB, @boolToInt(is_zeroed), flags,
-        0);
 }
 
 /// Destroy a memory pool.
 pub fn destroyMempool(pool: [*]u8) void {
-    doClientRequestStmt(ClientRequest.DestroyMempool,
+    doClientRequestStmt(ClientRequest.DestroyMempool, pool, 0, 0, 0, 0);
-        pool,
-        0, 0, 0, 0);
 }
 
-
 /// Associate a piece of memory with a memory pool.
 pub fn mempoolAlloc(pool: [*]u8, mem: []u8) void {
-    doClientRequestStmt(ClientRequest.MempoolAlloc,
+    doClientRequestStmt(ClientRequest.MempoolAlloc, @ptrToInt(pool), @ptrToInt(mem.ptr), mem.len, 0, 0);
-        @ptrToInt(pool), @ptrToInt(mem.ptr), mem.len,
-        0, 0);
 }
 
 /// Disassociate a piece of memory from a memory pool.
 pub fn mempoolFree(pool: [*]u8, addr: [*]u8) void {
-    doClientRequestStmt(ClientRequest.MempoolFree,
+    doClientRequestStmt(ClientRequest.MempoolFree, @ptrToInt(pool), @ptrToInt(addr), 0, 0, 0);
-        @ptrToInt(pool), @ptrToInt(addr),
-        0, 0, 0);
 }
 
 /// Disassociate any pieces outside a particular range.
 pub fn mempoolTrim(pool: [*]u8, mem: []u8) void {
-    doClientRequestStmt(ClientRequest.MempoolTrim,
+    doClientRequestStmt(ClientRequest.MempoolTrim, @ptrToInt(pool), @ptrToInt(mem.ptr), mem.len, 0, 0);
-        @ptrToInt(pool), @ptrToInt(mem.ptr), mem.len,
-        0, 0);
 }
 
 /// Resize and/or move a piece associated with a memory pool.
 pub fn moveMempool(poolA: [*]u8, poolB: [*]u8) void {
-    doClientRequestStmt(ClientRequest.MoveMempool,
+    doClientRequestStmt(ClientRequest.MoveMempool, @ptrToInt(poolA), @ptrToInt(poolB), 0, 0, 0);
-        @ptrToInt(poolA), @ptrToInt(poolB),
-        0, 0, 0);
 }
 
 /// Resize and/or move a piece associated with a memory pool.
 pub fn mempoolChange(pool: [*]u8, addrA: [*]u8, mem: []u8) void {
-    doClientRequestStmt(ClientRequest.MempoolChange,
+    doClientRequestStmt(ClientRequest.MempoolChange, @ptrToInt(pool), @ptrToInt(addrA), @ptrToInt(mem.ptr), mem.len, 0);
-        @ptrToInt(pool), @ptrToInt(addrA), @ptrToInt(mem.ptr), mem.len,
-        0);
 }
 
 /// Return if a mempool exists.
 pub fn mempoolExists(pool: [*]u8) bool {
-    return doClientRequestExpr(0,
+    return doClientRequestExpr(0, ClientRequest.MempoolExists, @ptrToInt(pool), 0, 0, 0, 0) != 0;
-        ClientRequest.MempoolExists,
-        @ptrToInt(pool),
-        0, 0, 0, 0) != 0;
 }
 
-
 /// Mark a piece of memory as being a stack. Returns a stack id.
 /// start is the lowest addressable stack byte, end is the highest
 /// addressable stack byte.
 pub fn stackRegister(stack: []u8) usize {
-    return doClientRequestExpr(0,
+    return doClientRequestExpr(0, ClientRequest.StackRegister, @ptrToInt(stack.ptr), @ptrToInt(stack.ptr) + stack.len, 0, 0, 0);
-        ClientRequest.StackRegister,
-        @ptrToInt(stack.ptr), @ptrToInt(stack.ptr) + stack.len,
-        0, 0, 0);
 }
 
 /// Unmark the piece of memory associated with a stack id as being a stack.
 pub fn stackDeregister(id: usize) void {
-    doClientRequestStmt(ClientRequest.StackDeregister,
+    doClientRequestStmt(ClientRequest.StackDeregister, id, 0, 0, 0, 0);
-        id,
-        0, 0, 0, 0);
 }
 
 /// Change the start and end address of the stack id.
 /// start is the new lowest addressable stack byte, end is the new highest
 /// addressable stack byte.
 pub fn stackChange(id: usize, newstack: []u8) void {
-    doClientRequestStmt(ClientRequest.StackChange,
+    doClientRequestStmt(ClientRequest.StackChange, id, @ptrToInt(newstack.ptr), @ptrToInt(newstack.ptr) + newstack.len, 0, 0);
-        id, @ptrToInt(newstack.ptr), @ptrToInt(newstack.ptr) + newstack.len,
-        0, 0);
 }
 
-
 // Load PDB debug info for Wine PE image_map.
 // pub fn loadPdbDebuginfo(fd, ptr, total_size, delta) void {
 //     doClientRequestStmt(ClientRequest.LoadPdbDebuginfo,
@@ -311,19 +229,14 @@ pub fn stackChange(id: usize, newstack: []u8) void {
 //         0);
 // }
 
-
 /// Map a code address to a source file name and line number.  buf64
 /// must point to a 64-byte buffer in the caller's address space. The
 /// result will be dumped in there and is guaranteed to be zero
 /// terminated.  If no info is found, the first byte is set to zero.
 pub fn mapIpToSrcloc(addr: *const u8, buf64: [64]u8) usize {
-    return doClientRequestExpr(0,
+    return doClientRequestExpr(0, ClientRequest.MapIpToSrcloc, @ptrToInt(addr), @ptrToInt(&buf64[0]), 0, 0, 0);
-        ClientRequest.MapIpToSrcloc,
-        @ptrToInt(addr), @ptrToInt(&buf64[0]),
-        0, 0, 0);
 }
 
-
 /// Disable error reporting for this thread.  Behaves in a stack like
 /// way, so you can safely call this multiple times provided that
 /// enableErrorReporting() is called the same number of times
@@ -333,31 +246,22 @@ pub fn mapIpToSrcloc(addr: *const u8, buf64: [64]u8) usize {
 /// reporting.  Child threads do not inherit this setting from their
 /// parents -- they are always created with reporting enabled.
 pub fn disableErrorReporting() void {
-    doClientRequestStmt(ClientRequest.ChangeErrDisablement,
+    doClientRequestStmt(ClientRequest.ChangeErrDisablement, 1, 0, 0, 0, 0);
-        1,
-        0, 0, 0, 0);
 }
 
 /// Re-enable error reporting, (see disableErrorReporting())
 pub fn enableErrorReporting() void {
-    doClientRequestStmt(ClientRequest.ChangeErrDisablement,
+    doClientRequestStmt(ClientRequest.ChangeErrDisablement, math.maxInt(usize), 0, 0, 0, 0);
-        math.maxInt(usize),
-        0, 0, 0, 0);
 }
 
-
 /// Execute a monitor command from the client program.
 /// If a connection is opened with GDB, the output will be sent
 /// according to the output mode set for vgdb.
 /// If no connection is opened, output will go to the log output.
 /// Returns 1 if command not recognised, 0 otherwise.
 pub fn monitorCommand(command: [*]u8) bool {
-    return doClientRequestExpr(0,
+    return doClientRequestExpr(0, ClientRequest.GdbMonitorCommand, @ptrToInt(command.ptr), 0, 0, 0, 0) != 0;
-        ClientRequest.GdbMonitorCommand,
-        @ptrToInt(command.ptr),
-        0, 0, 0, 0) != 0;
 }
 
-
 pub const memcheck = @import("memcheck.zig");
 pub const callgrind = @import("callgrind.zig");

std/zig.zig

@@ -13,4 +13,3 @@ test "std.zig tests" {
     _ = @import("zig/tokenizer.zig");
     _ = @import("zig/parse_string_literal.zig");
 }
-