authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-08-22 14:58:01-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-08-22 20:08:05-04:00
log17171cdb073b940d01eafbc07e989f5c1adf843f
treec789259097633aea233ef28c0d6ceaa3c782b471
parentf47e1e148e48eedc8c2097b489472fa900b6e334

Dwarf: fix big and zero enum values

1 files changed, 59 insertions(+), 29 deletions(-)

src/link/Dwarf.zig+59-29
......@@ -1386,7 +1386,11 @@ pub const WipNav = struct {
13861386 fn enumConstValue(
13871387 wip_nav: *WipNav,
13881388 loaded_enum: InternPool.LoadedEnumType,
1389 abbrev_code: std.enums.EnumFieldStruct(std.builtin.Signedness, AbbrevCode, null),
1389 abbrev_code: struct {
1390 sdata: AbbrevCode,
1391 udata: AbbrevCode,
1392 block: AbbrevCode,
1393 },
13901394 field_index: usize,
13911395 ) UpdateError!void {
13921396 const zcu = wip_nav.pt.zcu;
......@@ -1396,20 +1400,15 @@ pub const WipNav = struct {
13961400 .comptime_int_type => .signed,
13971401 else => Type.fromInterned(loaded_enum.tag_ty).intInfo(zcu).signedness,
13981402 };
1399 try wip_nav.abbrevCode(switch (signedness) {
1400 inline .signed, .unsigned => |ct_signedness| @field(abbrev_code, @tagName(ct_signedness)),
1401 });
1402 if (loaded_enum.values.len > 0) switch (ip.indexToKey(loaded_enum.values.get(ip)[field_index]).int.storage) {
1403 .u64 => |value| switch (signedness) {
1404 .signed => try sleb128(diw, value),
1405 .unsigned => try uleb128(diw, value),
1406 },
1407 .i64 => |value| switch (signedness) {
1408 .signed => try sleb128(diw, value),
1409 .unsigned => unreachable,
1410 },
1411 .big_int => |big_int| {
1412 const bits = big_int.bitCountTwosCompForSignedness(signedness);
1403 if (loaded_enum.values.len > 0) {
1404 var big_int_space: InternPool.Key.Int.Storage.BigIntSpace = undefined;
1405 const big_int = ip.indexToKey(loaded_enum.values.get(ip)[field_index]).int.storage.toBigInt(&big_int_space);
1406 const bits = @max(1, big_int.bitCountTwosCompForSignedness(signedness));
1407 if (bits <= 64) {
1408 try wip_nav.abbrevCode(switch (signedness) {
1409 .signed => abbrev_code.sdata,
1410 .unsigned => abbrev_code.udata,
1411 });
14131412 try wip_nav.debug_info.ensureUnusedCapacity(wip_nav.dwarf.gpa, std.math.divCeil(usize, bits, 7) catch unreachable);
14141413 var bit: usize = 0;
14151414 var carry: u1 = 1;
......@@ -1428,11 +1427,21 @@ pub const WipNav = struct {
14281427 };
14291428 wip_nav.debug_info.appendAssumeCapacity(@as(u8, if (bit + 7 < bits) 0x80 else 0x00) | twos_comp_part);
14301429 }
1431 },
1432 .lazy_align, .lazy_size => unreachable,
1430 } else {
1431 try wip_nav.abbrevCode(abbrev_code.block);
1432 const bytes = Type.fromInterned(loaded_enum.tag_ty).abiSize(wip_nav.pt);
1433 try uleb128(diw, bytes);
1434 big_int.writeTwosComplement(try wip_nav.debug_info.addManyAsSlice(wip_nav.dwarf.gpa, @intCast(bytes)), wip_nav.dwarf.endian);
1435 }
14331436 } else switch (signedness) {
1434 .signed => try sleb128(diw, field_index),
1435 .unsigned => try uleb128(diw, field_index),
1437 .signed => {
1438 try wip_nav.abbrevCode(abbrev_code.sdata);
1439 try sleb128(diw, field_index);
1440 },
1441 .unsigned => {
1442 try wip_nav.abbrevCode(abbrev_code.udata);
1443 try uleb128(diw, field_index);
1444 },
14361445 }
14371446 }
14381447
......@@ -2270,8 +2279,9 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
22702279 try wip_nav.refType(Type.fromInterned(loaded_enum.tag_ty));
22712280 for (0..loaded_enum.names.len) |field_index| {
22722281 try wip_nav.enumConstValue(loaded_enum, .{
2273 .signed = .signed_enum_field,
2274 .unsigned = .unsigned_enum_field,
2282 .sdata = .signed_enum_field,
2283 .udata = .unsigned_enum_field,
2284 .block = .big_enum_field,
22752285 }, field_index);
22762286 try wip_nav.strp(loaded_enum.names.get(ip)[field_index].toSlice(ip));
22772287 }
......@@ -2370,8 +2380,9 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
23702380
23712381 for (0..loaded_union.field_types.len) |field_index| {
23722382 try wip_nav.enumConstValue(loaded_tag, .{
2373 .signed = .signed_tagged_union_field,
2374 .unsigned = .unsigned_tagged_union_field,
2383 .sdata = .signed_tagged_union_field,
2384 .udata = .unsigned_tagged_union_field,
2385 .block = .big_tagged_union_field,
23752386 }, field_index);
23762387 {
23772388 try wip_nav.abbrevCode(.struct_field);
......@@ -2839,8 +2850,9 @@ fn updateType(
28392850 try wip_nav.refType(Type.fromInterned(loaded_enum.tag_ty));
28402851 for (0..loaded_enum.names.len) |field_index| {
28412852 try wip_nav.enumConstValue(loaded_enum, .{
2842 .signed = .signed_enum_field,
2843 .unsigned = .unsigned_enum_field,
2853 .sdata = .signed_enum_field,
2854 .udata = .unsigned_enum_field,
2855 .block = .big_enum_field,
28442856 }, field_index);
28452857 try wip_nav.strp(loaded_enum.names.get(ip)[field_index].toSlice(ip));
28462858 }
......@@ -3075,8 +3087,9 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
30753087 try wip_nav.refType(Type.fromInterned(loaded_enum.tag_ty));
30763088 for (0..loaded_enum.names.len) |field_index| {
30773089 try wip_nav.enumConstValue(loaded_enum, .{
3078 .signed = .signed_enum_field,
3079 .unsigned = .unsigned_enum_field,
3090 .sdata = .signed_enum_field,
3091 .udata = .unsigned_enum_field,
3092 .block = .big_enum_field,
30803093 }, field_index);
30813094 try wip_nav.strp(loaded_enum.names.get(ip)[field_index].toSlice(ip));
30823095 }
......@@ -3106,8 +3119,9 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
31063119
31073120 for (0..loaded_union.field_types.len) |field_index| {
31083121 try wip_nav.enumConstValue(loaded_tag, .{
3109 .signed = .signed_tagged_union_field,
3110 .unsigned = .unsigned_tagged_union_field,
3122 .sdata = .signed_tagged_union_field,
3123 .udata = .unsigned_tagged_union_field,
3124 .block = .big_tagged_union_field,
31113125 }, field_index);
31123126 {
31133127 try wip_nav.abbrevCode(.struct_field);
......@@ -3573,6 +3587,7 @@ const AbbrevCode = enum {
35733587 file,
35743588 signed_enum_field,
35753589 unsigned_enum_field,
3590 big_enum_field,
35763591 generated_field,
35773592 struct_field,
35783593 struct_field_comptime,
......@@ -3581,6 +3596,7 @@ const AbbrevCode = enum {
35813596 tagged_union,
35823597 signed_tagged_union_field,
35833598 unsigned_tagged_union_field,
3599 big_tagged_union_field,
35843600 tagged_union_default_field,
35853601 void_type,
35863602 numeric_type,
......@@ -3783,6 +3799,13 @@ const AbbrevCode = enum {
37833799 .{ .name, .strp },
37843800 },
37853801 },
3802 .big_enum_field = .{
3803 .tag = .enumerator,
3804 .attrs = &.{
3805 .{ .const_value, .block },
3806 .{ .name, .strp },
3807 },
3808 },
37863809 .generated_field = .{
37873810 .tag = .member,
37883811 .attrs = &.{
......@@ -3846,6 +3869,13 @@ const AbbrevCode = enum {
38463869 .{ .discr_value, .udata },
38473870 },
38483871 },
3872 .big_tagged_union_field = .{
3873 .tag = .variant,
3874 .children = true,
3875 .attrs = &.{
3876 .{ .discr_value, .block },
3877 },
3878 },
38493879 .tagged_union_default_field = .{
38503880 .tag = .variant,
38513881 .children = true,