From f32b83eb08e9ee158d3037b2114357187fd45a05 Mon Sep 17 00:00:00 2001 From: Nelson Billing Date: Tue, 3 Dec 2019 15:00:30 -0800 Subject: Enable reading DWARF4 CIEs with 32 bit addresses. - Reading DWARF4 CIEs was added in https://chromium-review.googlesource.com/c/breakpad/breakpad/+/406012 but it was only enabled for 64bit builds, since it would error out if the CIE address size was not 8 bytes. - Added a unit test to ensure that 32bit continues to work. Change-Id: I824bb40cdf12056d39da335adb55ed315970fb88 Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/1941034 Reviewed-by: Ivan Penkov Reviewed-by: Mark Mentovai --- src/common/dwarf/dwarf2reader.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/common/dwarf/dwarf2reader.h') diff --git a/src/common/dwarf/dwarf2reader.h b/src/common/dwarf/dwarf2reader.h index cf3ba3cd..902d9ef1 100644 --- a/src/common/dwarf/dwarf2reader.h +++ b/src/common/dwarf/dwarf2reader.h @@ -999,6 +999,11 @@ class CallFrameInfo { // or not we saw a 'z' augmentation string; its default value is // DW_EH_PE_absptr, which is what normal DWARF CFI uses. DwarfPointerEncoding pointer_encoding; + + // These were only introduced in DWARF4, so will not be set in older + // versions. + uint8 address_size; + uint8 segment_size; }; // A frame description entry (FDE). -- cgit v1.2.1