authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-10-23 16:29:08+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-10-23 21:53:36+02:00
log828735ac036abba77ffce2bf963c04f99f1687c8
treee4bd74b0b943773bd50ea6496cb11dc100bfd8e2
parent04472af328632d80ea9ea089cfd5de8fac6dd039

macho: handle majority of DW_FORM_ values for DWARF4 in the linker


1 files changed, 42 insertions(+), 16 deletions(-)

src/link/MachO/DwarfInfo.zig+42-16
......@@ -63,7 +63,6 @@ pub fn genSubprogramLookupByName(
6363
6464 while (try attr_it.next()) |attr| switch (attr.name) {
6565 dwarf.AT.name => if (attr.getString(self, compile_unit.cuh)) |str| {
66 log.warn("subprogram: {s}", .{str});
6766 name = str;
6867 },
6968 dwarf.AT.low_pc => {
......@@ -389,8 +388,11 @@ fn findFormSize(self: DwarfInfo, form: u64, di_off: usize, cuh: CompileUnit.Head
389388 const reader = creader.reader();
390389
391390 switch (form) {
392 dwarf.FORM.strp => return if (cuh.is_64bit) @sizeOf(u64) else @sizeOf(u32),
393 dwarf.FORM.sec_offset => return if (cuh.is_64bit) @sizeOf(u64) else @sizeOf(u32),
391 dwarf.FORM.strp,
392 dwarf.FORM.sec_offset,
393 dwarf.FORM.ref_addr,
394 => return if (cuh.is_64bit) @sizeOf(u64) else @sizeOf(u32),
395
394396 dwarf.FORM.addr => return cuh.address_size,
395397 dwarf.FORM.exprloc => {
396398 const expr_len = try leb.readULEB128(u64, reader);
......@@ -402,29 +404,53 @@ fn findFormSize(self: DwarfInfo, form: u64, di_off: usize, cuh: CompileUnit.Head
402404 },
403405 dwarf.FORM.flag_present => return 0,
404406
405 dwarf.FORM.data1 => return @sizeOf(u8),
406 dwarf.FORM.data2 => return @sizeOf(u16),
407 dwarf.FORM.data4 => return @sizeOf(u32),
408 dwarf.FORM.data8 => return @sizeOf(u64),
409 dwarf.FORM.udata => {
407 dwarf.FORM.data1,
408 dwarf.FORM.ref1,
409 dwarf.FORM.block1,
410 dwarf.FORM.flag,
411 => return @sizeOf(u8),
412
413 dwarf.FORM.data2,
414 dwarf.FORM.ref2,
415 dwarf.FORM.block2,
416 => return @sizeOf(u16),
417
418 dwarf.FORM.data4,
419 dwarf.FORM.ref4,
420 dwarf.FORM.block4,
421 => return @sizeOf(u32),
422
423 dwarf.FORM.data8,
424 dwarf.FORM.ref8,
425 dwarf.FORM.ref_sig8,
426 => return @sizeOf(u64),
427
428 dwarf.FORM.udata,
429 dwarf.FORM.ref_udata,
430 dwarf.FORM.block,
431 => {
410432 _ = try leb.readULEB128(u64, reader);
411433 return math.cast(usize, creader.bytes_read) orelse error.Overflow;
412434 },
435
413436 dwarf.FORM.sdata => {
414437 _ = try leb.readILEB128(i64, reader);
415438 return math.cast(usize, creader.bytes_read) orelse error.Overflow;
416439 },
417440
418 dwarf.FORM.ref1 => return @sizeOf(u8),
419 dwarf.FORM.ref2 => return @sizeOf(u16),
420 dwarf.FORM.ref4 => return @sizeOf(u32),
421 dwarf.FORM.ref8 => return @sizeOf(u64),
422 dwarf.FORM.ref_udata => {
423 _ = try leb.readULEB128(u64, reader);
424 return math.cast(usize, creader.bytes_read) orelse error.Overflow;
441 dwarf.FORM.string => {
442 var count: usize = 0;
443 while (true) : (count += 1) {
444 const byte = try reader.readByte();
445 if (byte == 0x0) break;
446 }
447 return count;
425448 },
426449
427 else => return error.ToDo,
450 else => {
451 log.err("unhandled DW_FORM_* value with identifier {x}", .{form});
452 return error.UnhandledDwFormValue;
453 },
428454 }
429455}
430456