[PATCH] D87365: [llvm-readobj] [ARMWinEH] Fix printing of exception handlers with packed epilogues
Martin Storsjö via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Sep 10 01:41:46 PDT 2020
This revision was automatically updated to reflect the committed changes.
Closed by commit rG6313f5561945: [llvm-readobj] [ARMWinEH] Fix printing of exception handlers with packed… (authored by mstorsjo).
Changed prior to commit:
https://reviews.llvm.org/D87365?vs=290703&id=290905#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D87365/new/
https://reviews.llvm.org/D87365
Files:
llvm/include/llvm/Support/ARMWinEH.h
llvm/test/tools/llvm-readobj/COFF/arm64-packed-epilog.s
Index: llvm/test/tools/llvm-readobj/COFF/arm64-packed-epilog.s
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-readobj/COFF/arm64-packed-epilog.s
@@ -0,0 +1,34 @@
+// REQUIRES: aarch64-registered-target
+// RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o %t.o
+// RUN: llvm-readobj --unwind %t.o | FileCheck %s
+
+// CHECK: ExceptionData {
+// CHECK-NEXT: FunctionLength: 4
+// CHECK-NEXT: Version: 0
+// CHECK-NEXT: ExceptionData: Yes
+// CHECK-NEXT: EpiloguePacked: Yes
+// CHECK-NEXT: EpilogueOffset: 0
+// CHECK-NEXT: ByteCodeLength: 4
+// CHECK-NEXT: Prologue [
+// CHECK-NEXT: 0xe4 ; end
+// CHECK-NEXT: ]
+// CHECK-NEXT: ExceptionHandler [
+// CHECK-NEXT: Routine: 0x11223344
+// CHECK-NEXT: Parameter: 0x55667788
+// CHECK-NEXT: ]
+
+.section .pdata,"dr"
+ .long func at IMGREL
+ .long "$unwind$func"@IMGREL
+
+ .text
+ .globl func
+func:
+ ret
+
+.section .xdata,"dr"
+"$unwind$func":
+.byte 0x01, 0x00, 0x30, 0x08
+.byte 0xe4, 0xe3, 0xe3, 0xe3
+.byte 0x44, 0x33, 0x22, 0x11
+.byte 0x88, 0x77, 0x66, 0x55
Index: llvm/include/llvm/Support/ARMWinEH.h
===================================================================
--- llvm/include/llvm/Support/ARMWinEH.h
+++ llvm/include/llvm/Support/ARMWinEH.h
@@ -416,12 +416,13 @@
uint32_t ExceptionHandlerRVA() const {
assert(X() && "Exception Handler RVA is only valid if the X bit is set");
- return Data[HeaderWords(*this) + EpilogueCount() + CodeWords()];
+ return Data[HeaderWords(*this) + (E() ? 0 : EpilogueCount()) + CodeWords()];
}
uint32_t ExceptionHandlerParameter() const {
assert(X() && "Exception Handler RVA is only valid if the X bit is set");
- return Data[HeaderWords(*this) + EpilogueCount() + CodeWords() + 1];
+ return Data[HeaderWords(*this) + (E() ? 0 : EpilogueCount()) + CodeWords() +
+ 1];
}
};
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D87365.290905.patch
Type: text/x-patch
Size: 2036 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200910/0048b7b0/attachment.bin>
More information about the llvm-commits
mailing list