From 61a5502a93ab938edc66422e41ad98757a6f920b Mon Sep 17 00:00:00 2001
From: Greg McGary <gkm@fb.com>
Date: Thu, 10 Dec 2020 20:54:45 -0800
Subject: [PATCH] [llvm-objdump-macho] print per-second-level-page encodings
 for option --unwind-info

Compact unwind entries have 8 bits for the encoding-table offset:
* offsets 0..126 reference the global commmon-encodings table, while
* offsets 127..255 reference a per-second-level-page table.
This diff teaches `llvm-objdump` to print this per-page encodings table.

Differential Revision: https://reviews.llvm.org/D93265
---
 .../MachO/Inputs/unwind-info-excess.macho-x86_64   | Bin 0 -> 60160 bytes
 .../MachO/unwind-info-excess-x86_64.test           |  67 +++++++++++++++++++++
 llvm/tools/llvm-objdump/MachODump.cpp              |  23 ++++---
 3 files changed, 83 insertions(+), 7 deletions(-)
 create mode 100755 llvm/test/tools/llvm-objdump/MachO/Inputs/unwind-info-excess.macho-x86_64
 create mode 100644 llvm/test/tools/llvm-objdump/MachO/unwind-info-excess-x86_64.test

diff --git a/llvm/test/tools/llvm-objdump/MachO/Inputs/unwind-info-excess.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/unwind-info-excess.macho-x86_64
new file mode 100755
index 0000000000000000000000000000000000000000..586f8db3ae1ef1e9269a83e2bf49fb53001e6856
GIT binary patch
literal 60160
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

literal 0
HcmV?d00001

diff --git a/llvm/test/tools/llvm-objdump/MachO/unwind-info-excess-x86_64.test b/llvm/test/tools/llvm-objdump/MachO/unwind-info-excess-x86_64.test
new file mode 100644
index 0000000..af1523c
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/MachO/unwind-info-excess-x86_64.test
@@ -0,0 +1,67 @@
+## Ensure that per-page compact encodings (indexes 127 and greater)
+## appear in the output of llvm-objdump --unwind-info
+## Verify that the common encodings table is full at 0x7f (127) entries.
+##
+## TODO(gkm): The input is a binary object file constructed from a
+## large generated assembler file. For sake of expediency and
+## test-time performance, I am following the unfortunate precedent
+## that MachO test inputs are binary.
+##
+## Non-MachO tests largely use YAML inputs. As I understand it, the
+## rationale is that these MachO tests were written prior to
+## availability of sufficiently-expressive YAML processors.
+##
+## I consider YAML a submoptimal input format. Better would be
+## assembler language inputs convertable to binary via llvm-mc.  In
+## the case of this test however, the input is very large and the
+## overhead of llvm-mc is terrible (~10s) on a debug build. Overhead
+## for a release build of llvm-mc is acceptable at ~1s. It would be
+## good if there were a way to prefer an installed version of llvm-mc
+## to process tests in debug build trees when not testing llvm-mc
+## itself.
+
+# RUN: llvm-objdump --unwind-info %p/Inputs/unwind-info-excess.macho-x86_64 2>/dev/null | FileCheck %s
+
+# CHECK:Contents of __unwind_info section:
+# CHECK-NEXT:  Version:                                   0x1
+# CHECK-NEXT:  Common encodings array section offset:     0x1c
+# CHECK-NEXT:  Number of common encodings in array:       0x7f
+
+# CHECK:  Second level indices:
+# CHECK:    Second level index[0]: offset in section
+# CHECK:      Page encodings: (count = 17)
+# CHECK:        encoding[127]: 0x01010003
+# CHECK:        encoding[128]: 0x01010002
+# CHECK:        encoding[129]: 0x01010001
+# CHECK:        encoding[130]: 0x0102001d
+# CHECK:        encoding[131]: 0x01020015
+# CHECK:        encoding[132]: 0x0102000d
+# CHECK:        encoding[133]: 0x0102001c
+# CHECK:        encoding[134]: 0x01020014
+# CHECK:        encoding[135]: 0x0102000c
+# CHECK:        encoding[136]: 0x01020013
+# CHECK:        encoding[137]: 0x0102000b
+# CHECK:        encoding[138]: 0x01020022
+# CHECK:        encoding[139]: 0x0102001a
+# CHECK:        encoding[140]: 0x0102000a
+# CHECK:        encoding[141]: 0x01020021
+# CHECK:        encoding[142]: 0x01020019
+# CHECK:        encoding[143]: 0x01020011
+
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[127]=0x01010003
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[128]=0x01010002
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[129]=0x01010001
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[130]=0x0102001d
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[131]=0x01020015
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[132]=0x0102000d
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[133]=0x0102001c
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[134]=0x01020014
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[135]=0x0102000c
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[136]=0x01020013
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[137]=0x0102000b
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[138]=0x01020022
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[139]=0x0102001a
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[140]=0x0102000a
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[141]=0x01020021
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[142]=0x01020019
+# CHECK:      [{{[0-9]+}}]: function offset={{[x0-9a-f]+}}, encoding[143]=0x01020011
diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
index 41a7d07..80886c8 100644
--- a/llvm/tools/llvm-objdump/MachODump.cpp
+++ b/llvm/tools/llvm-objdump/MachODump.cpp
@@ -8007,12 +8007,23 @@ static void printCompressedSecondLevelUnwindPage(
   (void)Kind;
   assert(Kind == 3 && "kind for a compressed 2nd level index should be 3");
 
+  uint32_t NumCommonEncodings = CommonEncodings.size();
   uint16_t EntriesStart = readNext<uint16_t>(PageData, Pos);
   uint16_t NumEntries = readNext<uint16_t>(PageData, Pos);
 
-  uint16_t EncodingsStart = readNext<uint16_t>(PageData, Pos);
-  readNext<uint16_t>(PageData, Pos);
-  StringRef PageEncodings = PageData.substr(EncodingsStart, StringRef::npos);
+  uint16_t PageEncodingsStart = readNext<uint16_t>(PageData, Pos);
+  uint16_t NumPageEncodings = readNext<uint16_t>(PageData, Pos);
+  SmallVector<uint32_t, 64> PageEncodings;
+  if (NumPageEncodings) {
+    outs() << "      Page encodings: (count = " << NumPageEncodings << ")\n";
+    Pos = PageEncodingsStart;
+    for (unsigned i = 0; i < NumPageEncodings; ++i) {
+      uint32_t Encoding = readNext<uint32_t>(PageData, Pos);
+      PageEncodings.push_back(Encoding);
+      outs() << "        encoding[" << (i + NumCommonEncodings)
+             << "]: " << format("0x%08" PRIx32, Encoding) << '\n';
+    }
+  }
 
   Pos = EntriesStart;
   for (unsigned i = 0; i < NumEntries; ++i) {
@@ -8021,12 +8032,10 @@ static void printCompressedSecondLevelUnwindPage(
     uint32_t EncodingIdx = Entry >> 24;
 
     uint32_t Encoding;
-    if (EncodingIdx < CommonEncodings.size())
+    if (EncodingIdx < NumCommonEncodings)
       Encoding = CommonEncodings[EncodingIdx];
     else
-      Encoding = read<uint32_t>(PageEncodings,
-                                sizeof(uint32_t) *
-                                    (EncodingIdx - CommonEncodings.size()));
+      Encoding = PageEncodings[EncodingIdx - NumCommonEncodings];
 
     outs() << "      [" << i << "]: "
            << "function offset=" << format("0x%08" PRIx32, FunctionOffset)
-- 
2.7.4