mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-06 13:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

more still

Browse Source
This commit is contained in:
mlugg 2025-09-02 12:22:59 +01:00
parent ed6ed62c42
commit fb88dab4c9
No known key found for this signature in database
GPG Key ID: 3F5B7DCCBF4AF02E
2 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lib/std/debug/Dwarf.zig
View File

@ -1451,18 +1451,10 @@ fn getStringGeneric(opt_str: ?[]const u8, offset: u64) ![:0]const u8 {
// MLUGG TODO: i am dubious of this whole thing being here atp. look closely and see if it depends on being the self process
pub const ElfModule = struct {
unwind: Dwarf.Unwind,
dwarf: Dwarf,
mapped_memory: ?[]align(std.heap.page_size_min) const u8,
mapped_memory: []align(std.heap.page_size_min) const u8,
external_mapped_memory: ?[]align(std.heap.page_size_min) const u8,
pub const init: ElfModule = .{
.unwind = .init,
.dwarf = .{},
.mapped_memory = null,
.external_mapped_memory = null,
};
pub fn deinit(self: *@This(), allocator: Allocator) void {
self.dwarf.deinit(allocator);
std.posix.munmap(self.mapped_memory);
@ -1476,12 +1468,6 @@ pub const ElfModule = struct {
return self.dwarf.getSymbol(allocator, endian, vaddr);
}
pub fn getDwarfUnwindForAddress(self: *@This(), allocator: Allocator, address: usize) !?*Dwarf.Unwind {
_ = allocator;
_ = address;
return &self.unwind;
}
pub const LoadError = error{
InvalidDebugInfo,
MissingDebugInfo,
@ -1506,10 +1492,7 @@ pub const ElfModule = struct {
/// If the required sections aren't present but a reference to external debug
/// info is, then this this function will recurse to attempt to load the debug
/// sections from an external file.
///
/// MLUGG TODO: this should *return* a thing
pub fn load(
em: *ElfModule,
gpa: Allocator,
mapped_mem: []align(std.heap.page_size_min) const u8,
build_id: ?[]const u8,
@ -1517,9 +1500,7 @@ pub const ElfModule = struct {
parent_sections: ?*Dwarf.SectionArray,
parent_mapped_mem: ?[]align(std.heap.page_size_min) const u8,
elf_filename: ?[]const u8,
) LoadError!void {
assert(em.mapped_memory == null);
) LoadError!ElfModule {
if (expected_crc) |crc| if (crc != std.hash.crc.Crc32.hash(mapped_mem)) return error.InvalidDebugInfo;
const hdr: *const elf.Ehdr = @ptrCast(&mapped_mem[0]);
@ -1657,7 +1638,7 @@ pub const ElfModule = struct {
.sub_path = filename,
};
return em.loadPath(gpa, path, null, separate_debug_crc, &sections, mapped_mem) catch break :blk;
return loadPath(gpa, path, null, separate_debug_crc, &sections, mapped_mem) catch break :blk;
}
const global_debug_directories = [_][]const u8{
@ -1685,7 +1666,7 @@ pub const ElfModule = struct {
};
defer gpa.free(path.sub_path);
return em.loadPath(gpa, path, null, separate_debug_crc, &sections, mapped_mem) catch continue;
return loadPath(gpa, path, null, separate_debug_crc, &sections, mapped_mem) catch continue;
}
}
@ -1701,7 +1682,7 @@ pub const ElfModule = struct {
defer exe_dir.close();
// <exe_dir>/<gnu_debuglink>
if (em.loadPath(
if (loadPath(
gpa,
.{
.root_dir = .{ .path = null, .handle = exe_dir },
@ -1711,9 +1692,8 @@ pub const ElfModule = struct {
separate_debug_crc,
&sections,
mapped_mem,
)) |v| {
v;
return;
)) |em| {
return em;
} else |_| {}
// <exe_dir>/.debug/<gnu_debuglink>
@ -1723,7 +1703,9 @@ pub const ElfModule = struct {
};
defer gpa.free(path.sub_path);
if (em.loadPath(gpa, path, null, separate_debug_crc, &sections, mapped_mem)) |debug_info| return debug_info else |_| {}
if (loadPath(gpa, path, null, separate_debug_crc, &sections, mapped_mem)) |em| {
return em;
} else |_| {}
}
var cwd_buf: [std.fs.max_path_bytes]u8 = undefined;
@ -1736,28 +1718,32 @@ pub const ElfModule = struct {
.sub_path = try std.fs.path.join(gpa, &.{ global_directory, cwd_path, separate_filename }),
};
defer gpa.free(path.sub_path);
if (em.loadPath(gpa, path, null, separate_debug_crc, &sections, mapped_mem)) |debug_info| return debug_info else |_| {}
if (loadPath(gpa, path, null, separate_debug_crc, &sections, mapped_mem)) |em| {
return em;
} else |_| {}
}
}
return error.MissingDebugInfo;
}
em.mapped_memory = parent_mapped_mem orelse mapped_mem;
em.external_mapped_memory = if (parent_mapped_mem != null) mapped_mem else null;
em.dwarf.sections = sections;
try em.dwarf.open(gpa, endian);
var dwarf: Dwarf = .{ .sections = sections };
try dwarf.open(gpa, endian);
return .{
.mapped_memory = parent_mapped_mem orelse mapped_mem,
.external_mapped_memory = if (parent_mapped_mem != null) mapped_mem else null,
.dwarf = dwarf,
};
}
pub fn loadPath(
em: *ElfModule,
gpa: Allocator,
elf_file_path: Path,
build_id: ?[]const u8,
expected_crc: ?u32,
parent_sections: *Dwarf.SectionArray,
parent_mapped_mem: ?[]align(std.heap.page_size_min) const u8,
) LoadError!void {
) LoadError!ElfModule {
const elf_file = elf_file_path.root_dir.handle.openFile(elf_file_path.sub_path, .{}) catch |err| switch (err) {
error.FileNotFound => return missing(),
else => return err,
@ -1780,7 +1766,7 @@ pub const ElfModule = struct {
};
errdefer std.posix.munmap(mapped_mem);
return em.load(
return load(
gpa,
mapped_mem,
build_id,

16
lib/std/debug/SelfInfo.zig
View File

@ -99,10 +99,7 @@ pub fn unwindFrame(self: *SelfInfo, gpa: Allocator, context: *UnwindContext) !us
}
return error.MissingUnwindInfo;
}
if (try gop.value_ptr.di.getDwarfUnwindForAddress(gpa, context.pc)) |unwind| {
return unwindFrameDwarf(unwind, module.load_offset, context, null);
}
return error.MissingDebugInfo;
return unwindFrameDwarf(&gop.value_ptr.di.unwind, module.load_offset, context, null);
}
pub fn getSymbolAtAddress(self: *SelfInfo, gpa: Allocator, address: usize) !std.debug.Symbol {
@ -409,7 +406,11 @@ const Module = switch (native_os) {
build_id: ?[]const u8,
gnu_eh_frame: ?[]const u8,
const LookupCache = void;
const DebugInfo = Dwarf.ElfModule;
const DebugInfo = struct {
const init: DebugInfo = undefined; // MLUGG TODO: this makes me sad
em: Dwarf.ElfModule, // MLUGG TODO: bad field name (and, frankly, type)
unwind: Dwarf.Unwind,
};
fn key(m: Module) usize {
return m.load_offset; // MLUGG TODO: is this technically valid? idk
}
@ -492,8 +493,7 @@ const Module = switch (native_os) {
else => |e| return e,
};
errdefer posix.munmap(mapped_mem);
try di.load(gpa, mapped_mem, module.build_id, null, null, null, filename);
assert(di.mapped_memory != null);
di.em = try .load(gpa, mapped_mem, module.build_id, null, null, null, filename);
}
fn loadUnwindInfo(module: *const Module, gpa: Allocator, di: *Module.DebugInfo) !void {
const section_bytes = module.gnu_eh_frame orelse return error.MissingUnwindInfo; // MLUGG TODO: load from file
@ -503,7 +503,7 @@ const Module = switch (native_os) {
try di.unwind.prepareLookup(gpa, @sizeOf(usize), native_endian);
}
fn getSymbolAtAddress(module: *const Module, gpa: Allocator, di: *DebugInfo, address: usize) !std.debug.Symbol {
return di.getSymbolAtAddress(gpa, native_endian, module.load_offset, address);
return di.em.getSymbolAtAddress(gpa, native_endian, module.load_offset, address);
}
},
.uefi, .windows => struct {