[PATCH] D80476: [DebugInfo/llvm-objdump] - Print "ZERO terminator" for terminator entries when dumping .eh_frame.
George Rimar via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue May 26 03:12:19 PDT 2020
This revision was automatically updated to reflect the committed changes.
Closed by commit rG2e365ca2f7ce: [DebugInfo/llvm-objdump] - Print "ZERO terminator" for terminator entries when… (authored by grimar).
Herald added a subscriber: jrtc27.
Changed prior to commit:
https://reviews.llvm.org/D80476?vs=265869&id=266149#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D80476/new/
https://reviews.llvm.org/D80476
Files:
llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
llvm/test/tools/llvm-objdump/eh_frame-mipsel.test
llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test
Index: llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test
===================================================================
--- llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test
+++ llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test
@@ -1,11 +1,6 @@
# RUN: llvm-objdump --dwarf=frames %p/Inputs/eh_frame_zero_cie.o 2>/dev/null | FileCheck %s
-# CHECK: .eh_frame contents:
-
-## FIXME: GNU objdump prints "00000000 ZERO terminator" instead.
-# CHECK: 00000000 00000000 00000000 CIE
-# CHECK: Version: 0
-# CHECK: Augmentation: ""
-# CHECK: Code alignment factor: 0
-# CHECK: Data alignment factor: 0
-# CHECK: Return address column: 0
+# CHECK: .eh_frame contents:
+# CHECK-EMPTY:
+# CHECK-NEXT: 00000000 ZERO terminator
+# CHECK-NOT: {{.}}
Index: llvm/test/tools/llvm-objdump/eh_frame-mipsel.test
===================================================================
--- llvm/test/tools/llvm-objdump/eh_frame-mipsel.test
+++ llvm/test/tools/llvm-objdump/eh_frame-mipsel.test
@@ -1,28 +1,25 @@
# RUN: llvm-objdump --dwarf=frames %p/Inputs/eh_frame.elf-mipsel | FileCheck %s
-# CHECK: .eh_frame contents:
-
-# CHECK: 00000000 00000018 00000000 CIE
-# CHECK: Version: 1
-# CHECK: Augmentation: "zPLR"
-# CHECK: Code alignment factor: 1
-# CHECK: Data alignment factor: -4
-# CHECK: Return address column: 31
-# CHECK: Augmentation data: 80 90 0B 41 00 00 0B
-
-# CHECK: DW_CFA_def_cfa: reg29 +0
-
-# CHECK: 0000001c 00000018 00000020 FDE cie=00000000 pc=00400890...004008dc
-# CHECK: DW_CFA_advance_loc: 4
-# CHECK: DW_CFA_def_cfa_offset: +24
-# CHECK: DW_CFA_advance_loc: 4
-# CHECK: DW_CFA_offset: reg31 -4
-# CHECK: DW_CFA_nop:
-
-## FIXME: GNU objdump prints "00000038 ZERO terminator" instead.
-# CHECK: 00000038 00000000 00000000 CIE
-# CHECK: Version: 0
-# CHECK: Augmentation: ""
-# CHECK: Code alignment factor: 0
-# CHECK: Data alignment factor: 0
-# CHECK: Return address column: 0
+# CHECK: .eh_frame contents:
+# CHECK-EMPTY:
+# CHECK-NEXT: 00000000 00000018 00000000 CIE
+# CHECK-NEXT: Version: 1
+# CHECK-NEXT: Augmentation: "zPLR"
+# CHECK-NEXT: Code alignment factor: 1
+# CHECK-NEXT: Data alignment factor: -4
+# CHECK-NEXT: Return address column: 31
+# CHECK-NEXT: Personality Address: 0000000000410b90
+# CHECK-NEXT: Augmentation data: 80 90 0B 41 00 00 0B
+# CHECK-EMPTY:
+# CHECK-NEXT: DW_CFA_def_cfa: reg29 +0
+# CHECK-EMPTY:
+# CHECK-NEXT: 0000001c 00000018 00000020 FDE cie=00000000 pc=00400890...004008dc
+# CHECK-NEXT: LSDA Address: 0000000000400a90
+# CHECK-NEXT: DW_CFA_advance_loc: 4
+# CHECK-NEXT: DW_CFA_def_cfa_offset: +24
+# CHECK-NEXT: DW_CFA_advance_loc: 4
+# CHECK-NEXT: DW_CFA_offset: reg31 -4
+# CHECK-NEXT: DW_CFA_nop:
+# CHECK-EMPTY:
+# CHECK-NEXT: 00000038 ZERO terminator
+# CHECK-NOT: {{.}}
Index: llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
===================================================================
--- llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
+++ llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
@@ -304,6 +304,12 @@
}
void CIE::dump(raw_ostream &OS, const MCRegisterInfo *MRI, bool IsEH) const {
+ // A CIE with a zero length is a terminator entry in the .eh_frame sextion.
+ if (IsEH && Length == 0) {
+ OS << format("%08" PRIx64, Offset) << " ZERO terminator\n";
+ return;
+ }
+
OS << format("%08" PRIx64, Offset)
<< format(" %0*" PRIx64, IsDWARF64 ? 16 : 8, Length)
<< format(" %0*" PRIx64, IsDWARF64 && !IsEH ? 16 : 8,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D80476.266149.patch
Type: text/x-patch
Size: 3618 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200526/e0285623/attachment.bin>
More information about the llvm-commits
mailing list