From b2c064c6954c9bfa49b7a7e3223df5e7849464c0 Mon Sep 17 00:00:00 2001
From: "Michael J. Spencer" <bigcheesegs@gmail.com>
Date: Sun, 6 Jan 2013 03:56:49 +0000
Subject: [PATCH] [objdump] Add --private-headers, -p.

This currently prints the ELF program headers.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171649 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/Object/Inputs/program-headers.elf-i386 | Bin 0 -> 987 bytes
 test/Object/objdump-private-headers.test    |   8 +++
 tools/llvm-objdump/CMakeLists.txt           |   1 +
 tools/llvm-objdump/ELFDump.cpp              |  87 ++++++++++++++++++++++++++++
 tools/llvm-objdump/llvm-objdump.cpp         |  14 ++++-
 tools/llvm-objdump/llvm-objdump.h           |   2 +
 6 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 test/Object/Inputs/program-headers.elf-i386
 create mode 100644 test/Object/objdump-private-headers.test
 create mode 100644 tools/llvm-objdump/ELFDump.cpp

diff --git a/test/Object/Inputs/program-headers.elf-i386 b/test/Object/Inputs/program-headers.elf-i386
new file mode 100644
index 0000000000000000000000000000000000000000..eb92c71cee5a07fea58f202f3fa0fbcc963fdc89
GIT binary patch
literal 987
zcma)4&ubG=5S~p}TQ$^F3L*-om_wBk#0Gj3!5@?=Xe+ePf{#tIB}&qS-KVG&T<FE6
zm-wIb81Pbv*i-+CBDCP4g`T|V_r1+P$jMpeee=!C&YRhtFHc`Q^E^*faxx}lN#ajb
zfQ><@B1Or`tc;8A;w~RK!aU?qFVI;KS^j0~E<SQx1ouaL$5-G;`#oNBnDo0lzw-xA
zO8zA1fnPd8_2V0`cYfqgn9}Xt!`a{L>hpSSb=Q^(yW6Gd?@UO~(my?3a+st))6+L*
zqrVt7o9(&cT03giXD%Z&4W)RWSH#<%@Feg1U-2?pms?QIew7Ij`tC!!@ZF~4@nk{D
z@u!vzsz4iM*ig%cAFY(5c0I6xl*5MEjDl9k7ynOgB8_wKTd|J>Sc9stAIc1rc@Loc
zN=HEL8K#Rdes^H!fal0N2R?$T=>M34V@#bu{?GX#&RP^AYpEn8aI)V^P}XCQw1?{@
zARF+hXg%e_$hpb0P0Z%Ycy=@A$hc;Z@$R#~TqhNB&ZR<rT?vqUh&o<`V-NK?&ovA-
z3)~04GvEtA-4Dhef>*v}{S?sg61eUP<1a_zt0P=u8$`BT>vSY=XVsmZ_cnHhS)Y$W
m`$5e50(=H*_Ud`<oxs3rVoWuT2X-rXyCo)ci)X^Ey8HwA4TXjP

literal 0
HcmV?d00001

diff --git a/test/Object/objdump-private-headers.test b/test/Object/objdump-private-headers.test
new file mode 100644
index 00000000000..e54d3eba5d6
--- /dev/null
+++ b/test/Object/objdump-private-headers.test
@@ -0,0 +1,8 @@
+RUN: llvm-objdump -p %p/Inputs/program-headers.elf-i386 \
+RUN:              | FileCheck %s -check-prefix ELF-i386
+
+ELF-i386: Program Header:
+ELF-i386:     LOAD off    0x00000000 vaddr 0x08048000 paddr 0x08048000 align 2**12
+ELF-i386:          filesz 0x00000134 memsz 0x00000134 flags r-x
+ELF-i386:    STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**2
+ELF-i386:          filesz 0x00000000 memsz 0x00000000 flags rw-
diff --git a/tools/llvm-objdump/CMakeLists.txt b/tools/llvm-objdump/CMakeLists.txt
index 5001435e83d..0c49d0b457f 100644
--- a/tools/llvm-objdump/CMakeLists.txt
+++ b/tools/llvm-objdump/CMakeLists.txt
@@ -10,6 +10,7 @@ set(LLVM_LINK_COMPONENTS
 add_llvm_tool(llvm-objdump
   llvm-objdump.cpp
   COFFDump.cpp
+  ELFDump.cpp
   MachODump.cpp
   MCFunction.cpp
   )
diff --git a/tools/llvm-objdump/ELFDump.cpp b/tools/llvm-objdump/ELFDump.cpp
new file mode 100644
index 00000000000..f018eed4f59
--- /dev/null
+++ b/tools/llvm-objdump/ELFDump.cpp
@@ -0,0 +1,87 @@
+//===-- ELFDump.cpp - ELF-specific dumper -----------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// \brief This file implements the ELF-specific dumper for llvm-objdump.
+///
+//===----------------------------------------------------------------------===//
+
+#include "llvm-objdump.h"
+
+#include "llvm/Object/ELF.h"
+#include "llvm/Support/Format.h"
+#include "llvm/Support/MathExtras.h"
+#include "llvm/Support/raw_ostream.h"
+
+using namespace llvm;
+using namespace llvm::object;
+
+template<endianness target_endianness, std::size_t max_alignment, bool is64Bits>
+void printProgramHeaders(
+    const ELFObjectFile<target_endianness, max_alignment, is64Bits> *o) {
+  typedef ELFObjectFile<target_endianness, max_alignment, is64Bits> ELFO;
+  outs() << "Program Header:\n";
+  for (typename ELFO::Elf_Phdr_Iter pi = o->begin_program_headers(),
+                                    pe = o->end_program_headers();
+                                    pi != pe; ++pi) {
+    switch (pi->p_type) {
+    case ELF::PT_LOAD:
+      outs() << "    LOAD ";
+      break;
+    case ELF::PT_GNU_STACK:
+      outs() << "   STACK ";
+      break;
+    case ELF::PT_GNU_EH_FRAME:
+      outs() << "EH_FRAME ";
+      break;
+    default:
+      outs() << " UNKNOWN ";
+    }
+
+    outs() << "off    "
+           << format(is64Bits ? "0x%016x " : "0x%08x ", pi->p_offset)
+           << "vaddr "
+           << format(is64Bits ? "0x%016x " : "0x%08x ", pi->p_vaddr)
+           << "paddr "
+           << format(is64Bits ? "0x%016x " : "0x%08x ", pi->p_paddr)
+           << format("align 2**%d\n", CountTrailingZeros_32(pi->p_align))
+           << "         filesz "
+           << format(is64Bits ? "0x%016x " : "0x%08x ", pi->p_filesz)
+           << "memsz "
+           << format(is64Bits ? "0x%016x " : "0x%08x ", pi->p_memsz)
+           << "flags "
+           << ((pi->p_flags & ELF::PF_R) ? "r" : "-")
+           << ((pi->p_flags & ELF::PF_W) ? "w" : "-")
+           << ((pi->p_flags & ELF::PF_X) ? "x" : "-")
+           << "\n";
+  }
+  outs() << "\n";
+}
+
+void llvm::printELFFileHeader(const object::ObjectFile *Obj) {
+  // Little-endian 32-bit
+  if (const ELFObjectFile<support::little, 4, false> *ELFObj =
+          dyn_cast<ELFObjectFile<support::little, 4, false> >(Obj))
+    printProgramHeaders(ELFObj);
+
+  // Big-endian 32-bit
+  if (const ELFObjectFile<support::big, 4, false> *ELFObj =
+          dyn_cast<ELFObjectFile<support::big, 4, false> >(Obj))
+    printProgramHeaders(ELFObj);
+
+  // Little-endian 64-bit
+  if (const ELFObjectFile<support::little, 8, true> *ELFObj =
+          dyn_cast<ELFObjectFile<support::little, 8, true> >(Obj))
+    printProgramHeaders(ELFObj);
+
+  // Big-endian 64-bit
+  if (const ELFObjectFile<support::big, 8, true> *ELFObj =
+          dyn_cast<ELFObjectFile<support::big, 8, true> >(Obj))
+    printProgramHeaders(ELFObj);
+}
diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp
index 24dc9c91a3b..9958dad3d33 100644
--- a/tools/llvm-objdump/llvm-objdump.cpp
+++ b/tools/llvm-objdump/llvm-objdump.cpp
@@ -28,6 +28,7 @@
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/Object/Archive.h"
 #include "llvm/Object/COFF.h"
+#include "llvm/Object/ELF.h"
 #include "llvm/Object/MachO.h"
 #include "llvm/Object/ObjectFile.h"
 #include "llvm/Support/Casting.h"
@@ -112,6 +113,14 @@ static cl::alias
 UnwindInfoShort("u", cl::desc("Alias for --unwind-info"),
                 cl::aliasopt(UnwindInfo));
 
+static cl::opt<bool>
+PrivateHeaders("private-headers",
+               cl::desc("Display format specific file headers"));
+
+static cl::alias
+PrivateHeadersShort("p", cl::desc("Alias for --private-headers"),
+                    cl::aliasopt(PrivateHeaders));
+
 static StringRef ToolName;
 
 bool llvm::error(error_code ec) {
@@ -627,6 +636,8 @@ static void DumpObject(const ObjectFile *o) {
     PrintSymbolTable(o);
   if (UnwindInfo)
     PrintUnwindInfo(o);
+  if (PrivateHeaders && o->isELF())
+    printELFFileHeader(o);
 }
 
 /// @brief Dump each object file in \a a;
@@ -706,7 +717,8 @@ int main(int argc, char **argv) {
       && !SectionHeaders
       && !SectionContents
       && !SymbolTable
-      && !UnwindInfo) {
+      && !UnwindInfo
+      && !PrivateHeaders) {
     cl::PrintHelpMessage();
     return 2;
   }
diff --git a/tools/llvm-objdump/llvm-objdump.h b/tools/llvm-objdump/llvm-objdump.h
index 9f5a8c3db97..ca7bced635f 100644
--- a/tools/llvm-objdump/llvm-objdump.h
+++ b/tools/llvm-objdump/llvm-objdump.h
@@ -19,6 +19,7 @@ namespace llvm {
 
 namespace object {
   class COFFObjectFile;
+  class ObjectFile;
   class RelocationRef;
 }
 class error_code;
@@ -32,6 +33,7 @@ bool RelocAddressLess(object::RelocationRef a, object::RelocationRef b);
 void DumpBytes(StringRef bytes);
 void DisassembleInputMachO(StringRef Filename);
 void printCOFFUnwindInfo(const object::COFFObjectFile* o);
+void printELFFileHeader(const object::ObjectFile *o);
 
 class StringRefMemoryObject : public MemoryObject {
   virtual void anchor();
-- 
2.11.0