authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-10-19 12:19:20+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-10-22 07:59:23+02:00
loga32bc0e39c9d2b33547241fcb9868d72e52ee1df
tree69bb56e02e6af8263215a85ad3096b9a397a2cab
parent04a590a171c68570be1b2371617d747efbda7f1f

macho: fix 32bit build

3 files changed, 35 insertions(+), 21 deletions(-)

src/link/MachO/DwarfInfo.zig+19-13
......@@ -5,6 +5,7 @@ const assert = std.debug.assert;
55const dwarf = std.dwarf;
66const leb = std.leb;
77const log = std.log.scoped(.macho);
8const math = std.math;
89const mem = std.mem;
910
1011const Allocator = mem.Allocator;
......@@ -32,13 +33,14 @@ const CompileUnitIterator = struct {
3233
3334 const cuh = try CompileUnit.Header.read(reader);
3435 const total_length = cuh.length + @as(u64, if (cuh.is_64bit) @sizeOf(u64) else @sizeOf(u32));
36 const offset = math.cast(usize, creader.bytes_read) orelse return error.Overflow;
3537
3638 const cu = CompileUnit{
3739 .cuh = cuh,
38 .debug_info_off = creader.bytes_read,
40 .debug_info_off = offset,
3941 };
4042
41 self.pos += total_length;
43 self.pos += (math.cast(usize, total_length) orelse return error.Overflow);
4244
4345 return cu;
4446 }
......@@ -102,7 +104,7 @@ pub fn genAbbrevLookupByKind(self: DwarfInfo, off: usize, lookup: *AbbrevLookupT
102104
103105 if (kind == 0) break;
104106
105 const pos = creader.bytes_read;
107 const pos = math.cast(usize, creader.bytes_read) orelse return error.Overflow;
106108 _ = try leb.readULEB128(u64, reader); // TAG
107109 _ = try reader.readByte(); // CHILDREN
108110
......@@ -113,9 +115,11 @@ pub fn genAbbrevLookupByKind(self: DwarfInfo, off: usize, lookup: *AbbrevLookupT
113115 if (name == 0 and form == 0) break;
114116 }
115117
118 const next_pos = math.cast(usize, creader.bytes_read) orelse return error.Overflow;
119
116120 try lookup.putNoClobber(kind, .{
117121 .pos = pos,
118 .len = creader.bytes_read - pos - 2,
122 .len = next_pos - pos - 2,
119123 });
120124 }
121125}
......@@ -179,7 +183,7 @@ const AbbrevEntryIterator = struct {
179183 const reader = creader.reader();
180184
181185 const kind = try leb.readULEB128(u64, reader);
182 self.pos += creader.bytes_read;
186 self.pos += (math.cast(usize, creader.bytes_read) orelse return error.Overflow);
183187
184188 if (kind == 0) {
185189 return AbbrevEntry.@"null"();
......@@ -325,7 +329,7 @@ const AttributeIterator = struct {
325329 const name = try leb.readULEB128(u64, reader);
326330 const form = try leb.readULEB128(u64, reader);
327331
328 self.debug_abbrev_pos += creader.bytes_read;
332 self.debug_abbrev_pos += (math.cast(usize, creader.bytes_read) orelse return error.Overflow);
329333
330334 const len = try findFormSize(
331335 self.ctx,
......@@ -366,11 +370,13 @@ fn getAbbrevEntry(self: DwarfInfo, da_off: usize, da_len: usize, di_off: usize,
366370 else => try reader.readByte(),
367371 };
368372
373 const pos = math.cast(usize, creader.bytes_read) orelse return error.Overflow;
374
369375 return AbbrevEntry{
370376 .tag = tag,
371377 .children = children,
372 .debug_abbrev_off = creader.bytes_read + da_off,
373 .debug_abbrev_len = da_len - creader.bytes_read,
378 .debug_abbrev_off = pos + da_off,
379 .debug_abbrev_len = da_len - pos,
374380 .debug_info_off = di_off,
375381 .debug_info_len = di_len,
376382 };
......@@ -392,7 +398,7 @@ fn findFormSize(self: DwarfInfo, form: u64, di_off: usize, cuh: CompileUnit.Head
392398 while (i < expr_len) : (i += 1) {
393399 _ = try reader.readByte();
394400 }
395 return creader.bytes_read;
401 return math.cast(usize, creader.bytes_read) orelse error.Overflow;
396402 },
397403 dwarf.FORM.flag_present => return 0,
398404
......@@ -402,11 +408,11 @@ fn findFormSize(self: DwarfInfo, form: u64, di_off: usize, cuh: CompileUnit.Head
402408 dwarf.FORM.data8 => return @sizeOf(u64),
403409 dwarf.FORM.udata => {
404410 _ = try leb.readULEB128(u64, reader);
405 return creader.bytes_read;
411 return math.cast(usize, creader.bytes_read) orelse error.Overflow;
406412 },
407413 dwarf.FORM.sdata => {
408414 _ = try leb.readILEB128(i64, reader);
409 return creader.bytes_read;
415 return math.cast(usize, creader.bytes_read) orelse error.Overflow;
410416 },
411417
412418 dwarf.FORM.ref1 => return @sizeOf(u8),
......@@ -415,7 +421,7 @@ fn findFormSize(self: DwarfInfo, form: u64, di_off: usize, cuh: CompileUnit.Head
415421 dwarf.FORM.ref8 => return @sizeOf(u64),
416422 dwarf.FORM.ref_udata => {
417423 _ = try leb.readULEB128(u64, reader);
418 return creader.bytes_read;
424 return math.cast(usize, creader.bytes_read) orelse error.Overflow;
419425 },
420426
421427 else => return error.ToDo,
......@@ -457,5 +463,5 @@ fn findAbbrevEntrySize(self: DwarfInfo, da_off: usize, da_len: usize, di_off: us
457463
458464fn getString(self: DwarfInfo, off: u64) []const u8 {
459465 assert(off < self.debug_str.len);
460 return mem.sliceTo(@ptrCast([*:0]const u8, self.debug_str.ptr + off), 0);
466 return mem.sliceTo(@ptrCast([*:0]const u8, self.debug_str.ptr + @intCast(usize, off)), 0);
461467}
src/link/MachO/ZldAtom.zig+5-3
......@@ -925,13 +925,15 @@ pub fn getAtomCode(zld: *Zld, atom_index: AtomIndex) []const u8 {
925925
926926 assert(!source_sect.isZerofill());
927927 const code = object.getSectionContents(source_sect);
928 return code[0..atom.size];
928 const code_len = @intCast(usize, atom.size);
929 return code[0..code_len];
929930 };
930931 const source_sect = object.getSourceSection(source_sym.n_sect - 1);
931932 assert(!source_sect.isZerofill());
932 const offset = source_sym.n_value - source_sect.addr;
933933 const code = object.getSectionContents(source_sect);
934 return code[offset..][0..atom.size];
934 const offset = @intCast(usize, source_sym.n_value - source_sect.addr);
935 const code_len = @intCast(usize, atom.size);
936 return code[offset..][0..code_len];
935937}
936938
937939pub fn getAtomRelocs(zld: *Zld, atom_index: AtomIndex) []align(1) const macho.relocation_info {
src/link/MachO/zld.zig+11-5
......@@ -1725,11 +1725,12 @@ pub const Zld = struct {
17251725 } else {
17261726 const code = Atom.getAtomCode(self, atom_index);
17271727 const relocs = Atom.getAtomRelocs(self, atom_index);
1728 const size = math.cast(usize, atom.size) orelse return error.Overflow;
17281729 buffer.appendSliceAssumeCapacity(code);
17291730 try Atom.resolveRelocs(
17301731 self,
17311732 atom_index,
1732 buffer.items[offset..][0..atom.size],
1733 buffer.items[offset..][0..size],
17331734 relocs,
17341735 reverse_lookups[atom.getFile().?],
17351736 );
......@@ -2457,7 +2458,7 @@ pub const Zld = struct {
24572458 const export_size = trie.size;
24582459 log.debug("writing export trie from 0x{x} to 0x{x}", .{ export_off, export_off + export_size });
24592460
2460 const needed_size = export_off + export_size - rebase_off;
2461 const needed_size = math.cast(usize, export_off + export_size - rebase_off) orelse return error.Overflow;
24612462 link_seg.filesize = needed_size;
24622463
24632464 var buffer = try gpa.alloc(u8, needed_size);
......@@ -2484,7 +2485,10 @@ pub const Zld = struct {
24842485 });
24852486
24862487 try self.file.pwriteAll(buffer, rebase_off);
2487 try self.populateLazyBindOffsetsInStubHelper(buffer[lazy_bind_off - rebase_off ..][0..lazy_bind_size]);
2488
2489 const offset = math.cast(usize, lazy_bind_off - rebase_off) orelse return error.Overflow;
2490 const size = math.cast(usize, lazy_bind_size) orelse return error.Overflow;
2491 try self.populateLazyBindOffsetsInStubHelper(buffer[offset..][0..size]);
24882492
24892493 try lc_writer.writeStruct(macho.dyld_info_command{
24902494 .cmd = .DYLD_INFO_ONLY,
......@@ -3210,7 +3214,8 @@ pub const Zld = struct {
32103214 // We assume there is only one CU.
32113215 var cu_it = debug_info.getCompileUnitIterator();
32123216 const compile_unit = while (try cu_it.next()) |cu| {
3213 try debug_info.genAbbrevLookupByKind(cu.cuh.debug_abbrev_offset, &lookup);
3217 const offset = math.cast(usize, cu.cuh.debug_abbrev_offset) orelse return error.Overflow;
3218 try debug_info.genAbbrevLookupByKind(offset, &lookup);
32143219 break cu;
32153220 } else {
32163221 log.debug("no compile unit found in debug info in {s}; skipping", .{object.name});
......@@ -4273,7 +4278,8 @@ pub fn linkWithZld(macho_file: *MachO, comp: *Compilation, prog_node: *std.Progr
42734278 physical_zerofill_start = header.offset + header.size;
42744279 } else break :blk;
42754280 const linkedit = zld.getLinkeditSegmentPtr();
4276 const physical_zerofill_size = linkedit.fileoff - physical_zerofill_start;
4281 const physical_zerofill_size = math.cast(usize, linkedit.fileoff - physical_zerofill_start) orelse
4282 return error.Overflow;
42774283 if (physical_zerofill_size > 0) {
42784284 var padding = try zld.gpa.alloc(u8, physical_zerofill_size);
42794285 defer zld.gpa.free(padding);