Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-24 21:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

macho: fix 32bit builds

Browse Source
This commit is contained in:
Jakub Konka 2024-10-18 10:40:05 +02:00
parent ee458b020f
commit caf96e6c2c
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/link/MachO/Dwarf.zig
View File

@ -14,10 +14,18 @@ pub fn deinit(dwarf: *Dwarf, allocator: Allocator) void {
/// This is new in DWARFv5 and requires the producer to specify DW_FORM_strx* (`index` arg) /// This is new in DWARFv5 and requires the producer to specify DW_FORM_strx* (`index` arg)
/// but also DW_AT_str_offsets_base with DW_FORM_sec_offset (`base` arg) in the opening header /// but also DW_AT_str_offsets_base with DW_FORM_sec_offset (`base` arg) in the opening header
/// of a "referencing entity" such as DW_TAG_compile_unit. /// of a "referencing entity" such as DW_TAG_compile_unit.
fn getOffset(debug_str_offsets: []const u8, base: u64, index: u64, dw_fmt: DwarfFormat) u64 { fn getOffset(debug_str_offsets: []const u8, base: u64, index: u64, dw_fmt: DwarfFormat) error{Overflow}!u64 {
const base_as_usize = math.cast(usize, base) orelse return error.Overflow;
const index_as_usize = math.cast(usize, index) orelse return error.Overflow;
return switch (dw_fmt) { return switch (dw_fmt) {
.dwarf32 => @as(*align(1) const u32, @ptrCast(debug_str_offsets.ptr + base + index * @sizeOf(u32))).*, .dwarf32 => @as(
.dwarf64 => @as(*align(1) const u64, @ptrCast(debug_str_offsets.ptr + base + index * @sizeOf(u64))).*, *align(1) const u32,
@ptrCast(debug_str_offsets.ptr + base_as_usize + index_as_usize * @sizeOf(u32)),
).*,
.dwarf64 => @as(
*align(1) const u64,
@ptrCast(debug_str_offsets.ptr + base_as_usize + index_as_usize * @sizeOf(u64)),
).*,
}; };
} }
@ -228,7 +236,10 @@ pub const InfoReader = struct {
dw.FORM.strx4, dw.FORM.strx4,
=> { => {
const index = try p.readIndex(form); const index = try p.readIndex(form);
const off = getOffset(p.ctx.debug_str_offsets, base, index, cuh.format); const off = math.cast(
usize,
try getOffset(p.ctx.debug_str_offsets, base, index, cuh.format),
) orelse return error.Overflow;
return mem.sliceTo(@as([*:0]const u8, @ptrCast(p.ctx.debug_str.ptr + off)), 0); return mem.sliceTo(@as([*:0]const u8, @ptrCast(p.ctx.debug_str.ptr + off)), 0);
}, },
else => unreachable, else => unreachable,