authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-12-02 10:20:05+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-02 12:24:15-05:00
log5eaacf1ce9b2b99f1f29bf51a663291329a1793e
treed64ba2a49b7ce2c283f70d7dd997c20581b18573
parent16dc86a49e1e92d036d196be40a4fc073314bcf7

windows: use array of tmp bufs as backing store for input memory to ntdll

1 files changed, 11 insertions(+), 14 deletions(-)

lib/std/zig/system/windows.zig+11-14
...@@ -1,5 +1,6 @@...@@ -1,5 +1,6 @@
1const std = @import("std");1const std = @import("std");
2const builtin = @import("builtin");2const builtin = @import("builtin");
3const assert = std.debug.assert;
3const mem = std.mem;4const mem = std.mem;
4const Target = std.Target;5const Target = std.Target;
56
...@@ -89,6 +90,8 @@ fn getCpuInfoFromRegistry(core: usize, args: anytype) !void {...@@ -89,6 +90,8 @@ fn getCpuInfoFromRegistry(core: usize, args: anytype) !void {
89 .DefaultLength = 0,90 .DefaultLength = 0,
90 };91 };
9192
93 var tmp_bufs: [fields_info.len][max_value_len]u8 align(@alignOf(std.os.windows.UNICODE_STRING)) = undefined;
94
92 inline for (fields_info) |field, i| {95 inline for (fields_info) |field, i| {
93 const ctx: *anyopaque = blk: {96 const ctx: *anyopaque = blk: {
94 switch (@field(args, field.name).value_type) {97 switch (@field(args, field.name).value_type) {
...@@ -96,26 +99,20 @@ fn getCpuInfoFromRegistry(core: usize, args: anytype) !void {...@@ -96,26 +99,20 @@ fn getCpuInfoFromRegistry(core: usize, args: anytype) !void {
96 REG.EXPAND_SZ,99 REG.EXPAND_SZ,
97 REG.MULTI_SZ,100 REG.MULTI_SZ,
98 => {101 => {
99 var buf: [max_value_len / 2]u16 = undefined;102 comptime assert(@sizeOf(std.os.windows.UNICODE_STRING) % 2 == 0);
100 var unicode = std.os.windows.UNICODE_STRING{103 const unicode = @ptrCast(*std.os.windows.UNICODE_STRING, &tmp_bufs[i]);
104 unicode.* = .{
101 .Length = 0,105 .Length = 0,
102 .MaximumLength = max_value_len,106 .MaximumLength = max_value_len - @sizeOf(std.os.windows.UNICODE_STRING),
103 .Buffer = &buf,107 .Buffer = @ptrCast([*]u16, tmp_bufs[i][@sizeOf(std.os.windows.UNICODE_STRING)..]),
104 };108 };
105 break :blk &unicode;109 break :blk unicode;
106 },110 },
107111
108 REG.DWORD,112 REG.DWORD,
109 REG.DWORD_BIG_ENDIAN,113 REG.DWORD_BIG_ENDIAN,
110 => {114 REG.QWORD,
111 var buf: [4]u8 = undefined;115 => break :blk &tmp_bufs[i],
112 break :blk &buf;
113 },
114
115 REG.QWORD => {
116 var buf: [8]u8 = undefined;
117 break :blk &buf;
118 },
119116
120 else => unreachable,117 else => unreachable,
121 }118 }