Skip to content

Commit afdf452

Browse files
committed
Fix PDB bitfield members importing with wrong offset
1 parent f83b7bd commit afdf452

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

plugins/pdb-ng/src/struct_grouper.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ pub fn group_structure(
340340
.enumerate()
341341
.map(|(i, member)| MemberSize {
342342
index: i,
343-
offset: member.bitfield_position.unwrap_or(member.offset * 8),
343+
offset: member.offset * 8 + member.bitfield_position.unwrap_or(0),
344344
width: member
345345
.bitfield_size
346346
.unwrap_or(member.ty.contents.width() * 8),
@@ -366,7 +366,7 @@ pub fn group_structure(
366366
structure.insert_bitwise(
367367
&member.ty,
368368
&member.name,
369-
bit_pos,
369+
member.offset * 8 + bit_pos,
370370
bit_width.map(|w| w as u8),
371371
false,
372372
member.access,
@@ -409,7 +409,7 @@ fn apply_groups(
409409
structure.insert_bitwise(
410410
&member.ty,
411411
&member.name,
412-
bit_pos,
412+
(member.offset - offset) * 8 + bit_pos,
413413
bit_width.map(|w| w as u8),
414414
false,
415415
member.access,

0 commit comments

Comments
 (0)