authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-07 14:53:48-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-07 22:43:53-07:00
loge97a0ffb60b8137bd3eed88069c6cf6dbe1f9319
treea06da6ec5f76324ab8725e4839e3a266df1d7c7e
parentf2ad3bcc1c7ad18ed8e2d9c919be45885e224bfc

std.Build.Step.CheckObject: mostly revert to master branch

the updated code to use new std.io API is crashing

1 files changed, 634 insertions(+), 536 deletions(-)

lib/std/Build/Step/CheckObject.zig+634-536
......@@ -36,7 +36,7 @@ pub fn create(
3636 .makeFn = make,
3737 }),
3838 .source = source.dupe(owner),
39 .checks = .init(gpa),
39 .checks = std.ArrayList(Check).init(gpa),
4040 .obj_format = obj_format,
4141 };
4242 check_object.source.addStepDependencies(&check_object.step);
......@@ -75,7 +75,7 @@ const Action = struct {
7575 b: *std.Build,
7676 step: *Step,
7777 haystack: []const u8,
78 global_vars: *std.StringHashMap(u64),
78 global_vars: anytype,
7979 ) !bool {
8080 assert(act.tag == .extract);
8181 const hay = mem.trim(u8, haystack, " ");
......@@ -154,11 +154,11 @@ const Action = struct {
154154 /// Will return true if the `phrase` is correctly parsed into an RPN program and
155155 /// its reduced, computed value compares using `op` with the expected value, either
156156 /// a literal or another extracted variable.
157 fn computeCmp(act: Action, b: *std.Build, step: *Step, global_vars: std.StringHashMap(u64)) !bool {
157 fn computeCmp(act: Action, b: *std.Build, step: *Step, global_vars: anytype) !bool {
158158 const gpa = step.owner.allocator;
159159 const phrase = act.phrase.resolve(b, step);
160 var op_stack: std.ArrayList(enum { add, sub, mod, mul }) = .init(gpa);
161 var values: std.ArrayList(u64) = .init(gpa);
160 var op_stack = std.ArrayList(enum { add, sub, mod, mul }).init(gpa);
161 var values = std.ArrayList(u64).init(gpa);
162162
163163 var it = mem.tokenizeScalar(u8, phrase, ' ');
164164 while (it.next()) |next| {
......@@ -230,11 +230,11 @@ const ComputeCompareExpected = struct {
230230 literal: u64,
231231 },
232232
233 pub fn format(value: ComputeCompareExpected, bw: *Writer) Writer.Error!void {
234 try bw.print("{s} ", .{@tagName(value.op)});
233 pub fn format(value: ComputeCompareExpected, w: *Writer) Writer.Error!void {
234 try w.print("{t} ", .{value.op});
235235 switch (value.value) {
236 .variable => |name| try bw.writeAll(name),
237 .literal => |x| try bw.print("{x}", .{x}),
236 .variable => |name| try w.writeAll(name),
237 .literal => |x| try w.print("{x}", .{x}),
238238 }
239239 }
240240};
......@@ -242,63 +242,56 @@ const ComputeCompareExpected = struct {
242242const Check = struct {
243243 kind: Kind,
244244 payload: Payload,
245 allocator: Allocator,
246 data: std.ArrayListUnmanaged(u8),
247 actions: std.ArrayListUnmanaged(Action),
245 data: std.ArrayList(u8),
246 actions: std.ArrayList(Action),
248247
249248 fn create(allocator: Allocator, kind: Kind) Check {
250249 return .{
251250 .kind = kind,
252251 .payload = .{ .none = {} },
253 .allocator = allocator,
254 .data = .empty,
255 .actions = .empty,
252 .data = std.ArrayList(u8).init(allocator),
253 .actions = std.ArrayList(Action).init(allocator),
256254 };
257255 }
258256
259 fn dumpSection(gpa: Allocator, name: [:0]const u8) Check {
260 var check = Check.create(gpa, .dump_section);
257 fn dumpSection(allocator: Allocator, name: [:0]const u8) Check {
258 var check = Check.create(allocator, .dump_section);
261259 const off: u32 = @intCast(check.data.items.len);
262 check.data.print(gpa, "{s}\x00", .{name}) catch @panic("OOM");
260 check.data.writer().print("{s}\x00", .{name}) catch @panic("OOM");
263261 check.payload = .{ .dump_section = off };
264262 return check;
265263 }
266264
267265 fn extract(check: *Check, phrase: SearchPhrase) void {
268 const gpa = check.allocator;
269 check.actions.append(gpa, .{
266 check.actions.append(.{
270267 .tag = .extract,
271268 .phrase = phrase,
272269 }) catch @panic("OOM");
273270 }
274271
275272 fn exact(check: *Check, phrase: SearchPhrase) void {
276 const gpa = check.allocator;
277 check.actions.append(gpa, .{
273 check.actions.append(.{
278274 .tag = .exact,
279275 .phrase = phrase,
280276 }) catch @panic("OOM");
281277 }
282278
283279 fn contains(check: *Check, phrase: SearchPhrase) void {
284 const gpa = check.allocator;
285 check.actions.append(gpa, .{
280 check.actions.append(.{
286281 .tag = .contains,
287282 .phrase = phrase,
288283 }) catch @panic("OOM");
289284 }
290285
291286 fn notPresent(check: *Check, phrase: SearchPhrase) void {
292 const gpa = check.allocator;
293 check.actions.append(gpa, .{
287 check.actions.append(.{
294288 .tag = .not_present,
295289 .phrase = phrase,
296290 }) catch @panic("OOM");
297291 }
298292
299293 fn computeCmp(check: *Check, phrase: SearchPhrase, expected: ComputeCompareExpected) void {
300 const gpa = check.allocator;
301 check.actions.append(gpa, .{
294 check.actions.append(.{
302295 .tag = .compute_cmp,
303296 .phrase = phrase,
304297 .expected = expected,
......@@ -751,14 +744,14 @@ const MachODumper = struct {
751744 },
752745 .SYMTAB => {
753746 const lc = cmd.cast(macho.symtab_command).?;
754 const symtab = @as([*]align(1) const macho.nlist_64, @ptrCast(ctx.data[lc.symoff..].ptr))[0..lc.nsyms];
747 const symtab = @as([*]align(1) const macho.nlist_64, @ptrCast(ctx.data.ptr + lc.symoff))[0..lc.nsyms];
755748 const strtab = ctx.data[lc.stroff..][0..lc.strsize];
756749 try ctx.symtab.appendUnalignedSlice(ctx.gpa, symtab);
757750 try ctx.strtab.appendSlice(ctx.gpa, strtab);
758751 },
759752 .DYSYMTAB => {
760753 const lc = cmd.cast(macho.dysymtab_command).?;
761 const indexes = @as([*]align(1) const u32, @ptrCast(ctx.data[lc.indirectsymoff..].ptr))[0..lc.nindirectsyms];
754 const indexes = @as([*]align(1) const u32, @ptrCast(ctx.data.ptr + lc.indirectsymoff))[0..lc.nindirectsyms];
762755 try ctx.indsymtab.appendUnalignedSlice(ctx.gpa, indexes);
763756 },
764757 .LOAD_DYLIB,
......@@ -776,7 +769,7 @@ const MachODumper = struct {
776769
777770 fn getString(ctx: ObjectContext, off: u32) [:0]const u8 {
778771 assert(off < ctx.strtab.items.len);
779 return mem.sliceTo(@as([*:0]const u8, @ptrCast(ctx.strtab.items[off..].ptr)), 0);
772 return mem.sliceTo(@as([*:0]const u8, @ptrCast(ctx.strtab.items.ptr + off)), 0);
780773 }
781774
782775 fn getLoadCommandIterator(ctx: ObjectContext) macho.LoadCommandIterator {
......@@ -806,7 +799,7 @@ const MachODumper = struct {
806799 return null;
807800 }
808801
809 fn dumpHeader(hdr: macho.mach_header_64, bw: *Writer) !void {
802 fn dumpHeader(hdr: macho.mach_header_64, writer: anytype) !void {
810803 const cputype = switch (hdr.cputype) {
811804 macho.CPU_TYPE_ARM64 => "ARM64",
812805 macho.CPU_TYPE_X86_64 => "X86_64",
......@@ -827,7 +820,7 @@ const MachODumper = struct {
827820 else => "Unknown",
828821 };
829822
830 try bw.print(
823 try writer.print(
831824 \\header
832825 \\cputype {s}
833826 \\filetype {s}
......@@ -842,41 +835,41 @@ const MachODumper = struct {
842835 });
843836
844837 if (hdr.flags > 0) {
845 if (hdr.flags & macho.MH_NOUNDEFS != 0) try bw.writeAll(" NOUNDEFS");
846 if (hdr.flags & macho.MH_INCRLINK != 0) try bw.writeAll(" INCRLINK");
847 if (hdr.flags & macho.MH_DYLDLINK != 0) try bw.writeAll(" DYLDLINK");
848 if (hdr.flags & macho.MH_BINDATLOAD != 0) try bw.writeAll(" BINDATLOAD");
849 if (hdr.flags & macho.MH_PREBOUND != 0) try bw.writeAll(" PREBOUND");
850 if (hdr.flags & macho.MH_SPLIT_SEGS != 0) try bw.writeAll(" SPLIT_SEGS");
851 if (hdr.flags & macho.MH_LAZY_INIT != 0) try bw.writeAll(" LAZY_INIT");
852 if (hdr.flags & macho.MH_TWOLEVEL != 0) try bw.writeAll(" TWOLEVEL");
853 if (hdr.flags & macho.MH_FORCE_FLAT != 0) try bw.writeAll(" FORCE_FLAT");
854 if (hdr.flags & macho.MH_NOMULTIDEFS != 0) try bw.writeAll(" NOMULTIDEFS");
855 if (hdr.flags & macho.MH_NOFIXPREBINDING != 0) try bw.writeAll(" NOFIXPREBINDING");
856 if (hdr.flags & macho.MH_PREBINDABLE != 0) try bw.writeAll(" PREBINDABLE");
857 if (hdr.flags & macho.MH_ALLMODSBOUND != 0) try bw.writeAll(" ALLMODSBOUND");
858 if (hdr.flags & macho.MH_SUBSECTIONS_VIA_SYMBOLS != 0) try bw.writeAll(" SUBSECTIONS_VIA_SYMBOLS");
859 if (hdr.flags & macho.MH_CANONICAL != 0) try bw.writeAll(" CANONICAL");
860 if (hdr.flags & macho.MH_WEAK_DEFINES != 0) try bw.writeAll(" WEAK_DEFINES");
861 if (hdr.flags & macho.MH_BINDS_TO_WEAK != 0) try bw.writeAll(" BINDS_TO_WEAK");
862 if (hdr.flags & macho.MH_ALLOW_STACK_EXECUTION != 0) try bw.writeAll(" ALLOW_STACK_EXECUTION");
863 if (hdr.flags & macho.MH_ROOT_SAFE != 0) try bw.writeAll(" ROOT_SAFE");
864 if (hdr.flags & macho.MH_SETUID_SAFE != 0) try bw.writeAll(" SETUID_SAFE");
865 if (hdr.flags & macho.MH_NO_REEXPORTED_DYLIBS != 0) try bw.writeAll(" NO_REEXPORTED_DYLIBS");
866 if (hdr.flags & macho.MH_PIE != 0) try bw.writeAll(" PIE");
867 if (hdr.flags & macho.MH_DEAD_STRIPPABLE_DYLIB != 0) try bw.writeAll(" DEAD_STRIPPABLE_DYLIB");
868 if (hdr.flags & macho.MH_HAS_TLV_DESCRIPTORS != 0) try bw.writeAll(" HAS_TLV_DESCRIPTORS");
869 if (hdr.flags & macho.MH_NO_HEAP_EXECUTION != 0) try bw.writeAll(" NO_HEAP_EXECUTION");
870 if (hdr.flags & macho.MH_APP_EXTENSION_SAFE != 0) try bw.writeAll(" APP_EXTENSION_SAFE");
871 if (hdr.flags & macho.MH_NLIST_OUTOFSYNC_WITH_DYLDINFO != 0) try bw.writeAll(" NLIST_OUTOFSYNC_WITH_DYLDINFO");
838 if (hdr.flags & macho.MH_NOUNDEFS != 0) try writer.writeAll(" NOUNDEFS");
839 if (hdr.flags & macho.MH_INCRLINK != 0) try writer.writeAll(" INCRLINK");
840 if (hdr.flags & macho.MH_DYLDLINK != 0) try writer.writeAll(" DYLDLINK");
841 if (hdr.flags & macho.MH_BINDATLOAD != 0) try writer.writeAll(" BINDATLOAD");
842 if (hdr.flags & macho.MH_PREBOUND != 0) try writer.writeAll(" PREBOUND");
843 if (hdr.flags & macho.MH_SPLIT_SEGS != 0) try writer.writeAll(" SPLIT_SEGS");
844 if (hdr.flags & macho.MH_LAZY_INIT != 0) try writer.writeAll(" LAZY_INIT");
845 if (hdr.flags & macho.MH_TWOLEVEL != 0) try writer.writeAll(" TWOLEVEL");
846 if (hdr.flags & macho.MH_FORCE_FLAT != 0) try writer.writeAll(" FORCE_FLAT");
847 if (hdr.flags & macho.MH_NOMULTIDEFS != 0) try writer.writeAll(" NOMULTIDEFS");
848 if (hdr.flags & macho.MH_NOFIXPREBINDING != 0) try writer.writeAll(" NOFIXPREBINDING");
849 if (hdr.flags & macho.MH_PREBINDABLE != 0) try writer.writeAll(" PREBINDABLE");
850 if (hdr.flags & macho.MH_ALLMODSBOUND != 0) try writer.writeAll(" ALLMODSBOUND");
851 if (hdr.flags & macho.MH_SUBSECTIONS_VIA_SYMBOLS != 0) try writer.writeAll(" SUBSECTIONS_VIA_SYMBOLS");
852 if (hdr.flags & macho.MH_CANONICAL != 0) try writer.writeAll(" CANONICAL");
853 if (hdr.flags & macho.MH_WEAK_DEFINES != 0) try writer.writeAll(" WEAK_DEFINES");
854 if (hdr.flags & macho.MH_BINDS_TO_WEAK != 0) try writer.writeAll(" BINDS_TO_WEAK");
855 if (hdr.flags & macho.MH_ALLOW_STACK_EXECUTION != 0) try writer.writeAll(" ALLOW_STACK_EXECUTION");
856 if (hdr.flags & macho.MH_ROOT_SAFE != 0) try writer.writeAll(" ROOT_SAFE");
857 if (hdr.flags & macho.MH_SETUID_SAFE != 0) try writer.writeAll(" SETUID_SAFE");
858 if (hdr.flags & macho.MH_NO_REEXPORTED_DYLIBS != 0) try writer.writeAll(" NO_REEXPORTED_DYLIBS");
859 if (hdr.flags & macho.MH_PIE != 0) try writer.writeAll(" PIE");
860 if (hdr.flags & macho.MH_DEAD_STRIPPABLE_DYLIB != 0) try writer.writeAll(" DEAD_STRIPPABLE_DYLIB");
861 if (hdr.flags & macho.MH_HAS_TLV_DESCRIPTORS != 0) try writer.writeAll(" HAS_TLV_DESCRIPTORS");
862 if (hdr.flags & macho.MH_NO_HEAP_EXECUTION != 0) try writer.writeAll(" NO_HEAP_EXECUTION");
863 if (hdr.flags & macho.MH_APP_EXTENSION_SAFE != 0) try writer.writeAll(" APP_EXTENSION_SAFE");
864 if (hdr.flags & macho.MH_NLIST_OUTOFSYNC_WITH_DYLDINFO != 0) try writer.writeAll(" NLIST_OUTOFSYNC_WITH_DYLDINFO");
872865 }
873866
874 try bw.writeByte('\n');
867 try writer.writeByte('\n');
875868 }
876869
877 fn dumpLoadCommand(lc: macho.LoadCommandIterator.LoadCommand, index: usize, bw: *Writer) !void {
870 fn dumpLoadCommand(lc: macho.LoadCommandIterator.LoadCommand, index: usize, writer: anytype) !void {
878871 // print header first
879 try bw.print(
872 try writer.print(
880873 \\LC {d}
881874 \\cmd {s}
882875 \\cmdsize {d}
......@@ -885,8 +878,8 @@ const MachODumper = struct {
885878 switch (lc.cmd()) {
886879 .SEGMENT_64 => {
887880 const seg = lc.cast(macho.segment_command_64).?;
888 try bw.writeByte('\n');
889 try bw.print(
881 try writer.writeByte('\n');
882 try writer.print(
890883 \\segname {s}
891884 \\vmaddr {x}
892885 \\vmsize {x}
......@@ -901,8 +894,8 @@ const MachODumper = struct {
901894 });
902895
903896 for (lc.getSections()) |sect| {
904 try bw.writeByte('\n');
905 try bw.print(
897 try writer.writeByte('\n');
898 try writer.print(
906899 \\sectname {s}
907900 \\addr {x}
908901 \\size {x}
......@@ -924,8 +917,8 @@ const MachODumper = struct {
924917 .REEXPORT_DYLIB,
925918 => {
926919 const dylib = lc.cast(macho.dylib_command).?;
927 try bw.writeByte('\n');
928 try bw.print(
920 try writer.writeByte('\n');
921 try writer.print(
929922 \\name {s}
930923 \\timestamp {d}
931924 \\current version {x}
......@@ -940,16 +933,16 @@ const MachODumper = struct {
940933
941934 .MAIN => {
942935 const main = lc.cast(macho.entry_point_command).?;
943 try bw.writeByte('\n');
944 try bw.print(
936 try writer.writeByte('\n');
937 try writer.print(
945938 \\entryoff {x}
946939 \\stacksize {x}
947940 , .{ main.entryoff, main.stacksize });
948941 },
949942
950943 .RPATH => {
951 try bw.writeByte('\n');
952 try bw.print(
944 try writer.writeByte('\n');
945 try writer.print(
953946 \\path {s}
954947 , .{
955948 lc.getRpathPathName(),
......@@ -958,8 +951,8 @@ const MachODumper = struct {
958951
959952 .UUID => {
960953 const uuid = lc.cast(macho.uuid_command).?;
961 try bw.writeByte('\n');
962 try bw.print("uuid {x}", .{&uuid.uuid});
954 try writer.writeByte('\n');
955 try writer.print("uuid {x}", .{&uuid.uuid});
963956 },
964957
965958 .DATA_IN_CODE,
......@@ -967,8 +960,8 @@ const MachODumper = struct {
967960 .CODE_SIGNATURE,
968961 => {
969962 const llc = lc.cast(macho.linkedit_data_command).?;
970 try bw.writeByte('\n');
971 try bw.print(
963 try writer.writeByte('\n');
964 try writer.print(
972965 \\dataoff {x}
973966 \\datasize {x}
974967 , .{ llc.dataoff, llc.datasize });
......@@ -976,8 +969,8 @@ const MachODumper = struct {
976969
977970 .DYLD_INFO_ONLY => {
978971 const dlc = lc.cast(macho.dyld_info_command).?;
979 try bw.writeByte('\n');
980 try bw.print(
972 try writer.writeByte('\n');
973 try writer.print(
981974 \\rebaseoff {x}
982975 \\rebasesize {x}
983976 \\bindoff {x}
......@@ -1004,8 +997,8 @@ const MachODumper = struct {
1004997
1005998 .SYMTAB => {
1006999 const slc = lc.cast(macho.symtab_command).?;
1007 try bw.writeByte('\n');
1008 try bw.print(
1000 try writer.writeByte('\n');
1001 try writer.print(
10091002 \\symoff {x}
10101003 \\nsyms {x}
10111004 \\stroff {x}
......@@ -1020,8 +1013,8 @@ const MachODumper = struct {
10201013
10211014 .DYSYMTAB => {
10221015 const dlc = lc.cast(macho.dysymtab_command).?;
1023 try bw.writeByte('\n');
1024 try bw.print(
1016 try writer.writeByte('\n');
1017 try writer.print(
10251018 \\ilocalsym {x}
10261019 \\nlocalsym {x}
10271020 \\iextdefsym {x}
......@@ -1044,8 +1037,8 @@ const MachODumper = struct {
10441037
10451038 .BUILD_VERSION => {
10461039 const blc = lc.cast(macho.build_version_command).?;
1047 try bw.writeByte('\n');
1048 try bw.print(
1040 try writer.writeByte('\n');
1041 try writer.print(
10491042 \\platform {s}
10501043 \\minos {d}.{d}.{d}
10511044 \\sdk {d}.{d}.{d}
......@@ -1061,12 +1054,12 @@ const MachODumper = struct {
10611054 blc.ntools,
10621055 });
10631056 for (lc.getBuildVersionTools()) |tool| {
1064 try bw.writeByte('\n');
1057 try writer.writeByte('\n');
10651058 switch (tool.tool) {
1066 .CLANG, .SWIFT, .LD, .LLD, .ZIG => try bw.print("tool {s}\n", .{@tagName(tool.tool)}),
1067 else => |x| try bw.print("tool {d}\n", .{@intFromEnum(x)}),
1059 .CLANG, .SWIFT, .LD, .LLD, .ZIG => try writer.print("tool {s}\n", .{@tagName(tool.tool)}),
1060 else => |x| try writer.print("tool {d}\n", .{@intFromEnum(x)}),
10681061 }
1069 try bw.print(
1062 try writer.print(
10701063 \\version {d}.{d}.{d}
10711064 , .{
10721065 tool.version >> 16,
......@@ -1082,8 +1075,8 @@ const MachODumper = struct {
10821075 .VERSION_MIN_TVOS,
10831076 => {
10841077 const vlc = lc.cast(macho.version_min_command).?;
1085 try bw.writeByte('\n');
1086 try bw.print(
1078 try writer.writeByte('\n');
1079 try writer.print(
10871080 \\version {d}.{d}.{d}
10881081 \\sdk {d}.{d}.{d}
10891082 , .{
......@@ -1100,8 +1093,8 @@ const MachODumper = struct {
11001093 }
11011094 }
11021095
1103 fn dumpSymtab(ctx: ObjectContext, bw: *Writer) !void {
1104 try bw.writeAll(symtab_label ++ "\n");
1096 fn dumpSymtab(ctx: ObjectContext, writer: anytype) !void {
1097 try writer.writeAll(symtab_label ++ "\n");
11051098
11061099 for (ctx.symtab.items) |sym| {
11071100 const sym_name = ctx.getString(sym.n_strx);
......@@ -1116,32 +1109,32 @@ const MachODumper = struct {
11161109 macho.N_STSYM => "STSYM",
11171110 else => "UNKNOWN STAB",
11181111 };
1119 try bw.print("{x}", .{sym.n_value});
1112 try writer.print("{x}", .{sym.n_value});
11201113 if (sym.n_sect > 0) {
11211114 const sect = ctx.sections.items[sym.n_sect - 1];
1122 try bw.print(" ({s},{s})", .{ sect.segName(), sect.sectName() });
1115 try writer.print(" ({s},{s})", .{ sect.segName(), sect.sectName() });
11231116 }
1124 try bw.print(" {s} (stab) {s}\n", .{ tt, sym_name });
1117 try writer.print(" {s} (stab) {s}\n", .{ tt, sym_name });
11251118 } else if (sym.sect()) {
11261119 const sect = ctx.sections.items[sym.n_sect - 1];
1127 try bw.print("{x} ({s},{s})", .{
1120 try writer.print("{x} ({s},{s})", .{
11281121 sym.n_value,
11291122 sect.segName(),
11301123 sect.sectName(),
11311124 });
1132 if (sym.n_desc & macho.REFERENCED_DYNAMICALLY != 0) try bw.writeAll(" [referenced dynamically]");
1133 if (sym.weakDef()) try bw.writeAll(" weak");
1134 if (sym.weakRef()) try bw.writeAll(" weakref");
1125 if (sym.n_desc & macho.REFERENCED_DYNAMICALLY != 0) try writer.writeAll(" [referenced dynamically]");
1126 if (sym.weakDef()) try writer.writeAll(" weak");
1127 if (sym.weakRef()) try writer.writeAll(" weakref");
11351128 if (sym.ext()) {
1136 if (sym.pext()) try bw.writeAll(" private");
1137 try bw.writeAll(" external");
1138 } else if (sym.pext()) try bw.writeAll(" (was private external)");
1139 try bw.print(" {s}\n", .{sym_name});
1129 if (sym.pext()) try writer.writeAll(" private");
1130 try writer.writeAll(" external");
1131 } else if (sym.pext()) try writer.writeAll(" (was private external)");
1132 try writer.print(" {s}\n", .{sym_name});
11401133 } else if (sym.tentative()) {
11411134 const alignment = (sym.n_desc >> 8) & 0x0F;
1142 try bw.print(" 0x{x:0>16} (common) (alignment 2^{d})", .{ sym.n_value, alignment });
1143 if (sym.ext()) try bw.writeAll(" external");
1144 try bw.print(" {s}\n", .{sym_name});
1135 try writer.print(" 0x{x:0>16} (common) (alignment 2^{d})", .{ sym.n_value, alignment });
1136 if (sym.ext()) try writer.writeAll(" external");
1137 try writer.print(" {s}\n", .{sym_name});
11451138 } else if (sym.undf()) {
11461139 const ordinal = @divFloor(@as(i16, @bitCast(sym.n_desc)), macho.N_SYMBOL_RESOLVER);
11471140 const import_name = blk: {
......@@ -1160,10 +1153,10 @@ const MachODumper = struct {
11601153 const ext = mem.lastIndexOfScalar(u8, basename, '.') orelse basename.len;
11611154 break :blk basename[0..ext];
11621155 };
1163 try bw.writeAll("(undefined)");
1164 if (sym.weakRef()) try bw.writeAll(" weakref");
1165 if (sym.ext()) try bw.writeAll(" external");
1166 try bw.print(" {s} (from {s})\n", .{
1156 try writer.writeAll("(undefined)");
1157 if (sym.weakRef()) try writer.writeAll(" weakref");
1158 if (sym.ext()) try writer.writeAll(" external");
1159 try writer.print(" {s} (from {s})\n", .{
11671160 sym_name,
11681161 import_name,
11691162 });
......@@ -1171,8 +1164,8 @@ const MachODumper = struct {
11711164 }
11721165 }
11731166
1174 fn dumpIndirectSymtab(ctx: ObjectContext, bw: *Writer) !void {
1175 try bw.writeAll(indirect_symtab_label ++ "\n");
1167 fn dumpIndirectSymtab(ctx: ObjectContext, writer: anytype) !void {
1168 try writer.writeAll(indirect_symtab_label ++ "\n");
11761169
11771170 var sects_buffer: [3]macho.section_64 = undefined;
11781171 const sects = blk: {
......@@ -1210,33 +1203,35 @@ const MachODumper = struct {
12101203 break :blk @sizeOf(u64);
12111204 };
12121205
1213 try bw.print("{s},{s}\n", .{ sect.segName(), sect.sectName() });
1214 try bw.print("nentries {d}\n", .{end - start});
1206 try writer.print("{s},{s}\n", .{ sect.segName(), sect.sectName() });
1207 try writer.print("nentries {d}\n", .{end - start});
12151208 for (ctx.indsymtab.items[start..end], 0..) |index, j| {
12161209 const sym = ctx.symtab.items[index];
12171210 const addr = sect.addr + entry_size * j;
1218 try bw.print("0x{x} {d} {s}\n", .{ addr, index, ctx.getString(sym.n_strx) });
1211 try writer.print("0x{x} {d} {s}\n", .{ addr, index, ctx.getString(sym.n_strx) });
12191212 }
12201213 }
12211214 }
12221215
1223 fn dumpRebaseInfo(ctx: ObjectContext, data: []const u8, bw: *Writer) !void {
1224 var rebases: std.ArrayList(u64) = .init(ctx.gpa);
1216 fn dumpRebaseInfo(ctx: ObjectContext, data: []const u8, writer: anytype) !void {
1217 var rebases = std.ArrayList(u64).init(ctx.gpa);
12251218 defer rebases.deinit();
12261219 try ctx.parseRebaseInfo(data, &rebases);
12271220 mem.sort(u64, rebases.items, {}, std.sort.asc(u64));
12281221 for (rebases.items) |addr| {
1229 try bw.print("0x{x}\n", .{addr});
1222 try writer.print("0x{x}\n", .{addr});
12301223 }
12311224 }
12321225
12331226 fn parseRebaseInfo(ctx: ObjectContext, data: []const u8, rebases: *std.ArrayList(u64)) !void {
1234 var r: std.io.Reader = .fixed(data);
1227 var stream = std.io.fixedBufferStream(data);
1228 var creader = std.io.countingReader(stream.reader());
1229 const reader = creader.reader();
12351230
12361231 var seg_id: ?u8 = null;
12371232 var offset: u64 = 0;
12381233 while (true) {
1239 const byte = r.takeByte() catch break;
1234 const byte = reader.readByte() catch break;
12401235 const opc = byte & macho.REBASE_OPCODE_MASK;
12411236 const imm = byte & macho.REBASE_IMMEDIATE_MASK;
12421237 switch (opc) {
......@@ -1244,17 +1239,17 @@ const MachODumper = struct {
12441239 macho.REBASE_OPCODE_SET_TYPE_IMM => {},
12451240 macho.REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB => {
12461241 seg_id = imm;
1247 offset = try r.takeLeb128(u64);
1242 offset = try std.leb.readUleb128(u64, reader);
12481243 },
12491244 macho.REBASE_OPCODE_ADD_ADDR_IMM_SCALED => {
12501245 offset += imm * @sizeOf(u64);
12511246 },
12521247 macho.REBASE_OPCODE_ADD_ADDR_ULEB => {
1253 const addend = try r.takeLeb128(u64);
1248 const addend = try std.leb.readUleb128(u64, reader);
12541249 offset += addend;
12551250 },
12561251 macho.REBASE_OPCODE_DO_REBASE_ADD_ADDR_ULEB => {
1257 const addend = try r.takeLeb128(u64);
1252 const addend = try std.leb.readUleb128(u64, reader);
12581253 const seg = ctx.segments.items[seg_id.?];
12591254 const addr = seg.vmaddr + offset;
12601255 try rebases.append(addr);
......@@ -1271,11 +1266,11 @@ const MachODumper = struct {
12711266 ntimes = imm;
12721267 },
12731268 macho.REBASE_OPCODE_DO_REBASE_ULEB_TIMES => {
1274 ntimes = try r.takeLeb128(u64);
1269 ntimes = try std.leb.readUleb128(u64, reader);
12751270 },
12761271 macho.REBASE_OPCODE_DO_REBASE_ULEB_TIMES_SKIPPING_ULEB => {
1277 ntimes = try r.takeLeb128(u64);
1278 skip = try r.takeLeb128(u64);
1272 ntimes = try std.leb.readUleb128(u64, reader);
1273 skip = try std.leb.readUleb128(u64, reader);
12791274 },
12801275 else => unreachable,
12811276 }
......@@ -1317,8 +1312,8 @@ const MachODumper = struct {
13171312 };
13181313 };
13191314
1320 fn dumpBindInfo(ctx: ObjectContext, data: []const u8, bw: *Writer) !void {
1321 var bindings: std.ArrayList(Binding) = .init(ctx.gpa);
1315 fn dumpBindInfo(ctx: ObjectContext, data: []const u8, writer: anytype) !void {
1316 var bindings = std.ArrayList(Binding).init(ctx.gpa);
13221317 defer {
13231318 for (bindings.items) |*b| {
13241319 b.deinit(ctx.gpa);
......@@ -1328,20 +1323,22 @@ const MachODumper = struct {
13281323 try ctx.parseBindInfo(data, &bindings);
13291324 mem.sort(Binding, bindings.items, {}, Binding.lessThan);
13301325 for (bindings.items) |binding| {
1331 try bw.print("0x{x} [addend: {d}]", .{ binding.address, binding.addend });
1332 try bw.writeAll(" (");
1326 try writer.print("0x{x} [addend: {d}]", .{ binding.address, binding.addend });
1327 try writer.writeAll(" (");
13331328 switch (binding.tag) {
1334 .self => try bw.writeAll("self"),
1335 .exe => try bw.writeAll("main executable"),
1336 .flat => try bw.writeAll("flat lookup"),
1337 .ord => try bw.writeAll(std.fs.path.basename(ctx.imports.items[binding.ordinal - 1])),
1329 .self => try writer.writeAll("self"),
1330 .exe => try writer.writeAll("main executable"),
1331 .flat => try writer.writeAll("flat lookup"),
1332 .ord => try writer.writeAll(std.fs.path.basename(ctx.imports.items[binding.ordinal - 1])),
13381333 }
1339 try bw.print(") {s}\n", .{binding.name});
1334 try writer.print(") {s}\n", .{binding.name});
13401335 }
13411336 }
13421337
13431338 fn parseBindInfo(ctx: ObjectContext, data: []const u8, bindings: *std.ArrayList(Binding)) !void {
1344 var r: std.io.Reader = .fixed(data);
1339 var stream = std.io.fixedBufferStream(data);
1340 var creader = std.io.countingReader(stream.reader());
1341 const reader = creader.reader();
13451342
13461343 var seg_id: ?u8 = null;
13471344 var tag: Binding.Tag = .self;
......@@ -1349,10 +1346,11 @@ const MachODumper = struct {
13491346 var offset: u64 = 0;
13501347 var addend: i64 = 0;
13511348
1352 var name_buf: std.io.Writer.Allocating = .init(ctx.gpa);
1349 var name_buf = std.ArrayList(u8).init(ctx.gpa);
13531350 defer name_buf.deinit();
13541351
1355 while (r.takeByte()) |byte| {
1352 while (true) {
1353 const byte = reader.readByte() catch break;
13561354 const opc = byte & macho.BIND_OPCODE_MASK;
13571355 const imm = byte & macho.BIND_IMMEDIATE_MASK;
13581356 switch (opc) {
......@@ -1373,18 +1371,18 @@ const MachODumper = struct {
13731371 },
13741372 macho.BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB => {
13751373 seg_id = imm;
1376 offset = try r.takeLeb128(u64);
1374 offset = try std.leb.readUleb128(u64, reader);
13771375 },
13781376 macho.BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM => {
13791377 name_buf.clearRetainingCapacity();
1380 _ = try r.streamDelimiterLimit(&name_buf.writer, 0, .limited(std.math.maxInt(u32)));
1381 try name_buf.writer.writeByte(0);
1378 try reader.readUntilDelimiterArrayList(&name_buf, 0, std.math.maxInt(u32));
1379 try name_buf.append(0);
13821380 },
13831381 macho.BIND_OPCODE_SET_ADDEND_SLEB => {
1384 addend = try r.takeLeb128(i64);
1382 addend = try std.leb.readIleb128(i64, reader);
13851383 },
13861384 macho.BIND_OPCODE_ADD_ADDR_ULEB => {
1387 const x = try r.takeLeb128(u64);
1385 const x = try std.leb.readUleb128(u64, reader);
13881386 offset = @intCast(@as(i64, @intCast(offset)) + @as(i64, @bitCast(x)));
13891387 },
13901388 macho.BIND_OPCODE_DO_BIND,
......@@ -1399,14 +1397,14 @@ const MachODumper = struct {
13991397 switch (opc) {
14001398 macho.BIND_OPCODE_DO_BIND => {},
14011399 macho.BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB => {
1402 add_addr = try r.takeLeb128(u64);
1400 add_addr = try std.leb.readUleb128(u64, reader);
14031401 },
14041402 macho.BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED => {
14051403 add_addr = imm * @sizeOf(u64);
14061404 },
14071405 macho.BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB => {
1408 count = try r.takeLeb128(u64);
1409 skip = try r.takeLeb128(u64);
1406 count = try std.leb.readUleb128(u64, reader);
1407 skip = try std.leb.readUleb128(u64, reader);
14101408 },
14111409 else => unreachable,
14121410 }
......@@ -1420,25 +1418,25 @@ const MachODumper = struct {
14201418 .addend = addend,
14211419 .tag = tag,
14221420 .ordinal = ordinal,
1423 .name = try ctx.gpa.dupe(u8, name_buf.getWritten()),
1421 .name = try ctx.gpa.dupe(u8, name_buf.items),
14241422 });
14251423 offset += skip + @sizeOf(u64) + add_addr;
14261424 }
14271425 },
14281426 else => break,
14291427 }
1430 } else |_| {}
1428 }
14311429 }
14321430
1433 fn dumpExportsTrie(ctx: ObjectContext, data: []const u8, bw: *Writer) !void {
1431 fn dumpExportsTrie(ctx: ObjectContext, data: []const u8, writer: anytype) !void {
14341432 const seg = ctx.getSegmentByName("__TEXT") orelse return;
14351433
14361434 var arena = std.heap.ArenaAllocator.init(ctx.gpa);
14371435 defer arena.deinit();
14381436
1439 var exports: std.ArrayList(Export) = .init(arena.allocator());
1440 var r: std.io.Reader = .fixed(data);
1441 try parseTrieNode(arena.allocator(), &r, "", &exports);
1437 var exports = std.ArrayList(Export).init(arena.allocator());
1438 var it = TrieIterator{ .data = data };
1439 try parseTrieNode(arena.allocator(), &it, "", &exports);
14421440
14431441 mem.sort(Export, exports.items, {}, Export.lessThan);
14441442
......@@ -1447,26 +1445,66 @@ const MachODumper = struct {
14471445 .@"export" => {
14481446 const info = exp.data.@"export";
14491447 if (info.kind != .regular or info.weak) {
1450 try bw.writeByte('[');
1448 try writer.writeByte('[');
14511449 }
14521450 switch (info.kind) {
14531451 .regular => {},
1454 .absolute => try bw.writeAll("ABS, "),
1455 .tlv => try bw.writeAll("THREAD_LOCAL, "),
1452 .absolute => try writer.writeAll("ABS, "),
1453 .tlv => try writer.writeAll("THREAD_LOCAL, "),
14561454 }
1457 if (info.weak) try bw.writeAll("WEAK");
1455 if (info.weak) try writer.writeAll("WEAK");
14581456 if (info.kind != .regular or info.weak) {
1459 try bw.writeAll("] ");
1457 try writer.writeAll("] ");
14601458 }
1461 try bw.print("{x} ", .{seg.vmaddr + info.vmoffset});
1459 try writer.print("{x} ", .{seg.vmaddr + info.vmoffset});
14621460 },
14631461 else => {},
14641462 }
14651463
1466 try bw.print("{s}\n", .{exp.name});
1464 try writer.print("{s}\n", .{exp.name});
14671465 }
14681466 }
14691467
1468 const TrieIterator = struct {
1469 data: []const u8,
1470 pos: usize = 0,
1471
1472 fn getStream(it: *TrieIterator) std.io.FixedBufferStream([]const u8) {
1473 return std.io.fixedBufferStream(it.data[it.pos..]);
1474 }
1475
1476 fn readUleb128(it: *TrieIterator) !u64 {
1477 var stream = it.getStream();
1478 var creader = std.io.countingReader(stream.reader());
1479 const reader = creader.reader();
1480 const value = try std.leb.readUleb128(u64, reader);
1481 it.pos += creader.bytes_read;
1482 return value;
1483 }
1484
1485 fn readString(it: *TrieIterator) ![:0]const u8 {
1486 var stream = it.getStream();
1487 const reader = stream.reader();
1488
1489 var count: usize = 0;
1490 while (true) : (count += 1) {
1491 const byte = try reader.readByte();
1492 if (byte == 0) break;
1493 }
1494
1495 const str = @as([*:0]const u8, @ptrCast(it.data.ptr + it.pos))[0..count :0];
1496 it.pos += count + 1;
1497 return str;
1498 }
1499
1500 fn readByte(it: *TrieIterator) !u8 {
1501 var stream = it.getStream();
1502 const value = try stream.reader().readByte();
1503 it.pos += 1;
1504 return value;
1505 }
1506 };
1507
14701508 const Export = struct {
14711509 name: []const u8,
14721510 tag: enum { @"export", reexport, stub_resolver },
......@@ -1506,17 +1544,17 @@ const MachODumper = struct {
15061544
15071545 fn parseTrieNode(
15081546 arena: Allocator,
1509 r: *std.io.Reader,
1547 it: *TrieIterator,
15101548 prefix: []const u8,
15111549 exports: *std.ArrayList(Export),
15121550 ) !void {
1513 const size = try r.takeLeb128(u64);
1551 const size = try it.readUleb128();
15141552 if (size > 0) {
1515 const flags = try r.takeLeb128(u8);
1553 const flags = try it.readUleb128();
15161554 switch (flags) {
15171555 macho.EXPORT_SYMBOL_FLAGS_REEXPORT => {
1518 const ord = try r.takeLeb128(u64);
1519 const name = try r.takeSentinel(0);
1556 const ord = try it.readUleb128();
1557 const name = try arena.dupe(u8, try it.readString());
15201558 try exports.append(.{
15211559 .name = if (name.len > 0) name else prefix,
15221560 .tag = .reexport,
......@@ -1524,8 +1562,8 @@ const MachODumper = struct {
15241562 });
15251563 },
15261564 macho.EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER => {
1527 const stub_offset = try r.takeLeb128(u64);
1528 const resolver_offset = try r.takeLeb128(u64);
1565 const stub_offset = try it.readUleb128();
1566 const resolver_offset = try it.readUleb128();
15291567 try exports.append(.{
15301568 .name = prefix,
15311569 .tag = .stub_resolver,
......@@ -1536,7 +1574,7 @@ const MachODumper = struct {
15361574 });
15371575 },
15381576 else => {
1539 const vmoff = try r.takeLeb128(u64);
1577 const vmoff = try it.readUleb128();
15401578 try exports.append(.{
15411579 .name = prefix,
15421580 .tag = .@"export",
......@@ -1555,21 +1593,21 @@ const MachODumper = struct {
15551593 }
15561594 }
15571595
1558 const nedges = try r.takeByte();
1596 const nedges = try it.readByte();
15591597 for (0..nedges) |_| {
1560 const label = try r.takeSentinel(0);
1561 const off = try r.takeLeb128(usize);
1598 const label = try it.readString();
1599 const off = try it.readUleb128();
15621600 const prefix_label = try std.fmt.allocPrint(arena, "{s}{s}", .{ prefix, label });
1563 const seek = r.seek;
1564 r.seek = off;
1565 try parseTrieNode(arena, r, prefix_label, exports);
1566 r.seek = seek;
1601 const curr = it.pos;
1602 it.pos = off;
1603 try parseTrieNode(arena, it, prefix_label, exports);
1604 it.pos = curr;
15671605 }
15681606 }
15691607
1570 fn dumpSection(ctx: ObjectContext, sect: macho.section_64, bw: *Writer) !void {
1608 fn dumpSection(ctx: ObjectContext, sect: macho.section_64, writer: anytype) !void {
15711609 const data = ctx.data[sect.offset..][0..sect.size];
1572 try bw.print("{s}", .{data});
1610 try writer.print("{s}", .{data});
15731611 }
15741612 };
15751613
......@@ -1583,30 +1621,29 @@ const MachODumper = struct {
15831621 var ctx = ObjectContext{ .gpa = gpa, .data = bytes, .header = hdr };
15841622 try ctx.parse();
15851623
1586 var aw: std.io.Writer.Allocating = .init(gpa);
1587 defer aw.deinit();
1588 const bw = &aw.writer;
1624 var output = std.ArrayList(u8).init(gpa);
1625 const writer = output.writer();
15891626
15901627 switch (check.kind) {
15911628 .headers => {
1592 try ObjectContext.dumpHeader(ctx.header, bw);
1629 try ObjectContext.dumpHeader(ctx.header, writer);
15931630
15941631 var it = ctx.getLoadCommandIterator();
15951632 var i: usize = 0;
15961633 while (it.next()) |cmd| {
1597 try ObjectContext.dumpLoadCommand(cmd, i, bw);
1598 try bw.writeByte('\n');
1634 try ObjectContext.dumpLoadCommand(cmd, i, writer);
1635 try writer.writeByte('\n');
15991636
16001637 i += 1;
16011638 }
16021639 },
16031640
16041641 .symtab => if (ctx.symtab.items.len > 0) {
1605 try ctx.dumpSymtab(bw);
1642 try ctx.dumpSymtab(writer);
16061643 } else return step.fail("no symbol table found", .{}),
16071644
16081645 .indirect_symtab => if (ctx.symtab.items.len > 0 and ctx.indsymtab.items.len > 0) {
1609 try ctx.dumpIndirectSymtab(bw);
1646 try ctx.dumpIndirectSymtab(writer);
16101647 } else return step.fail("no indirect symbol table found", .{}),
16111648
16121649 .dyld_rebase,
......@@ -1621,26 +1658,26 @@ const MachODumper = struct {
16211658 switch (check.kind) {
16221659 .dyld_rebase => if (lc.rebase_size > 0) {
16231660 const data = ctx.data[lc.rebase_off..][0..lc.rebase_size];
1624 try bw.writeAll(dyld_rebase_label ++ "\n");
1625 try ctx.dumpRebaseInfo(data, bw);
1661 try writer.writeAll(dyld_rebase_label ++ "\n");
1662 try ctx.dumpRebaseInfo(data, writer);
16261663 } else return step.fail("no rebase data found", .{}),
16271664
16281665 .dyld_bind => if (lc.bind_size > 0) {
16291666 const data = ctx.data[lc.bind_off..][0..lc.bind_size];
1630 try bw.writeAll(dyld_bind_label ++ "\n");
1631 try ctx.dumpBindInfo(data, bw);
1667 try writer.writeAll(dyld_bind_label ++ "\n");
1668 try ctx.dumpBindInfo(data, writer);
16321669 } else return step.fail("no bind data found", .{}),
16331670
16341671 .dyld_weak_bind => if (lc.weak_bind_size > 0) {
16351672 const data = ctx.data[lc.weak_bind_off..][0..lc.weak_bind_size];
1636 try bw.writeAll(dyld_weak_bind_label ++ "\n");
1637 try ctx.dumpBindInfo(data, bw);
1673 try writer.writeAll(dyld_weak_bind_label ++ "\n");
1674 try ctx.dumpBindInfo(data, writer);
16381675 } else return step.fail("no weak bind data found", .{}),
16391676
16401677 .dyld_lazy_bind => if (lc.lazy_bind_size > 0) {
16411678 const data = ctx.data[lc.lazy_bind_off..][0..lc.lazy_bind_size];
1642 try bw.writeAll(dyld_lazy_bind_label ++ "\n");
1643 try ctx.dumpBindInfo(data, bw);
1679 try writer.writeAll(dyld_lazy_bind_label ++ "\n");
1680 try ctx.dumpBindInfo(data, writer);
16441681 } else return step.fail("no lazy bind data found", .{}),
16451682
16461683 else => unreachable,
......@@ -1652,8 +1689,8 @@ const MachODumper = struct {
16521689 const lc = cmd.cast(macho.dyld_info_command).?;
16531690 if (lc.export_size > 0) {
16541691 const data = ctx.data[lc.export_off..][0..lc.export_size];
1655 try bw.writeAll(exports_label ++ "\n");
1656 try ctx.dumpExportsTrie(data, bw);
1692 try writer.writeAll(exports_label ++ "\n");
1693 try ctx.dumpExportsTrie(data, writer);
16571694 break :blk;
16581695 }
16591696 }
......@@ -1661,20 +1698,20 @@ const MachODumper = struct {
16611698 },
16621699
16631700 .dump_section => {
1664 const name = mem.sliceTo(@as([*:0]const u8, @ptrCast(check.data.items[check.payload.dump_section..].ptr)), 0);
1701 const name = mem.sliceTo(@as([*:0]const u8, @ptrCast(check.data.items.ptr + check.payload.dump_section)), 0);
16651702 const sep_index = mem.indexOfScalar(u8, name, ',') orelse
16661703 return step.fail("invalid section name: {s}", .{name});
16671704 const segname = name[0..sep_index];
16681705 const sectname = name[sep_index + 1 ..];
16691706 const sect = ctx.getSectionByName(segname, sectname) orelse
16701707 return step.fail("section '{s}' not found", .{name});
1671 try ctx.dumpSection(sect, bw);
1708 try ctx.dumpSection(sect, writer);
16721709 },
16731710
16741711 else => return step.fail("invalid check kind for MachO file format: {s}", .{@tagName(check.kind)}),
16751712 }
16761713
1677 return aw.toOwnedSlice();
1714 return output.toOwnedSlice();
16781715 }
16791716};
16801717
......@@ -1693,138 +1730,161 @@ const ElfDumper = struct {
16931730
16941731 fn parseAndDumpArchive(step: *Step, check: Check, bytes: []const u8) ![]const u8 {
16951732 const gpa = step.owner.allocator;
1696 var r: std.io.Reader = .fixed(bytes);
1733 var stream = std.io.fixedBufferStream(bytes);
1734 const reader = stream.reader();
16971735
1698 if (!mem.eql(u8, try r.takeArray(elf.ARMAG.len), elf.ARMAG)) return error.InvalidArchiveMagicNumber;
1736 const magic = try reader.readBytesNoEof(elf.ARMAG.len);
1737 if (!mem.eql(u8, &magic, elf.ARMAG)) {
1738 return error.InvalidArchiveMagicNumber;
1739 }
16991740
1700 var ctx: ArchiveContext = .{
1741 var ctx = ArchiveContext{
17011742 .gpa = gpa,
17021743 .data = bytes,
1703 .symtab = &.{},
1704 .strtab = &.{},
1705 .objects = .empty,
1744 .strtab = &[0]u8{},
17061745 };
1707 defer ctx.deinit();
1746 defer {
1747 for (ctx.objects.items) |*object| {
1748 gpa.free(object.name);
1749 }
1750 ctx.objects.deinit(gpa);
1751 }
1752
1753 while (true) {
1754 if (stream.pos >= ctx.data.len) break;
1755 if (!mem.isAligned(stream.pos, 2)) stream.pos += 1;
17081756
1709 while (r.seek < bytes.len) {
1710 const hdr_seek = std.mem.alignForward(usize, r.seek, 2);
1711 r.seek = hdr_seek;
1712 const hdr = try r.takeStruct(elf.ar_hdr);
1757 const hdr = try reader.readStruct(elf.ar_hdr);
17131758
17141759 if (!mem.eql(u8, &hdr.ar_fmag, elf.ARFMAG)) return error.InvalidArchiveHeaderMagicNumber;
17151760
1716 const data = try r.take(try hdr.size());
1761 const size = try hdr.size();
1762 defer {
1763 _ = stream.seekBy(size) catch {};
1764 }
17171765
17181766 if (hdr.isSymtab()) {
1719 try ctx.parseSymtab(data, .p32);
1767 try ctx.parseSymtab(ctx.data[stream.pos..][0..size], .p32);
17201768 continue;
17211769 }
17221770 if (hdr.isSymtab64()) {
1723 try ctx.parseSymtab(data, .p64);
1771 try ctx.parseSymtab(ctx.data[stream.pos..][0..size], .p64);
17241772 continue;
17251773 }
17261774 if (hdr.isStrtab()) {
1727 ctx.strtab = data;
1775 ctx.strtab = ctx.data[stream.pos..][0..size];
17281776 continue;
17291777 }
17301778 if (hdr.isSymdef() or hdr.isSymdefSorted()) continue;
17311779
1732 const name = hdr.name() orelse ctx.getString((try hdr.nameOffset()).?);
1733 try ctx.objects.putNoClobber(gpa, hdr_seek, .{
1734 .name = name,
1735 .data = data,
1736 });
1780 const name = if (hdr.name()) |name|
1781 try gpa.dupe(u8, name)
1782 else if (try hdr.nameOffset()) |off|
1783 try gpa.dupe(u8, ctx.getString(off))
1784 else
1785 unreachable;
1786
1787 try ctx.objects.append(gpa, .{ .name = name, .off = stream.pos, .len = size });
17371788 }
17381789
1739 var aw: std.io.Writer.Allocating = .init(gpa);
1740 defer aw.deinit();
1741 const bw = &aw.writer;
1790 var output = std.ArrayList(u8).init(gpa);
1791 const writer = output.writer();
17421792
17431793 switch (check.kind) {
1744 .archive_symtab => if (ctx.symtab.len > 0) {
1745 try ctx.dumpSymtab(bw);
1794 .archive_symtab => if (ctx.symtab.items.len > 0) {
1795 try ctx.dumpSymtab(writer);
17461796 } else return step.fail("no archive symbol table found", .{}),
17471797
1748 else => if (ctx.objects.count() > 0) {
1749 try ctx.dumpObjects(step, check, bw);
1798 else => if (ctx.objects.items.len > 0) {
1799 try ctx.dumpObjects(step, check, writer);
17501800 } else return step.fail("empty archive", .{}),
17511801 }
17521802
1753 return aw.toOwnedSlice();
1803 return output.toOwnedSlice();
17541804 }
17551805
17561806 const ArchiveContext = struct {
17571807 gpa: Allocator,
17581808 data: []const u8,
1759 symtab: []ArSymtabEntry,
1809 symtab: std.ArrayListUnmanaged(ArSymtabEntry) = .empty,
17601810 strtab: []const u8,
1761 objects: std.AutoArrayHashMapUnmanaged(usize, struct { name: []const u8, data: []const u8 }),
1811 objects: std.ArrayListUnmanaged(struct { name: []const u8, off: usize, len: usize }) = .empty,
17621812
1763 fn deinit(ctx: *ArchiveContext) void {
1764 ctx.gpa.free(ctx.symtab);
1765 ctx.objects.deinit(ctx.gpa);
1766 }
1767
1768 fn parseSymtab(ctx: *ArchiveContext, data: []const u8, ptr_width: enum { p32, p64 }) !void {
1769 var r: std.io.Reader = .fixed(data);
1813 fn parseSymtab(ctx: *ArchiveContext, raw: []const u8, ptr_width: enum { p32, p64 }) !void {
1814 var stream = std.io.fixedBufferStream(raw);
1815 const reader = stream.reader();
17701816 const num = switch (ptr_width) {
1771 .p32 => try r.takeInt(u32, .big),
1772 .p64 => try r.takeInt(u64, .big),
1817 .p32 => try reader.readInt(u32, .big),
1818 .p64 => try reader.readInt(u64, .big),
17731819 };
17741820 const ptr_size: usize = switch (ptr_width) {
17751821 .p32 => @sizeOf(u32),
17761822 .p64 => @sizeOf(u64),
17771823 };
1778 _ = try r.discard(.limited(num * ptr_size));
1779 const strtab = r.buffered();
1824 const strtab_off = (num + 1) * ptr_size;
1825 const strtab_len = raw.len - strtab_off;
1826 const strtab = raw[strtab_off..][0..strtab_len];
17801827
1781 assert(ctx.symtab.len == 0);
1782 ctx.symtab = try ctx.gpa.alloc(ArSymtabEntry, num);
1828 try ctx.symtab.ensureTotalCapacityPrecise(ctx.gpa, num);
17831829
17841830 var stroff: usize = 0;
1785 for (ctx.symtab) |*entry| {
1831 for (0..num) |_| {
17861832 const off = switch (ptr_width) {
1787 .p32 => try r.takeInt(u32, .big),
1788 .p64 => try r.takeInt(u64, .big),
1833 .p32 => try reader.readInt(u32, .big),
1834 .p64 => try reader.readInt(u64, .big),
17891835 };
1790 const name = mem.sliceTo(@as([*:0]const u8, @ptrCast(strtab[stroff..].ptr)), 0);
1836 const name = mem.sliceTo(@as([*:0]const u8, @ptrCast(strtab.ptr + stroff)), 0);
17911837 stroff += name.len + 1;
1792 entry.* = .{ .off = off, .name = name };
1838 ctx.symtab.appendAssumeCapacity(.{ .off = off, .name = name });
17931839 }
17941840 }
17951841
1796 fn dumpSymtab(ctx: ArchiveContext, bw: *Writer) !void {
1797 var symbols: std.AutoArrayHashMap(usize, std.ArrayList([]const u8)) = .init(ctx.gpa);
1842 fn dumpSymtab(ctx: ArchiveContext, writer: anytype) !void {
1843 var files = std.AutoHashMap(usize, []const u8).init(ctx.gpa);
1844 defer files.deinit();
1845 try files.ensureUnusedCapacity(@intCast(ctx.objects.items.len));
1846
1847 for (ctx.objects.items) |object| {
1848 files.putAssumeCapacityNoClobber(object.off - @sizeOf(elf.ar_hdr), object.name);
1849 }
1850
1851 var symbols = std.AutoArrayHashMap(usize, std.ArrayList([]const u8)).init(ctx.gpa);
17981852 defer {
1799 for (symbols.values()) |*value| value.deinit();
1853 for (symbols.values()) |*value| {
1854 value.deinit();
1855 }
18001856 symbols.deinit();
18011857 }
18021858
1803 for (ctx.symtab) |entry| {
1859 for (ctx.symtab.items) |entry| {
18041860 const gop = try symbols.getOrPut(@intCast(entry.off));
1805 if (!gop.found_existing) gop.value_ptr.* = .init(ctx.gpa);
1861 if (!gop.found_existing) {
1862 gop.value_ptr.* = std.ArrayList([]const u8).init(ctx.gpa);
1863 }
18061864 try gop.value_ptr.append(entry.name);
18071865 }
18081866
1809 try bw.print("{s}\n", .{archive_symtab_label});
1867 try writer.print("{s}\n", .{archive_symtab_label});
18101868 for (symbols.keys(), symbols.values()) |off, values| {
1811 try bw.print("in object {s}\n", .{ctx.objects.get(off).?.name});
1812 for (values.items) |value| try bw.print("{s}\n", .{value});
1869 try writer.print("in object {s}\n", .{files.get(off).?});
1870 for (values.items) |value| {
1871 try writer.print("{s}\n", .{value});
1872 }
18131873 }
18141874 }
18151875
1816 fn dumpObjects(ctx: ArchiveContext, step: *Step, check: Check, bw: *Writer) !void {
1817 for (ctx.objects.values()) |object| {
1818 try bw.print("object {s}\n", .{object.name});
1819 const output = try parseAndDumpObject(step, check, object.data);
1876 fn dumpObjects(ctx: ArchiveContext, step: *Step, check: Check, writer: anytype) !void {
1877 for (ctx.objects.items) |object| {
1878 try writer.print("object {s}\n", .{object.name});
1879 const output = try parseAndDumpObject(step, check, ctx.data[object.off..][0..object.len]);
18201880 defer ctx.gpa.free(output);
1821 try bw.print("{s}\n", .{output});
1881 try writer.print("{s}\n", .{output});
18221882 }
18231883 }
18241884
18251885 fn getString(ctx: ArchiveContext, off: u32) []const u8 {
18261886 assert(off < ctx.strtab.len);
1827 const name = mem.sliceTo(@as([*:'\n']const u8, @ptrCast(ctx.strtab[off..].ptr)), 0);
1887 const name = mem.sliceTo(@as([*:'\n']const u8, @ptrCast(ctx.strtab.ptr + off)), 0);
18281888 return name[0 .. name.len - 1];
18291889 }
18301890
......@@ -1836,23 +1896,24 @@ const ElfDumper = struct {
18361896
18371897 fn parseAndDumpObject(step: *Step, check: Check, bytes: []const u8) ![]const u8 {
18381898 const gpa = step.owner.allocator;
1839 var r: std.io.Reader = .fixed(bytes);
1899 var stream = std.io.fixedBufferStream(bytes);
1900 const reader = stream.reader();
18401901
1841 const hdr = try r.takeStruct(elf.Elf64_Ehdr);
1842 if (!mem.eql(u8, hdr.e_ident[0..4], "\x7fELF")) return error.InvalidMagicNumber;
1902 const hdr = try reader.readStruct(elf.Elf64_Ehdr);
1903 if (!mem.eql(u8, hdr.e_ident[0..4], "\x7fELF")) {
1904 return error.InvalidMagicNumber;
1905 }
18431906
1844 const shdrs = @as([*]align(1) const elf.Elf64_Shdr, @ptrCast(bytes[hdr.e_shoff..].ptr))[0..hdr.e_shnum];
1845 const phdrs = @as([*]align(1) const elf.Elf64_Phdr, @ptrCast(bytes[hdr.e_phoff..].ptr))[0..hdr.e_phnum];
1907 const shdrs = @as([*]align(1) const elf.Elf64_Shdr, @ptrCast(bytes.ptr + hdr.e_shoff))[0..hdr.e_shnum];
1908 const phdrs = @as([*]align(1) const elf.Elf64_Phdr, @ptrCast(bytes.ptr + hdr.e_phoff))[0..hdr.e_phnum];
18461909
1847 var ctx: ObjectContext = .{
1910 var ctx = ObjectContext{
18481911 .gpa = gpa,
18491912 .data = bytes,
18501913 .hdr = hdr,
18511914 .shdrs = shdrs,
18521915 .phdrs = phdrs,
18531916 .shstrtab = undefined,
1854 .symtab = .{},
1855 .dysymtab = .{},
18561917 };
18571918 ctx.shstrtab = ctx.getSectionContents(ctx.hdr.e_shstrndx);
18581919
......@@ -1883,121 +1944,120 @@ const ElfDumper = struct {
18831944 else => {},
18841945 };
18851946
1886 var aw: std.io.Writer.Allocating = .init(gpa);
1887 defer aw.deinit();
1888 const bw = &aw.writer;
1947 var output = std.ArrayList(u8).init(gpa);
1948 const writer = output.writer();
18891949
18901950 switch (check.kind) {
18911951 .headers => {
1892 try ctx.dumpHeader(bw);
1893 try ctx.dumpShdrs(bw);
1894 try ctx.dumpPhdrs(bw);
1952 try ctx.dumpHeader(writer);
1953 try ctx.dumpShdrs(writer);
1954 try ctx.dumpPhdrs(writer);
18951955 },
18961956
18971957 .symtab => if (ctx.symtab.symbols.len > 0) {
1898 try ctx.dumpSymtab(.symtab, bw);
1958 try ctx.dumpSymtab(.symtab, writer);
18991959 } else return step.fail("no symbol table found", .{}),
19001960
19011961 .dynamic_symtab => if (ctx.dysymtab.symbols.len > 0) {
1902 try ctx.dumpSymtab(.dysymtab, bw);
1962 try ctx.dumpSymtab(.dysymtab, writer);
19031963 } else return step.fail("no dynamic symbol table found", .{}),
19041964
19051965 .dynamic_section => if (ctx.getSectionByName(".dynamic")) |shndx| {
1906 try ctx.dumpDynamicSection(shndx, bw);
1966 try ctx.dumpDynamicSection(shndx, writer);
19071967 } else return step.fail("no .dynamic section found", .{}),
19081968
19091969 .dump_section => {
1910 const name = mem.sliceTo(@as([*:0]const u8, @ptrCast(check.data.items[check.payload.dump_section..].ptr)), 0);
1970 const name = mem.sliceTo(@as([*:0]const u8, @ptrCast(check.data.items.ptr + check.payload.dump_section)), 0);
19111971 const shndx = ctx.getSectionByName(name) orelse return step.fail("no '{s}' section found", .{name});
1912 try ctx.dumpSection(shndx, bw);
1972 try ctx.dumpSection(shndx, writer);
19131973 },
19141974
19151975 else => return step.fail("invalid check kind for ELF file format: {s}", .{@tagName(check.kind)}),
19161976 }
19171977
1918 return aw.toOwnedSlice();
1978 return output.toOwnedSlice();
19191979 }
19201980
19211981 const ObjectContext = struct {
19221982 gpa: Allocator,
19231983 data: []const u8,
1924 hdr: *align(1) const elf.Elf64_Ehdr,
1984 hdr: elf.Elf64_Ehdr,
19251985 shdrs: []align(1) const elf.Elf64_Shdr,
19261986 phdrs: []align(1) const elf.Elf64_Phdr,
19271987 shstrtab: []const u8,
1928 symtab: Symtab,
1929 dysymtab: Symtab,
1988 symtab: Symtab = .{},
1989 dysymtab: Symtab = .{},
19301990
1931 fn dumpHeader(ctx: ObjectContext, bw: *Writer) !void {
1932 try bw.writeAll("header\n");
1933 try bw.print("type {s}\n", .{@tagName(ctx.hdr.e_type)});
1934 try bw.print("entry {x}\n", .{ctx.hdr.e_entry});
1991 fn dumpHeader(ctx: ObjectContext, writer: anytype) !void {
1992 try writer.writeAll("header\n");
1993 try writer.print("type {s}\n", .{@tagName(ctx.hdr.e_type)});
1994 try writer.print("entry {x}\n", .{ctx.hdr.e_entry});
19351995 }
19361996
1937 fn dumpPhdrs(ctx: ObjectContext, bw: *Writer) !void {
1997 fn dumpPhdrs(ctx: ObjectContext, writer: anytype) !void {
19381998 if (ctx.phdrs.len == 0) return;
19391999
1940 try bw.writeAll("program headers\n");
2000 try writer.writeAll("program headers\n");
19412001
19422002 for (ctx.phdrs, 0..) |phdr, phndx| {
1943 try bw.print("phdr {d}\n", .{phndx});
1944 try bw.print("type {f}\n", .{fmtPhType(phdr.p_type)});
1945 try bw.print("vaddr {x}\n", .{phdr.p_vaddr});
1946 try bw.print("paddr {x}\n", .{phdr.p_paddr});
1947 try bw.print("offset {x}\n", .{phdr.p_offset});
1948 try bw.print("memsz {x}\n", .{phdr.p_memsz});
1949 try bw.print("filesz {x}\n", .{phdr.p_filesz});
1950 try bw.print("align {x}\n", .{phdr.p_align});
2003 try writer.print("phdr {d}\n", .{phndx});
2004 try writer.print("type {f}\n", .{fmtPhType(phdr.p_type)});
2005 try writer.print("vaddr {x}\n", .{phdr.p_vaddr});
2006 try writer.print("paddr {x}\n", .{phdr.p_paddr});
2007 try writer.print("offset {x}\n", .{phdr.p_offset});
2008 try writer.print("memsz {x}\n", .{phdr.p_memsz});
2009 try writer.print("filesz {x}\n", .{phdr.p_filesz});
2010 try writer.print("align {x}\n", .{phdr.p_align});
19512011
19522012 {
19532013 const flags = phdr.p_flags;
1954 try bw.writeAll("flags");
1955 if (flags > 0) try bw.writeByte(' ');
2014 try writer.writeAll("flags");
2015 if (flags > 0) try writer.writeByte(' ');
19562016 if (flags & elf.PF_R != 0) {
1957 try bw.writeByte('R');
2017 try writer.writeByte('R');
19582018 }
19592019 if (flags & elf.PF_W != 0) {
1960 try bw.writeByte('W');
2020 try writer.writeByte('W');
19612021 }
19622022 if (flags & elf.PF_X != 0) {
1963 try bw.writeByte('E');
2023 try writer.writeByte('E');
19642024 }
19652025 if (flags & elf.PF_MASKOS != 0) {
1966 try bw.writeAll("OS");
2026 try writer.writeAll("OS");
19672027 }
19682028 if (flags & elf.PF_MASKPROC != 0) {
1969 try bw.writeAll("PROC");
2029 try writer.writeAll("PROC");
19702030 }
1971 try bw.writeByte('\n');
2031 try writer.writeByte('\n');
19722032 }
19732033 }
19742034 }
19752035
1976 fn dumpShdrs(ctx: ObjectContext, bw: *Writer) !void {
2036 fn dumpShdrs(ctx: ObjectContext, writer: anytype) !void {
19772037 if (ctx.shdrs.len == 0) return;
19782038
1979 try bw.writeAll("section headers\n");
2039 try writer.writeAll("section headers\n");
19802040
19812041 for (ctx.shdrs, 0..) |shdr, shndx| {
1982 try bw.print("shdr {d}\n", .{shndx});
1983 try bw.print("name {s}\n", .{ctx.getSectionName(shndx)});
1984 try bw.print("type {f}\n", .{fmtShType(shdr.sh_type)});
1985 try bw.print("addr {x}\n", .{shdr.sh_addr});
1986 try bw.print("offset {x}\n", .{shdr.sh_offset});
1987 try bw.print("size {x}\n", .{shdr.sh_size});
1988 try bw.print("addralign {x}\n", .{shdr.sh_addralign});
2042 try writer.print("shdr {d}\n", .{shndx});
2043 try writer.print("name {s}\n", .{ctx.getSectionName(shndx)});
2044 try writer.print("type {f}\n", .{fmtShType(shdr.sh_type)});
2045 try writer.print("addr {x}\n", .{shdr.sh_addr});
2046 try writer.print("offset {x}\n", .{shdr.sh_offset});
2047 try writer.print("size {x}\n", .{shdr.sh_size});
2048 try writer.print("addralign {x}\n", .{shdr.sh_addralign});
19892049 // TODO dump formatted sh_flags
19902050 }
19912051 }
19922052
1993 fn dumpDynamicSection(ctx: ObjectContext, shndx: usize, bw: *Writer) !void {
2053 fn dumpDynamicSection(ctx: ObjectContext, shndx: usize, writer: anytype) !void {
19942054 const shdr = ctx.shdrs[shndx];
19952055 const strtab = ctx.getSectionContents(shdr.sh_link);
19962056 const data = ctx.getSectionContents(shndx);
19972057 const nentries = @divExact(data.len, @sizeOf(elf.Elf64_Dyn));
19982058 const entries = @as([*]align(1) const elf.Elf64_Dyn, @ptrCast(data.ptr))[0..nentries];
19992059
2000 try bw.writeAll(ElfDumper.dynamic_section_label ++ "\n");
2060 try writer.writeAll(ElfDumper.dynamic_section_label ++ "\n");
20012061
20022062 for (entries) |entry| {
20032063 const key = @as(u64, @bitCast(entry.d_tag));
......@@ -2038,7 +2098,7 @@ const ElfDumper = struct {
20382098 elf.DT_NULL => "NULL",
20392099 else => "UNKNOWN",
20402100 };
2041 try bw.print("{s}", .{key_str});
2101 try writer.print("{s}", .{key_str});
20422102
20432103 switch (key) {
20442104 elf.DT_NEEDED,
......@@ -2047,7 +2107,7 @@ const ElfDumper = struct {
20472107 elf.DT_RUNPATH,
20482108 => {
20492109 const name = getString(strtab, @intCast(value));
2050 try bw.print(" {s}", .{name});
2110 try writer.print(" {s}", .{name});
20512111 },
20522112
20532113 elf.DT_INIT_ARRAY,
......@@ -2065,7 +2125,7 @@ const ElfDumper = struct {
20652125 elf.DT_INIT,
20662126 elf.DT_FINI,
20672127 elf.DT_NULL,
2068 => try bw.print(" {x}", .{value}),
2128 => try writer.print(" {x}", .{value}),
20692129
20702130 elf.DT_INIT_ARRAYSZ,
20712131 elf.DT_FINI_ARRAYSZ,
......@@ -2075,77 +2135,77 @@ const ElfDumper = struct {
20752135 elf.DT_RELASZ,
20762136 elf.DT_RELAENT,
20772137 elf.DT_RELACOUNT,
2078 => try bw.print(" {d}", .{value}),
2138 => try writer.print(" {d}", .{value}),
20792139
2080 elf.DT_PLTREL => try bw.writeAll(switch (value) {
2140 elf.DT_PLTREL => try writer.writeAll(switch (value) {
20812141 elf.DT_REL => " REL",
20822142 elf.DT_RELA => " RELA",
20832143 else => " UNKNOWN",
20842144 }),
20852145
20862146 elf.DT_FLAGS => if (value > 0) {
2087 if (value & elf.DF_ORIGIN != 0) try bw.writeAll(" ORIGIN");
2088 if (value & elf.DF_SYMBOLIC != 0) try bw.writeAll(" SYMBOLIC");
2089 if (value & elf.DF_TEXTREL != 0) try bw.writeAll(" TEXTREL");
2090 if (value & elf.DF_BIND_NOW != 0) try bw.writeAll(" BIND_NOW");
2091 if (value & elf.DF_STATIC_TLS != 0) try bw.writeAll(" STATIC_TLS");
2147 if (value & elf.DF_ORIGIN != 0) try writer.writeAll(" ORIGIN");
2148 if (value & elf.DF_SYMBOLIC != 0) try writer.writeAll(" SYMBOLIC");
2149 if (value & elf.DF_TEXTREL != 0) try writer.writeAll(" TEXTREL");
2150 if (value & elf.DF_BIND_NOW != 0) try writer.writeAll(" BIND_NOW");
2151 if (value & elf.DF_STATIC_TLS != 0) try writer.writeAll(" STATIC_TLS");
20922152 },
20932153
20942154 elf.DT_FLAGS_1 => if (value > 0) {
2095 if (value & elf.DF_1_NOW != 0) try bw.writeAll(" NOW");
2096 if (value & elf.DF_1_GLOBAL != 0) try bw.writeAll(" GLOBAL");
2097 if (value & elf.DF_1_GROUP != 0) try bw.writeAll(" GROUP");
2098 if (value & elf.DF_1_NODELETE != 0) try bw.writeAll(" NODELETE");
2099 if (value & elf.DF_1_LOADFLTR != 0) try bw.writeAll(" LOADFLTR");
2100 if (value & elf.DF_1_INITFIRST != 0) try bw.writeAll(" INITFIRST");
2101 if (value & elf.DF_1_NOOPEN != 0) try bw.writeAll(" NOOPEN");
2102 if (value & elf.DF_1_ORIGIN != 0) try bw.writeAll(" ORIGIN");
2103 if (value & elf.DF_1_DIRECT != 0) try bw.writeAll(" DIRECT");
2104 if (value & elf.DF_1_TRANS != 0) try bw.writeAll(" TRANS");
2105 if (value & elf.DF_1_INTERPOSE != 0) try bw.writeAll(" INTERPOSE");
2106 if (value & elf.DF_1_NODEFLIB != 0) try bw.writeAll(" NODEFLIB");
2107 if (value & elf.DF_1_NODUMP != 0) try bw.writeAll(" NODUMP");
2108 if (value & elf.DF_1_CONFALT != 0) try bw.writeAll(" CONFALT");
2109 if (value & elf.DF_1_ENDFILTEE != 0) try bw.writeAll(" ENDFILTEE");
2110 if (value & elf.DF_1_DISPRELDNE != 0) try bw.writeAll(" DISPRELDNE");
2111 if (value & elf.DF_1_DISPRELPND != 0) try bw.writeAll(" DISPRELPND");
2112 if (value & elf.DF_1_NODIRECT != 0) try bw.writeAll(" NODIRECT");
2113 if (value & elf.DF_1_IGNMULDEF != 0) try bw.writeAll(" IGNMULDEF");
2114 if (value & elf.DF_1_NOKSYMS != 0) try bw.writeAll(" NOKSYMS");
2115 if (value & elf.DF_1_NOHDR != 0) try bw.writeAll(" NOHDR");
2116 if (value & elf.DF_1_EDITED != 0) try bw.writeAll(" EDITED");
2117 if (value & elf.DF_1_NORELOC != 0) try bw.writeAll(" NORELOC");
2118 if (value & elf.DF_1_SYMINTPOSE != 0) try bw.writeAll(" SYMINTPOSE");
2119 if (value & elf.DF_1_GLOBAUDIT != 0) try bw.writeAll(" GLOBAUDIT");
2120 if (value & elf.DF_1_SINGLETON != 0) try bw.writeAll(" SINGLETON");
2121 if (value & elf.DF_1_STUB != 0) try bw.writeAll(" STUB");
2122 if (value & elf.DF_1_PIE != 0) try bw.writeAll(" PIE");
2155 if (value & elf.DF_1_NOW != 0) try writer.writeAll(" NOW");
2156 if (value & elf.DF_1_GLOBAL != 0) try writer.writeAll(" GLOBAL");
2157 if (value & elf.DF_1_GROUP != 0) try writer.writeAll(" GROUP");
2158 if (value & elf.DF_1_NODELETE != 0) try writer.writeAll(" NODELETE");
2159 if (value & elf.DF_1_LOADFLTR != 0) try writer.writeAll(" LOADFLTR");
2160 if (value & elf.DF_1_INITFIRST != 0) try writer.writeAll(" INITFIRST");
2161 if (value & elf.DF_1_NOOPEN != 0) try writer.writeAll(" NOOPEN");
2162 if (value & elf.DF_1_ORIGIN != 0) try writer.writeAll(" ORIGIN");
2163 if (value & elf.DF_1_DIRECT != 0) try writer.writeAll(" DIRECT");
2164 if (value & elf.DF_1_TRANS != 0) try writer.writeAll(" TRANS");
2165 if (value & elf.DF_1_INTERPOSE != 0) try writer.writeAll(" INTERPOSE");
2166 if (value & elf.DF_1_NODEFLIB != 0) try writer.writeAll(" NODEFLIB");
2167 if (value & elf.DF_1_NODUMP != 0) try writer.writeAll(" NODUMP");
2168 if (value & elf.DF_1_CONFALT != 0) try writer.writeAll(" CONFALT");
2169 if (value & elf.DF_1_ENDFILTEE != 0) try writer.writeAll(" ENDFILTEE");
2170 if (value & elf.DF_1_DISPRELDNE != 0) try writer.writeAll(" DISPRELDNE");
2171 if (value & elf.DF_1_DISPRELPND != 0) try writer.writeAll(" DISPRELPND");
2172 if (value & elf.DF_1_NODIRECT != 0) try writer.writeAll(" NODIRECT");
2173 if (value & elf.DF_1_IGNMULDEF != 0) try writer.writeAll(" IGNMULDEF");
2174 if (value & elf.DF_1_NOKSYMS != 0) try writer.writeAll(" NOKSYMS");
2175 if (value & elf.DF_1_NOHDR != 0) try writer.writeAll(" NOHDR");
2176 if (value & elf.DF_1_EDITED != 0) try writer.writeAll(" EDITED");
2177 if (value & elf.DF_1_NORELOC != 0) try writer.writeAll(" NORELOC");
2178 if (value & elf.DF_1_SYMINTPOSE != 0) try writer.writeAll(" SYMINTPOSE");
2179 if (value & elf.DF_1_GLOBAUDIT != 0) try writer.writeAll(" GLOBAUDIT");
2180 if (value & elf.DF_1_SINGLETON != 0) try writer.writeAll(" SINGLETON");
2181 if (value & elf.DF_1_STUB != 0) try writer.writeAll(" STUB");
2182 if (value & elf.DF_1_PIE != 0) try writer.writeAll(" PIE");
21232183 },
21242184
2125 else => try bw.print(" {x}", .{value}),
2185 else => try writer.print(" {x}", .{value}),
21262186 }
2127 try bw.writeByte('\n');
2187 try writer.writeByte('\n');
21282188 }
21292189 }
21302190
2131 fn dumpSymtab(ctx: ObjectContext, comptime @"type": enum { symtab, dysymtab }, bw: *Writer) !void {
2191 fn dumpSymtab(ctx: ObjectContext, comptime @"type": enum { symtab, dysymtab }, writer: anytype) !void {
21322192 const symtab = switch (@"type") {
21332193 .symtab => ctx.symtab,
21342194 .dysymtab => ctx.dysymtab,
21352195 };
21362196
2137 try bw.writeAll(switch (@"type") {
2197 try writer.writeAll(switch (@"type") {
21382198 .symtab => symtab_label,
21392199 .dysymtab => dynamic_symtab_label,
21402200 } ++ "\n");
21412201
21422202 for (symtab.symbols, 0..) |sym, index| {
2143 try bw.print("{x} {x}", .{ sym.st_value, sym.st_size });
2203 try writer.print("{x} {x}", .{ sym.st_value, sym.st_size });
21442204
21452205 {
21462206 if (elf.SHN_LORESERVE <= sym.st_shndx and sym.st_shndx < elf.SHN_HIRESERVE) {
21472207 if (elf.SHN_LOPROC <= sym.st_shndx and sym.st_shndx < elf.SHN_HIPROC) {
2148 try bw.print(" LO+{d}", .{sym.st_shndx - elf.SHN_LOPROC});
2208 try writer.print(" LO+{d}", .{sym.st_shndx - elf.SHN_LOPROC});
21492209 } else {
21502210 const sym_ndx = switch (sym.st_shndx) {
21512211 elf.SHN_ABS => "ABS",
......@@ -2153,12 +2213,12 @@ const ElfDumper = struct {
21532213 elf.SHN_LIVEPATCH => "LIV",
21542214 else => "UNK",
21552215 };
2156 try bw.print(" {s}", .{sym_ndx});
2216 try writer.print(" {s}", .{sym_ndx});
21572217 }
21582218 } else if (sym.st_shndx == elf.SHN_UNDEF) {
2159 try bw.writeAll(" UND");
2219 try writer.writeAll(" UND");
21602220 } else {
2161 try bw.print(" {x}", .{sym.st_shndx});
2221 try writer.print(" {x}", .{sym.st_shndx});
21622222 }
21632223 }
21642224
......@@ -2175,12 +2235,12 @@ const ElfDumper = struct {
21752235 elf.STT_NUM => "NUM",
21762236 elf.STT_GNU_IFUNC => "IFUNC",
21772237 else => if (elf.STT_LOPROC <= tt and tt < elf.STT_HIPROC) {
2178 break :blk try bw.print(" LOPROC+{d}", .{tt - elf.STT_LOPROC});
2238 break :blk try writer.print(" LOPROC+{d}", .{tt - elf.STT_LOPROC});
21792239 } else if (elf.STT_LOOS <= tt and tt < elf.STT_HIOS) {
2180 break :blk try bw.print(" LOOS+{d}", .{tt - elf.STT_LOOS});
2240 break :blk try writer.print(" LOOS+{d}", .{tt - elf.STT_LOOS});
21812241 } else "UNK",
21822242 };
2183 try bw.print(" {s}", .{sym_type});
2243 try writer.print(" {s}", .{sym_type});
21842244 }
21852245
21862246 blk: {
......@@ -2191,28 +2251,28 @@ const ElfDumper = struct {
21912251 elf.STB_WEAK => "WEAK",
21922252 elf.STB_NUM => "NUM",
21932253 else => if (elf.STB_LOPROC <= bind and bind < elf.STB_HIPROC) {
2194 break :blk try bw.print(" LOPROC+{d}", .{bind - elf.STB_LOPROC});
2254 break :blk try writer.print(" LOPROC+{d}", .{bind - elf.STB_LOPROC});
21952255 } else if (elf.STB_LOOS <= bind and bind < elf.STB_HIOS) {
2196 break :blk try bw.print(" LOOS+{d}", .{bind - elf.STB_LOOS});
2256 break :blk try writer.print(" LOOS+{d}", .{bind - elf.STB_LOOS});
21972257 } else "UNKNOWN",
21982258 };
2199 try bw.print(" {s}", .{sym_bind});
2259 try writer.print(" {s}", .{sym_bind});
22002260 }
22012261
22022262 const sym_vis = @as(elf.STV, @enumFromInt(@as(u2, @truncate(sym.st_other))));
2203 try bw.print(" {s}", .{@tagName(sym_vis)});
2263 try writer.print(" {s}", .{@tagName(sym_vis)});
22042264
22052265 const sym_name = switch (sym.st_type()) {
22062266 elf.STT_SECTION => ctx.getSectionName(sym.st_shndx),
22072267 else => symtab.getName(index).?,
22082268 };
2209 try bw.print(" {s}\n", .{sym_name});
2269 try writer.print(" {s}\n", .{sym_name});
22102270 }
22112271 }
22122272
2213 fn dumpSection(ctx: ObjectContext, shndx: usize, bw: *Writer) !void {
2273 fn dumpSection(ctx: ObjectContext, shndx: usize, writer: anytype) !void {
22142274 const data = ctx.getSectionContents(shndx);
2215 try bw.print("{s}", .{data});
2275 try writer.print("{s}", .{data});
22162276 }
22172277
22182278 inline fn getSectionName(ctx: ObjectContext, shndx: usize) []const u8 {
......@@ -2250,15 +2310,15 @@ const ElfDumper = struct {
22502310 };
22512311
22522312 fn getString(strtab: []const u8, off: u32) []const u8 {
2253 const str = strtab[off..];
2254 return str[0..std.mem.indexOfScalar(u8, str, 0).?];
2313 assert(off < strtab.len);
2314 return mem.sliceTo(@as([*:0]const u8, @ptrCast(strtab.ptr + off)), 0);
22552315 }
22562316
22572317 fn fmtShType(sh_type: u32) std.fmt.Formatter(u32, formatShType) {
22582318 return .{ .data = sh_type };
22592319 }
22602320
2261 fn formatShType(sh_type: u32, w: *Writer) Writer.Error!void {
2321 fn formatShType(sh_type: u32, writer: *Writer) Writer.Error!void {
22622322 const name = switch (sh_type) {
22632323 elf.SHT_NULL => "NULL",
22642324 elf.SHT_PROGBITS => "PROGBITS",
......@@ -2284,21 +2344,21 @@ const ElfDumper = struct {
22842344 elf.SHT_GNU_VERNEED => "VERNEED",
22852345 elf.SHT_GNU_VERSYM => "VERSYM",
22862346 else => if (elf.SHT_LOOS <= sh_type and sh_type < elf.SHT_HIOS) {
2287 return try w.print("LOOS+0x{x}", .{sh_type - elf.SHT_LOOS});
2347 return try writer.print("LOOS+0x{x}", .{sh_type - elf.SHT_LOOS});
22882348 } else if (elf.SHT_LOPROC <= sh_type and sh_type < elf.SHT_HIPROC) {
2289 return try w.print("LOPROC+0x{x}", .{sh_type - elf.SHT_LOPROC});
2349 return try writer.print("LOPROC+0x{x}", .{sh_type - elf.SHT_LOPROC});
22902350 } else if (elf.SHT_LOUSER <= sh_type and sh_type < elf.SHT_HIUSER) {
2291 return try w.print("LOUSER+0x{x}", .{sh_type - elf.SHT_LOUSER});
2351 return try writer.print("LOUSER+0x{x}", .{sh_type - elf.SHT_LOUSER});
22922352 } else "UNKNOWN",
22932353 };
2294 try w.writeAll(name);
2354 try writer.writeAll(name);
22952355 }
22962356
22972357 fn fmtPhType(ph_type: u32) std.fmt.Formatter(u32, formatPhType) {
22982358 return .{ .data = ph_type };
22992359 }
23002360
2301 fn formatPhType(ph_type: u32, w: *Writer) Writer.Error!void {
2361 fn formatPhType(ph_type: u32, writer: *Writer) Writer.Error!void {
23022362 const p_type = switch (ph_type) {
23032363 elf.PT_NULL => "NULL",
23042364 elf.PT_LOAD => "LOAD",
......@@ -2313,12 +2373,12 @@ const ElfDumper = struct {
23132373 elf.PT_GNU_STACK => "GNU_STACK",
23142374 elf.PT_GNU_RELRO => "GNU_RELRO",
23152375 else => if (elf.PT_LOOS <= ph_type and ph_type < elf.PT_HIOS) {
2316 return try w.print("LOOS+0x{x}", .{ph_type - elf.PT_LOOS});
2376 return try writer.print("LOOS+0x{x}", .{ph_type - elf.PT_LOOS});
23172377 } else if (elf.PT_LOPROC <= ph_type and ph_type < elf.PT_HIPROC) {
2318 return try w.print("LOPROC+0x{x}", .{ph_type - elf.PT_LOPROC});
2378 return try writer.print("LOPROC+0x{x}", .{ph_type - elf.PT_LOPROC});
23192379 } else "UNKNOWN",
23202380 };
2321 try w.writeAll(p_type);
2381 try writer.writeAll(p_type);
23222382 }
23232383};
23242384
......@@ -2327,38 +2387,49 @@ const WasmDumper = struct {
23272387
23282388 fn parseAndDump(step: *Step, check: Check, bytes: []const u8) ![]const u8 {
23292389 const gpa = step.owner.allocator;
2330 var r: std.io.Reader = .fixed(bytes);
2331
2332 const buf = try r.takeArray(8);
2333 if (!mem.eql(u8, buf[0..4], &std.wasm.magic)) return error.InvalidMagicByte;
2334 if (!mem.eql(u8, buf[4..8], &std.wasm.version)) return error.UnsupportedWasmVersion;
2390 var fbs = std.io.fixedBufferStream(bytes);
2391 const reader = fbs.reader();
23352392
2336 var aw: std.io.Writer.Allocating = .init(gpa);
2337 defer aw.deinit();
2338 const bw = &aw.writer;
2393 const buf = try reader.readBytesNoEof(8);
2394 if (!mem.eql(u8, buf[0..4], &std.wasm.magic)) {
2395 return error.InvalidMagicByte;
2396 }
2397 if (!mem.eql(u8, buf[4..], &std.wasm.version)) {
2398 return error.UnsupportedWasmVersion;
2399 }
23392400
2340 parseAndDumpInner(step, check, &r, bw) catch |err| switch (err) {
2341 error.EndOfStream => try bw.writeAll("\n<UnexpectedEndOfStream>"),
2401 var output = std.ArrayList(u8).init(gpa);
2402 defer output.deinit();
2403 parseAndDumpInner(step, check, bytes, &fbs, &output) catch |err| switch (err) {
2404 error.EndOfStream => try output.appendSlice("\n<UnexpectedEndOfStream>"),
23422405 else => |e| return e,
23432406 };
2344 return aw.toOwnedSlice();
2407 return output.toOwnedSlice();
23452408 }
23462409
23472410 fn parseAndDumpInner(
23482411 step: *Step,
23492412 check: Check,
2350 r: *std.io.Reader,
2351 bw: *Writer,
2413 bytes: []const u8,
2414 fbs: *std.io.FixedBufferStream([]const u8),
2415 output: *std.ArrayList(u8),
23522416 ) !void {
2417 const reader = fbs.reader();
2418 const writer = output.writer();
2419
23532420 switch (check.kind) {
2354 .headers => while (r.takeEnum(std.wasm.Section, .little)) |section| {
2355 var section_reader: std.io.Reader = .fixed(try r.take(try r.takeLeb128(u32)));
2356 try parseAndDumpSection(step, section, &section_reader, bw);
2357 } else |err| switch (err) {
2358 error.InvalidEnumTag => return step.fail("invalid section id", .{}),
2359 error.EndOfStream => {},
2360 else => |e| return e,
2421 .headers => {
2422 while (reader.readByte()) |current_byte| {
2423 const section = std.enums.fromInt(std.wasm.Section, current_byte) orelse {
2424 return step.fail("Found invalid section id '{d}'", .{current_byte});
2425 };
2426
2427 const section_length = try std.leb.readUleb128(u32, reader);
2428 try parseAndDumpSection(step, section, bytes[fbs.pos..][0..section_length], writer);
2429 fbs.pos += section_length;
2430 } else |_| {} // reached end of stream
23612431 },
2432
23622433 else => return step.fail("invalid check kind for Wasm file format: {s}", .{@tagName(check.kind)}),
23632434 }
23642435 }
......@@ -2366,13 +2437,16 @@ const WasmDumper = struct {
23662437 fn parseAndDumpSection(
23672438 step: *Step,
23682439 section: std.wasm.Section,
2369 r: *std.io.Reader,
2370 bw: *Writer,
2440 data: []const u8,
2441 writer: anytype,
23712442 ) !void {
2372 try bw.print(
2443 var fbs = std.io.fixedBufferStream(data);
2444 const reader = fbs.reader();
2445
2446 try writer.print(
23732447 \\Section {s}
23742448 \\size {d}
2375 , .{ @tagName(section), r.buffer.len });
2449 , .{ @tagName(section), data.len });
23762450
23772451 switch (section) {
23782452 .type,
......@@ -2386,83 +2460,96 @@ const WasmDumper = struct {
23862460 .code,
23872461 .data,
23882462 => {
2389 const entries = try r.takeLeb128(u32);
2390 try bw.print("\nentries {d}\n", .{entries});
2391 try parseSection(step, section, r, entries, bw);
2463 const entries = try std.leb.readUleb128(u32, reader);
2464 try writer.print("\nentries {d}\n", .{entries});
2465 try parseSection(step, section, data[fbs.pos..], entries, writer);
23922466 },
23932467 .custom => {
2394 const name = try r.take(try r.takeLeb128(u32));
2395 try bw.print("\nname {s}\n", .{name});
2468 const name_length = try std.leb.readUleb128(u32, reader);
2469 const name = data[fbs.pos..][0..name_length];
2470 fbs.pos += name_length;
2471 try writer.print("\nname {s}\n", .{name});
23962472
23972473 if (mem.eql(u8, name, "name")) {
2398 try parseDumpNames(step, r, bw);
2474 try parseDumpNames(step, reader, writer, data);
23992475 } else if (mem.eql(u8, name, "producers")) {
2400 try parseDumpProducers(r, bw);
2476 try parseDumpProducers(reader, writer, data);
24012477 } else if (mem.eql(u8, name, "target_features")) {
2402 try parseDumpFeatures(r, bw);
2478 try parseDumpFeatures(reader, writer, data);
24032479 }
24042480 // TODO: Implement parsing and dumping other custom sections (such as relocations)
24052481 },
24062482 .start => {
2407 const start = try r.takeLeb128(u32);
2408 try bw.print("\nstart {d}\n", .{start});
2483 const start = try std.leb.readUleb128(u32, reader);
2484 try writer.print("\nstart {d}\n", .{start});
24092485 },
24102486 .data_count => {
2411 const count = try r.takeLeb128(u32);
2412 try bw.print("\ncount {d}\n", .{count});
2487 const count = try std.leb.readUleb128(u32, reader);
2488 try writer.print("\ncount {d}\n", .{count});
24132489 },
24142490 else => {}, // skip unknown sections
24152491 }
24162492 }
24172493
2418 fn parseSection(step: *Step, section: std.wasm.Section, r: *std.io.Reader, entries: u32, bw: *Writer) !void {
2494 fn parseSection(step: *Step, section: std.wasm.Section, data: []const u8, entries: u32, writer: anytype) !void {
2495 var fbs = std.io.fixedBufferStream(data);
2496 const reader = fbs.reader();
2497
24192498 switch (section) {
24202499 .type => {
24212500 var i: u32 = 0;
24222501 while (i < entries) : (i += 1) {
2423 const func_type = try r.takeByte();
2502 const func_type = try reader.readByte();
24242503 if (func_type != std.wasm.function_type) {
24252504 return step.fail("expected function type, found byte '{d}'", .{func_type});
24262505 }
2427 const params = try r.takeLeb128(u32);
2428 try bw.print("params {d}\n", .{params});
2506 const params = try std.leb.readUleb128(u32, reader);
2507 try writer.print("params {d}\n", .{params});
24292508 var index: u32 = 0;
24302509 while (index < params) : (index += 1) {
2431 _ = try parseDumpType(step, std.wasm.Valtype, r, bw);
2510 _ = try parseDumpType(step, std.wasm.Valtype, reader, writer);
24322511 } else index = 0;
2433 const returns = try r.takeLeb128(u32);
2434 try bw.print("returns {d}\n", .{returns});
2512 const returns = try std.leb.readUleb128(u32, reader);
2513 try writer.print("returns {d}\n", .{returns});
24352514 while (index < returns) : (index += 1) {
2436 _ = try parseDumpType(step, std.wasm.Valtype, r, bw);
2515 _ = try parseDumpType(step, std.wasm.Valtype, reader, writer);
24372516 }
24382517 }
24392518 },
24402519 .import => {
24412520 var i: u32 = 0;
24422521 while (i < entries) : (i += 1) {
2443 const module_name = try r.take(try r.takeLeb128(u32));
2444 const name = try r.take(try r.takeLeb128(u32));
2445 const kind = r.takeEnum(std.wasm.ExternalKind, .little) catch |err| switch (err) {
2446 error.InvalidEnumTag => return step.fail("invalid import kind", .{}),
2447 else => |e| return e,
2522 const module_name_len = try std.leb.readUleb128(u32, reader);
2523 const module_name = data[fbs.pos..][0..module_name_len];
2524 fbs.pos += module_name_len;
2525 const name_len = try std.leb.readUleb128(u32, reader);
2526 const name = data[fbs.pos..][0..name_len];
2527 fbs.pos += name_len;
2528
2529 const kind = std.enums.fromInt(std.wasm.ExternalKind, try reader.readByte()) orelse {
2530 return step.fail("invalid import kind", .{});
24482531 };
24492532
2450 try bw.print(
2533 try writer.print(
24512534 \\module {s}
24522535 \\name {s}
24532536 \\kind {s}
24542537 , .{ module_name, name, @tagName(kind) });
2455 try bw.writeByte('\n');
2538 try writer.writeByte('\n');
24562539 switch (kind) {
2457 .function => try bw.print("index {d}\n", .{try r.takeLeb128(u32)}),
2458 .memory => try parseDumpLimits(r, bw),
2540 .function => {
2541 try writer.print("index {d}\n", .{try std.leb.readUleb128(u32, reader)});
2542 },
2543 .memory => {
2544 try parseDumpLimits(reader, writer);
2545 },
24592546 .global => {
2460 _ = try parseDumpType(step, std.wasm.Valtype, r, bw);
2461 try bw.print("mutable {}\n", .{0x01 == try r.takeLeb128(u32)});
2547 _ = try parseDumpType(step, std.wasm.Valtype, reader, writer);
2548 try writer.print("mutable {}\n", .{0x01 == try std.leb.readUleb128(u32, reader)});
24622549 },
24632550 .table => {
2464 _ = try parseDumpType(step, std.wasm.RefType, r, bw);
2465 try parseDumpLimits(r, bw);
2551 _ = try parseDumpType(step, std.wasm.RefType, reader, writer);
2552 try parseDumpLimits(reader, writer);
24662553 },
24672554 }
24682555 }
......@@ -2470,58 +2557,60 @@ const WasmDumper = struct {
24702557 .function => {
24712558 var i: u32 = 0;
24722559 while (i < entries) : (i += 1) {
2473 try bw.print("index {d}\n", .{try r.takeLeb128(u32)});
2560 try writer.print("index {d}\n", .{try std.leb.readUleb128(u32, reader)});
24742561 }
24752562 },
24762563 .table => {
24772564 var i: u32 = 0;
24782565 while (i < entries) : (i += 1) {
2479 _ = try parseDumpType(step, std.wasm.RefType, r, bw);
2480 try parseDumpLimits(r, bw);
2566 _ = try parseDumpType(step, std.wasm.RefType, reader, writer);
2567 try parseDumpLimits(reader, writer);
24812568 }
24822569 },
24832570 .memory => {
24842571 var i: u32 = 0;
24852572 while (i < entries) : (i += 1) {
2486 try parseDumpLimits(r, bw);
2573 try parseDumpLimits(reader, writer);
24872574 }
24882575 },
24892576 .global => {
24902577 var i: u32 = 0;
24912578 while (i < entries) : (i += 1) {
2492 _ = try parseDumpType(step, std.wasm.Valtype, r, bw);
2493 try bw.print("mutable {}\n", .{0x01 == try r.takeLeb128(u1)});
2494 try parseDumpInit(step, r, bw);
2579 _ = try parseDumpType(step, std.wasm.Valtype, reader, writer);
2580 try writer.print("mutable {}\n", .{0x01 == try std.leb.readUleb128(u1, reader)});
2581 try parseDumpInit(step, reader, writer);
24952582 }
24962583 },
24972584 .@"export" => {
24982585 var i: u32 = 0;
24992586 while (i < entries) : (i += 1) {
2500 const name = try r.take(try r.takeLeb128(u32));
2501 const kind = r.takeEnum(std.wasm.ExternalKind, .little) catch |err| switch (err) {
2502 error.InvalidEnumTag => return step.fail("invalid export kind value", .{}),
2503 else => |e| return e,
2587 const name_len = try std.leb.readUleb128(u32, reader);
2588 const name = data[fbs.pos..][0..name_len];
2589 fbs.pos += name_len;
2590 const kind_byte = try std.leb.readUleb128(u8, reader);
2591 const kind = std.enums.fromInt(std.wasm.ExternalKind, kind_byte) orelse {
2592 return step.fail("invalid export kind value '{d}'", .{kind_byte});
25042593 };
2505 const index = try r.takeLeb128(u32);
2506 try bw.print(
2594 const index = try std.leb.readUleb128(u32, reader);
2595 try writer.print(
25072596 \\name {s}
25082597 \\kind {s}
25092598 \\index {d}
25102599 , .{ name, @tagName(kind), index });
2511 try bw.writeByte('\n');
2600 try writer.writeByte('\n');
25122601 }
25132602 },
25142603 .element => {
25152604 var i: u32 = 0;
25162605 while (i < entries) : (i += 1) {
2517 try bw.print("table index {d}\n", .{try r.takeLeb128(u32)});
2518 try parseDumpInit(step, r, bw);
2606 try writer.print("table index {d}\n", .{try std.leb.readUleb128(u32, reader)});
2607 try parseDumpInit(step, reader, writer);
25192608
2520 const function_indexes = try r.takeLeb128(u32);
2609 const function_indexes = try std.leb.readUleb128(u32, reader);
25212610 var function_index: u32 = 0;
2522 try bw.print("indexes {d}\n", .{function_indexes});
2611 try writer.print("indexes {d}\n", .{function_indexes});
25232612 while (function_index < function_indexes) : (function_index += 1) {
2524 try bw.print("index {d}\n", .{try r.takeLeb128(u32)});
2613 try writer.print("index {d}\n", .{try std.leb.readUleb128(u32, reader)});
25252614 }
25262615 }
25272616 },
......@@ -2529,95 +2618,101 @@ const WasmDumper = struct {
25292618 .data => {
25302619 var i: u32 = 0;
25312620 while (i < entries) : (i += 1) {
2532 const flags: packed struct(u32) {
2533 passive: bool,
2534 memidx: bool,
2535 unused: u30,
2536 } = @bitCast(try r.takeLeb128(u32));
2537 const index = if (flags.memidx) try r.takeLeb128(u32) else 0;
2538 try bw.print("memory index 0x{x}\n", .{index});
2539 if (!flags.passive) try parseDumpInit(step, r, bw);
2540 const size = try r.takeLeb128(u32);
2541 try bw.print("size {d}\n", .{size});
2542 _ = try r.discard(.limited(size)); // we do not care about the content of the segments
2621 const flags = try std.leb.readUleb128(u32, reader);
2622 const index = if (flags & 0x02 != 0)
2623 try std.leb.readUleb128(u32, reader)
2624 else
2625 0;
2626 try writer.print("memory index 0x{x}\n", .{index});
2627 if (flags == 0) {
2628 try parseDumpInit(step, reader, writer);
2629 }
2630
2631 const size = try std.leb.readUleb128(u32, reader);
2632 try writer.print("size {d}\n", .{size});
2633 try reader.skipBytes(size, .{}); // we do not care about the content of the segments
25432634 }
25442635 },
25452636 else => unreachable,
25462637 }
25472638 }
25482639
2549 fn parseDumpType(step: *Step, comptime E: type, r: *std.io.Reader, bw: *Writer) !E {
2550 const tag = r.takeEnum(E, .little) catch |err| switch (err) {
2551 error.InvalidEnumTag => return step.fail("invalid wasm type value", .{}),
2552 else => |e| return e,
2640 fn parseDumpType(step: *Step, comptime E: type, reader: anytype, writer: anytype) !E {
2641 const byte = try reader.readByte();
2642 const tag = std.enums.fromInt(E, byte) orelse {
2643 return step.fail("invalid wasm type value '{d}'", .{byte});
25532644 };
2554 try bw.print("type {s}\n", .{@tagName(tag)});
2645 try writer.print("type {s}\n", .{@tagName(tag)});
25552646 return tag;
25562647 }
25572648
2558 fn parseDumpLimits(r: *std.io.Reader, bw: *Writer) !void {
2559 const flags = try r.takeLeb128(u8);
2560 const min = try r.takeLeb128(u32);
2649 fn parseDumpLimits(reader: anytype, writer: anytype) !void {
2650 const flags = try std.leb.readUleb128(u8, reader);
2651 const min = try std.leb.readUleb128(u32, reader);
25612652
2562 try bw.print("min {x}\n", .{min});
2563 if (flags != 0) try bw.print("max {x}\n", .{try r.takeLeb128(u32)});
2653 try writer.print("min {x}\n", .{min});
2654 if (flags != 0) {
2655 try writer.print("max {x}\n", .{try std.leb.readUleb128(u32, reader)});
2656 }
25642657 }
25652658
2566 fn parseDumpInit(step: *Step, r: *std.io.Reader, bw: *Writer) !void {
2567 const opcode = r.takeEnum(std.wasm.Opcode, .little) catch |err| switch (err) {
2568 error.InvalidEnumTag => return step.fail("invalid wasm opcode", .{}),
2569 else => |e| return e,
2659 fn parseDumpInit(step: *Step, reader: anytype, writer: anytype) !void {
2660 const byte = try reader.readByte();
2661 const opcode = std.enums.fromInt(std.wasm.Opcode, byte) orelse {
2662 return step.fail("invalid wasm opcode '{d}'", .{byte});
25702663 };
25712664 switch (opcode) {
2572 .i32_const => try bw.print("i32.const {x}\n", .{try r.takeLeb128(i32)}),
2573 .i64_const => try bw.print("i64.const {x}\n", .{try r.takeLeb128(i64)}),
2574 .f32_const => try bw.print("f32.const {x}\n", .{@as(f32, @bitCast(try r.takeInt(u32, .little)))}),
2575 .f64_const => try bw.print("f64.const {x}\n", .{@as(f64, @bitCast(try r.takeInt(u64, .little)))}),
2576 .global_get => try bw.print("global.get {x}\n", .{try r.takeLeb128(u32)}),
2665 .i32_const => try writer.print("i32.const {x}\n", .{try std.leb.readIleb128(i32, reader)}),
2666 .i64_const => try writer.print("i64.const {x}\n", .{try std.leb.readIleb128(i64, reader)}),
2667 .f32_const => try writer.print("f32.const {x}\n", .{@as(f32, @bitCast(try reader.readInt(u32, .little)))}),
2668 .f64_const => try writer.print("f64.const {x}\n", .{@as(f64, @bitCast(try reader.readInt(u64, .little)))}),
2669 .global_get => try writer.print("global.get {x}\n", .{try std.leb.readUleb128(u32, reader)}),
25772670 else => unreachable,
25782671 }
2579 const end_opcode = try r.takeLeb128(u8);
2672 const end_opcode = try std.leb.readUleb128(u8, reader);
25802673 if (end_opcode != @intFromEnum(std.wasm.Opcode.end)) {
25812674 return step.fail("expected 'end' opcode in init expression", .{});
25822675 }
25832676 }
25842677
25852678 /// https://webassembly.github.io/spec/core/appendix/custom.html
2586 fn parseDumpNames(step: *Step, r: *std.io.Reader, bw: *Writer) !void {
2587 var subsection_br: std.io.Reader = undefined;
2588 while (r.seek < r.buffer.len) {
2589 switch (try parseDumpType(step, std.wasm.NameSubsection, r, bw)) {
2679 fn parseDumpNames(step: *Step, reader: anytype, writer: anytype, data: []const u8) !void {
2680 while (reader.context.pos < data.len) {
2681 switch (try parseDumpType(step, std.wasm.NameSubsection, reader, writer)) {
25902682 // The module name subsection ... consists of a single name
25912683 // that is assigned to the module itself.
25922684 .module => {
2593 subsection_br = .fixed(try r.take(try r.takeLeb128(u32)));
2594 const name = try subsection_br.take(try subsection_br.takeLeb128(u32));
2595 try bw.print(
2596 \\name {s}
2597 \\
2598 , .{name});
2599 if (subsection_br.seek != subsection_br.buffer.len) return error.BadSubsectionSize;
2685 const size = try std.leb.readUleb128(u32, reader);
2686 const name_len = try std.leb.readUleb128(u32, reader);
2687 if (size != name_len + 1) return error.BadSubsectionSize;
2688 if (reader.context.pos + name_len > data.len) return error.UnexpectedEndOfStream;
2689 try writer.print("name {s}\n", .{data[reader.context.pos..][0..name_len]});
2690 reader.context.pos += name_len;
26002691 },
26012692
26022693 // The function name subsection ... consists of a name map
26032694 // assigning function names to function indices.
26042695 .function, .global, .data_segment => {
2605 subsection_br = .fixed(try r.take(try r.takeLeb128(u32)));
2606 const entries = try r.takeLeb128(u32);
2607 try bw.print(
2696 const size = try std.leb.readUleb128(u32, reader);
2697 const entries = try std.leb.readUleb128(u32, reader);
2698 try writer.print(
2699 \\size {d}
26082700 \\names {d}
26092701 \\
2610 , .{entries});
2702 , .{ size, entries });
26112703 for (0..entries) |_| {
2612 const index = try r.takeLeb128(u32);
2613 const name = try r.take(try r.takeLeb128(u32));
2614 try bw.print(
2704 const index = try std.leb.readUleb128(u32, reader);
2705 const name_len = try std.leb.readUleb128(u32, reader);
2706 if (reader.context.pos + name_len > data.len) return error.UnexpectedEndOfStream;
2707 const name = data[reader.context.pos..][0..name_len];
2708 reader.context.pos += name.len;
2709
2710 try writer.print(
26152711 \\index {d}
26162712 \\name {s}
26172713 \\
26182714 , .{ index, name });
26192715 }
2620 if (subsection_br.seek != subsection_br.buffer.len) return error.BadSubsectionSize;
26212716 },
26222717
26232718 // The local name subsection ... consists of an indirect name
......@@ -2632,49 +2727,52 @@ const WasmDumper = struct {
26322727 }
26332728 }
26342729
2635 fn parseDumpProducers(r: *std.io.Reader, bw: *Writer) !void {
2636 const field_count = try r.takeLeb128(u32);
2637 try bw.print(
2638 \\fields {d}
2639 \\
2640 , .{field_count});
2730 fn parseDumpProducers(reader: anytype, writer: anytype, data: []const u8) !void {
2731 const field_count = try std.leb.readUleb128(u32, reader);
2732 try writer.print("fields {d}\n", .{field_count});
26412733 var current_field: u32 = 0;
26422734 while (current_field < field_count) : (current_field += 1) {
2643 const field_name = try r.take(try r.takeLeb128(u32));
2644 const value_count = try r.takeLeb128(u32);
2645 try bw.print(
2735 const field_name_length = try std.leb.readUleb128(u32, reader);
2736 const field_name = data[reader.context.pos..][0..field_name_length];
2737 reader.context.pos += field_name_length;
2738
2739 const value_count = try std.leb.readUleb128(u32, reader);
2740 try writer.print(
26462741 \\field_name {s}
26472742 \\values {d}
2648 \\
26492743 , .{ field_name, value_count });
2744 try writer.writeByte('\n');
26502745 var current_value: u32 = 0;
26512746 while (current_value < value_count) : (current_value += 1) {
2652 const value = try r.take(try r.takeLeb128(u32));
2653 const version = try r.take(try r.takeLeb128(u32));
2654 try bw.print(
2747 const value_length = try std.leb.readUleb128(u32, reader);
2748 const value = data[reader.context.pos..][0..value_length];
2749 reader.context.pos += value_length;
2750
2751 const version_length = try std.leb.readUleb128(u32, reader);
2752 const version = data[reader.context.pos..][0..version_length];
2753 reader.context.pos += version_length;
2754
2755 try writer.print(
26552756 \\value_name {s}
26562757 \\version {s}
2657 \\
26582758 , .{ value, version });
2759 try writer.writeByte('\n');
26592760 }
26602761 }
26612762 }
26622763
2663 fn parseDumpFeatures(r: *std.io.Reader, bw: *Writer) !void {
2664 const feature_count = try r.takeLeb128(u32);
2665 try bw.print(
2666 \\features {d}
2667 \\
2668 , .{feature_count});
2764 fn parseDumpFeatures(reader: anytype, writer: anytype, data: []const u8) !void {
2765 const feature_count = try std.leb.readUleb128(u32, reader);
2766 try writer.print("features {d}\n", .{feature_count});
26692767
26702768 var index: u32 = 0;
26712769 while (index < feature_count) : (index += 1) {
2672 const prefix_byte = try r.takeLeb128(u8);
2673 const feature_name = try r.take(try r.takeLeb128(u32));
2674 try bw.print(
2675 \\{c} {s}
2676 \\
2677 , .{ prefix_byte, feature_name });
2770 const prefix_byte = try std.leb.readUleb128(u8, reader);
2771 const name_length = try std.leb.readUleb128(u32, reader);
2772 const feature_name = data[reader.context.pos..][0..name_length];
2773 reader.context.pos += name_length;
2774
2775 try writer.print("{c} {s}\n", .{ prefix_byte, feature_name });
26782776 }
26792777 }
26802778};