[llvm-commits] [llvm] r157031 - in /llvm/trunk: test/MC/MachO/ARM/llvm-objdump-macho-stripped.s tools/llvm-objdump/MachODump.cpp

[Kevin Enderby]

Author: enderby
Date: Thu May 17 19:13:56 2012
New Revision: 157031

URL: http://llvm.org/viewvc/llvm-project?rev=157031&view=rev
Log:
Fixed a bug in llvm-objdump when disassembling using -macho option for a binary
containing no symbols.  Fixed the crash and fixed it not disassembling anything.

Added:
    llvm/trunk/test/MC/MachO/ARM/llvm-objdump-macho-stripped.s
Modified:
    llvm/trunk/tools/llvm-objdump/MachODump.cpp

Added: llvm/trunk/test/MC/MachO/ARM/llvm-objdump-macho-stripped.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/ARM/llvm-objdump-macho-stripped.s?rev=157031&view=auto
==============================================================================
--- llvm/trunk/test/MC/MachO/ARM/llvm-objdump-macho-stripped.s (added)
+++ llvm/trunk/test/MC/MachO/ARM/llvm-objdump-macho-stripped.s Thu May 17 19:13:56 2012
@@ -0,0 +1,5 @@
+@ RUN: llvm-mc -triple=thumbv7-apple-ios -filetype=obj -o - < %s | llvm-objdump -d -macho -triple=thumbv7-apple-ios - | FileCheck %s
+	nop
+# CHECK:        0:	00 bf                                        	nop
+# We are checking that disassembly happens when there are no symbols.
+# rdar://11460289

Modified: llvm/trunk/tools/llvm-objdump/MachODump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MachODump.cpp?rev=157031&r1=157030&r2=157031&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/MachODump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/MachODump.cpp Thu May 17 19:13:56 2012
@@ -286,8 +286,10 @@
 
   // Read and register the symbol table data.
   InMemoryStruct<macho::SymtabLoadCommand> SymtabLC;
-  MachOObj->ReadSymtabLoadCommand(*SymtabLCI, SymtabLC);
-  MachOObj->RegisterStringTable(*SymtabLC);
+  if (SymtabLCI) {
+    MachOObj->ReadSymtabLoadCommand(*SymtabLCI, SymtabLC);
+    MachOObj->RegisterStringTable(*SymtabLC);
+  }
 
   std::vector<SectionRef> Sections;
   std::vector<SymbolRef> Symbols;
@@ -498,6 +500,31 @@
             InstrAnalysis.get(), Start, DebugOut, FunctionMap, Functions);
       }
     }
+    if (!CFG && !symbolTableWorked) {
+      // Reading the symbol table didn't work, disassemble the whole section. 
+      uint64_t SectAddress;
+      Sections[SectIdx].getAddress(SectAddress);
+      uint64_t SectSize;
+      Sections[SectIdx].getSize(SectSize);
+      uint64_t InstSize;
+      for (uint64_t Index = 0; Index < SectSize; Index += InstSize) {
+	MCInst Inst;
+
+	if (DisAsm->getInstruction(Inst, InstSize, memoryObject, Index,
+				   DebugOut, nulls())) {
+	  outs() << format("%8" PRIx64 ":\t", SectAddress + Index);
+
+	  DumpBytes(StringRef(Bytes.data() + Index, InstSize));
+	  IP->printInst(&Inst, outs(), "");
+
+	  outs() << "\n";
+	} else {
+	  errs() << "llvm-objdump: warning: invalid instruction encoding\n";
+	  if (InstSize == 0)
+	    InstSize = 1; // skip illegible bytes
+	}
+      }
+    }
 
     if (CFG) {
       if (!symbolTableWorked) {