6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-17 04:24:00 +00:00
Code Issues Projects Releases Wiki Activity

Revert 170545 while I debug the ppc failures.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@170547 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2012-12-19 14:48:05 +00:00
parent 35d3462941
commit cd7ee1ced0
4 changed files with 15 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/llvm-objdump/llvm-objdump.cpp
View File

@ -28,7 +28,6 @@
#include "llvm/MC/MCSubtargetInfo.h"
#include "llvm/Object/Archive.h"
#include "llvm/Object/COFF.h"
#include "llvm/Object/MachO.h"
#include "llvm/Object/ObjectFile.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/CommandLine.h"
@ -73,9 +72,9 @@ static cl::opt<bool>
SymbolTable("t", cl::desc("Display the symbol table"));
static cl::opt<bool>
MachOOpt("macho", cl::desc("Use MachO specific object file parser"));
MachO("macho", cl::desc("Use MachO specific object file parser"));
static cl::alias
MachOm("m", cl::desc("Alias for --macho"), cl::aliasopt(MachOOpt));
MachOm("m", cl::desc("Alias for --macho"), cl::aliasopt(MachO));
cl::opt<std::string>
llvm::TripleName("triple", cl::desc("Target triple to disassemble for, "
@ -242,18 +241,9 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
// Sort relocations by address.
std::sort(Rels.begin(), Rels.end(), RelocAddressLess);
StringRef SegmentName = "";
if (const MachOObjectFile *MachO = dyn_cast<const MachOObjectFile>(Obj)) {
DataRefImpl DR = i->getRawDataRefImpl();
if (error(MachO->getSectionFinalSegmentName(DR, SegmentName)))
break;
}
StringRef name;
if (error(i->getName(name))) break;
outs() << "Disassembly of section ";
if (!SegmentName.empty())
outs() << SegmentName << ",";
outs() << name << ':';
outs() << "Disassembly of section " << name << ':';
// If the section has no symbols just insert a dummy one and disassemble
// the whole section.
@ -577,13 +567,6 @@ static void PrintSymbolTable(const ObjectFile *o) {
else if (Section == o->end_sections())
outs() << "*UND*";
else {
if (const MachOObjectFile *MachO = dyn_cast<const MachOObjectFile>(o)) {
StringRef SegmentName;
DataRefImpl DR = Section->getRawDataRefImpl();
if (error(MachO->getSectionFinalSegmentName(DR, SegmentName)))
SegmentName = "";
outs() << SegmentName << ",";
}
StringRef SectionName;
if (error(Section->getName(SectionName)))
SectionName = "";
@ -657,7 +640,7 @@ static void DumpInput(StringRef file) {
return;
}
if (MachOOpt && Disassemble) {
if (MachO && Disassemble) {
DisassembleInputMachO(file);
return;
}