authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-12-05 22:34:10+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-12-09 09:24:25+01:00
log4c4821d9939447d65966b897a5780e39eb22334b
treee725c6d9d2363e42f4550d4b9ffd44f0a23ce422
parent5c67f9ce7a4d9f5aedbe8cfba1f361922701a144

dwarf: specify all referenced zig source files

1 files changed, 84 insertions(+), 15 deletions(-)

src/link/Dwarf.zig+84-15
......@@ -44,6 +44,11 @@ abbrev_table_offset: ?u64 = null,
4444/// Table of debug symbol names.
4545strtab: std.ArrayListUnmanaged(u8) = .{},
4646
47file_names_buffer: std.ArrayListUnmanaged(u8) = .{},
48file_names: std.ArrayListUnmanaged(u32) = .{},
49file_names_free_list: std.ArrayListUnmanaged(u28) = .{},
50file_names_lookup: std.AutoHashMapUnmanaged(*Module.File, u28) = .{},
51
4752/// List of atoms that are owned directly by the DWARF module.
4853/// TODO convert links in DebugInfoAtom into indices and make
4954/// sure every atom is owned by this module.
......@@ -906,6 +911,10 @@ pub fn deinit(self: *Dwarf) void {
906911 self.dbg_line_fn_free_list.deinit(gpa);
907912 self.atom_free_list.deinit(gpa);
908913 self.strtab.deinit(gpa);
914 self.file_names_buffer.deinit(gpa);
915 self.file_names.deinit(gpa);
916 self.file_names_free_list.deinit(gpa);
917 self.file_names_lookup.deinit(gpa);
909918 self.global_abbrev_relocs.deinit(gpa);
910919
911920 for (self.managed_atoms.items) |atom| {
......@@ -968,8 +977,12 @@ pub fn initDeclState(self: *Dwarf, mod: *Module, decl_index: Module.Decl.Index)
968977 assert(self.getRelocDbgFileIndex() == dbg_line_buffer.items.len);
969978 // Once we support more than one source file, this will have the ability to be more
970979 // than one possible value.
971 const file_index = 1;
972 leb128.writeUnsignedFixed(4, dbg_line_buffer.addManyAsArrayAssumeCapacity(4), file_index);
980 const file_index = try self.addFileName(mod, decl_index);
981 leb128.writeUnsignedFixed(
982 4,
983 dbg_line_buffer.addManyAsArrayAssumeCapacity(4),
984 file_index + 1,
985 );
973986
974987 // Emit a line for the begin curly with prologue_end=false. The codegen will
975988 // do the work of setting prologue_end=true and epilogue_begin=true.
......@@ -1132,7 +1145,8 @@ pub fn commitDeclState(
11321145 self.dbg_line_fn_first = src_fn;
11331146 self.dbg_line_fn_last = src_fn;
11341147
1135 src_fn.off = padToIdeal(self.dbgLineNeededHeaderBytes(module));
1148 // TODO TEXME JK
1149 src_fn.off = padToIdeal(self.dbgLineNeededHeaderBytes(module) * 100);
11361150 }
11371151
11381152 const last_src_fn = self.dbg_line_fn_last.?;
......@@ -2271,6 +2285,7 @@ pub fn writeDbgLineHeader(self: *Dwarf, file: *File, module: *Module) !void {
22712285 // files, and padding. We have a function to compute the upper bound size, however,
22722286 // because it's needed for determining where to put the offset of the first `SrcFn`.
22732287 const needed_bytes = self.dbgLineNeededHeaderBytes(module);
2288 log.debug("dbg_line_prg_off = {x}, needed_bytes = {x}", .{ dbg_line_prg_off, needed_bytes });
22742289 var di_buf = try std.ArrayList(u8).initCapacity(self.allocator, needed_bytes);
22752290 defer di_buf.deinit();
22762291
......@@ -2325,15 +2340,28 @@ pub fn writeDbgLineHeader(self: *Dwarf, file: *File, module: *Module) !void {
23252340 1, // `DW.LNS.set_isa`
23262341 0, // include_directories (none except the compilation unit cwd)
23272342 });
2328 // file_names[0]
2329 di_buf.appendSliceAssumeCapacity(module.root_pkg.root_src_path); // relative path name
2330 di_buf.appendSliceAssumeCapacity(&[_]u8{
2331 0, // null byte for the relative path name
2332 0, // directory_index
2333 0, // mtime (TODO supply this)
2334 0, // file size bytes (TODO supply this)
2335 0, // file_names sentinel
2336 });
2343 // // file_names[0]
2344 // di_buf.appendSliceAssumeCapacity(module.root_pkg.root_src_path); // relative path name
2345 // di_buf.appendSliceAssumeCapacity(&[_]u8{
2346 // 0, // null byte for the relative path name
2347 // 0, // directory_index
2348 // 0, // mtime (TODO supply this)
2349 // 0, // file size bytes (TODO supply this)
2350 // 0, // file_names sentinel
2351 // });
2352
2353 for (self.file_names.items) |off, i| {
2354 const file_name = self.getFileName(off);
2355 log.debug("file_name[{d}] = {s}", .{ i + 1, file_name });
2356 di_buf.appendSliceAssumeCapacity(file_name);
2357 di_buf.appendSliceAssumeCapacity(&[_]u8{
2358 0, // null byte for the relative path name
2359 0, // directory_index
2360 0, // mtime (TODO supply this)
2361 0, // file size bytes (TODO supply this)
2362 });
2363 }
2364 di_buf.appendAssumeCapacity(0); // file names sentinel
23372365
23382366 const header_len = di_buf.items.len - after_header_len;
23392367 if (self.tag == .macho) {
......@@ -2405,18 +2433,18 @@ fn ptrWidthBytes(self: Dwarf) u8 {
24052433}
24062434
24072435fn dbgLineNeededHeaderBytes(self: Dwarf, module: *Module) u32 {
2408 _ = self;
24092436 const directory_entry_format_count = 1;
24102437 const file_name_entry_format_count = 1;
24112438 const directory_count = 1;
2412 const file_name_count = 1;
2439 const file_name_count = self.file_names.items.len;
24132440 const root_src_dir_path_len = if (module.root_pkg.root_src_directory.path) |p| p.len else 1; // "."
2441
24142442 return @intCast(u32, 53 + directory_entry_format_count * 2 + file_name_entry_format_count * 2 +
24152443 directory_count * 8 + file_name_count * 8 +
24162444 // These are encoded as DW.FORM.string rather than DW.FORM.strp as we would like
24172445 // because of a workaround for readelf and gdb failing to understand DWARFv5 correctly.
24182446 root_src_dir_path_len +
2419 module.root_pkg.root_src_path.len);
2447 self.file_names_buffer.items.len);
24202448}
24212449
24222450/// The reloc offset for the line offset of a function from the previous function's line.
......@@ -2527,6 +2555,47 @@ pub fn flushModule(self: *Dwarf, file: *File, module: *Module) !void {
25272555 }
25282556}
25292557
2558fn allocateFileIndex(self: *Dwarf) !u28 {
2559 try self.file_names.ensureUnusedCapacity(self.allocator, 1);
2560
2561 const index = blk: {
2562 if (self.file_names_free_list.popOrNull()) |index| {
2563 log.debug(" (reusing file name index {d})", .{index});
2564 break :blk index;
2565 } else {
2566 const index = @intCast(u28, self.file_names.items.len);
2567 log.debug(" (allocating file name index {d})", .{index});
2568 _ = self.file_names.addOneAssumeCapacity();
2569 break :blk index;
2570 }
2571 };
2572
2573 return index;
2574}
2575
2576fn addFileName(self: *Dwarf, mod: *Module, decl_index: Module.Decl.Index) !u28 {
2577 const decl = mod.declPtr(decl_index);
2578 const file_scope = decl.getFileScope();
2579 if (self.file_names_lookup.get(file_scope)) |file_index| {
2580 return file_index;
2581 }
2582 const index = try self.allocateFileIndex();
2583 const file_name = try file_scope.fullPath(self.allocator);
2584 defer self.allocator.free(file_name);
2585 try self.file_names_buffer.ensureUnusedCapacity(self.allocator, file_name.len + 1);
2586 const off = @intCast(u32, self.file_names_buffer.items.len);
2587 self.file_names_buffer.appendSliceAssumeCapacity(file_name);
2588 self.file_names_buffer.appendAssumeCapacity(0);
2589 self.file_names.items[index] = off;
2590 try self.file_names_lookup.putNoClobber(self.allocator, file_scope, index);
2591 return index;
2592}
2593
2594fn getFileName(self: Dwarf, off: u32) []const u8 {
2595 assert(off < self.file_names_buffer.items.len);
2596 return mem.sliceTo(@ptrCast([*:0]const u8, self.file_names_buffer.items.ptr) + off, 0);
2597}
2598
25302599fn addDbgInfoErrorSet(
25312600 arena: Allocator,
25322601 module: *Module,