maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

llvm-objdump: Implement source[line numbers] interleaving 

Differential Revsion: https://reviews.llvm.org/D22932

llvm-svn: 278725
This commit is contained in:
Hemant Kulkarni 2016-08-15 19:49:24 +00:00
parent bdb220c7a0
commit 8dfc0b5541
4 changed files with 194 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/test/tools/llvm-objdump/X86/Inputs/source-interleave-x86_64.c Normal file
View File

@ -0,0 +1,9 @@
int a = 1;
int foo() {
return a;
}
int main() {
int *b = &a;
return *b + foo();
}

72
llvm/test/tools/llvm-objdump/X86/source-interleave-x86_64.ll Normal file
View File

@ -0,0 +1,72 @@
; RUN: sed -e "s,SRC_COMPDIR,%p/Inputs,g" %s > %t.ll
; RUN: llc -o %t.o -filetype=obj -mtriple=x86_64-pc-linux %t.ll
; RUN: llvm-objdump -d -l %t.o | FileCheck --check-prefix="LINES" %t.ll
; RUN: llvm-objdump -d -S %t.o | FileCheck --check-prefix="SOURCE" %t.ll
; ModuleID = 'source-interleave-x86_64.bc'
source_filename = "source-interleave-x86_64.c"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
@a = global i32 1, align 4
; Function Attrs: nounwind uwtable
define i32 @foo() #0 !dbg !9 {
entry:
%0 = load i32, i32* @a, align 4, !dbg !12
ret i32 %0, !dbg !13
}
; Function Attrs: nounwind uwtable
define i32 @main() #0 !dbg !14 {
entry:
%retval = alloca i32, align 4
%b = alloca i32*, align 8
store i32 0, i32* %retval, align 4
call void @llvm.dbg.declare(metadata i32** %b, metadata !15, metadata !17), !dbg !18
store i32* @a, i32** %b, align 8, !dbg !18
%0 = load i32*, i32** %b, align 8, !dbg !19
%1 = load i32, i32* %0, align 4, !dbg !20
%call = call i32 @foo(), !dbg !21
%add = add nsw i32 %1, %call, !dbg !22
ret i32 %add, !dbg !23
}
; Function Attrs: nounwind readnone
declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
attributes #0 = { nounwind uwtable "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #1 = { nounwind readnone }
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!6, !7}
!llvm.ident = !{!8}
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 4.0.0 (http://llvm.org/git/clang d19a95e94dc57c5a72fd25d64f26134aa7d25fa0) (http://llvm.org/git/llvm.git 313924e6ff8a332063f61d3fda03812c220762f6)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, globals: !3)
!1 = !DIFile(filename: "source-interleave-x86_64.c", directory: "SRC_COMPDIR")
!2 = !{}
!3 = !{!4}
!4 = distinct !DIGlobalVariable(name: "a", scope: !0, file: !1, line: 1, type: !5, isLocal: false, isDefinition: true, variable: i32* @a)
!5 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed)
!6 = !{i32 2, !"Dwarf Version", i32 4}
!7 = !{i32 2, !"Debug Info Version", i32 3}
!8 = !{!"clang version 4.0.0 (http://llvm.org/git/clang d19a95e94dc57c5a72fd25d64f26134aa7d25fa0) (http://llvm.org/git/llvm.git 313924e6ff8a332063f61d3fda03812c220762f6)"}
!9 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 2, type: !10, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: false, unit: !0, variables: !2)
!10 = !DISubroutineType(types: !11)
!11 = !{!5}
!12 = !DILocation(line: 3, column: 10, scope: !9)
!13 = !DILocation(line: 3, column: 3, scope: !9)
!14 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 6, type: !10, isLocal: false, isDefinition: true, scopeLine: 6, isOptimized: false, unit: !0, variables: !2)
!15 = !DILocalVariable(name: "b", scope: !14, file: !1, line: 7, type: !16)
!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64, align: 64)
!17 = !DIExpression()
!18 = !DILocation(line: 7, column: 8, scope: !14)
!19 = !DILocation(line: 8, column: 11, scope: !14)
!20 = !DILocation(line: 8, column: 10, scope: !14)
!21 = !DILocation(line: 8, column: 15, scope: !14)
!22 = !DILocation(line: 8, column: 13, scope: !14)
!23 = !DILocation(line: 8, column: 3, scope: !14)
; LINES: main:
; LINES-NEXT: ; SRC_COMPDIR/source-interleave-x86_64.c:6
; SOURCE: main:
; SOURCE-NEXT: ; int main() {

2
llvm/tools/llvm-objdump/CMakeLists.txt
View File

@ -5,10 +5,12 @@ set(LLVM_LINK_COMPONENTS
AllTargetsInfos
CodeGen
DebugInfoDWARF
DebugInfoPDB
MC
MCDisassembler
Object
Support
Symbolize
)
add_llvm_tool(llvm-objdump

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

@ -23,6 +23,7 @@
#include "llvm/ADT/Triple.h"
#include "llvm/CodeGen/FaultMaps.h"
#include "llvm/DebugInfo/DWARF/DWARFContext.h"
#include "llvm/DebugInfo/Symbolize/Symbolize.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/MC/MCContext.h"
#include "llvm/MC/MCDisassembler/MCDisassembler.h"
@ -60,6 +61,7 @@
#include <cstring>
#include <system_error>
#include <utility>
#include <unordered_map>
using namespace llvm;
using namespace object;
@ -188,6 +190,20 @@ cl::opt<DIDumpType> llvm::DwarfDumpType(
cl::values(clEnumValN(DIDT_Frames, "frames", ".debug_frame"),
clEnumValEnd));
cl::opt<bool> PrintSource(
"source",
cl::desc(
"Display source inlined with disassembly. Implies disassmble object"));
cl::alias PrintSourceShort("S", cl::desc("Alias for -source"),
cl::aliasopt(PrintSource));
cl::opt<bool> PrintLines("line-numbers",
cl::desc("Display source line numbers with "
"disassembly. Implies disassemble object"));
cl::alias PrintLinesShort("l", cl::desc("Alias for -line-numbers"),
cl::aliasopt(PrintLines));
static StringRef ToolName;
namespace {
@ -360,13 +376,95 @@ bool llvm::RelocAddressLess(RelocationRef a, RelocationRef b) {
}
namespace {
class SourcePrinter {
protected:
DILineInfo OldLineInfo;
const ObjectFile *Obj;
std::unique_ptr<symbolize::LLVMSymbolizer> Symbolizer;
// File name to file contents of source
std::unordered_map<std::string, std::unique_ptr<MemoryBuffer>> SourceCache;
// Mark the line endings of the cached source
std::unordered_map<std::string, std::vector<StringRef>> LineCache;
private:
bool cacheSource(std::string File);
public:
virtual ~SourcePrinter() {}
SourcePrinter() : Obj(nullptr), Symbolizer(nullptr) {}
SourcePrinter(const ObjectFile *Obj, StringRef DefaultArch) : Obj(Obj) {
symbolize::LLVMSymbolizer::Options SymbolizerOpts(
DILineInfoSpecifier::FunctionNameKind::None, true, false, false,
DefaultArch);
Symbolizer.reset(new symbolize::LLVMSymbolizer(SymbolizerOpts));
}
virtual void printSourceLine(raw_ostream &OS, uint64_t Address,
StringRef Delimiter = "; ");
};
bool SourcePrinter::cacheSource(std::string File) {
auto BufferOrError = MemoryBuffer::getFile(File);
if (!BufferOrError)
return false;
// Chomp the file to get lines
size_t BufferSize = (*BufferOrError)->getBufferSize();
const char *BufferStart = (*BufferOrError)->getBufferStart();
for (const char *Start = BufferStart, *End = BufferStart;
End < BufferStart + BufferSize; End++)
if (*End == '\n' || End == BufferStart + BufferSize - 1 ||
(*End == '\r' && *(End + 1) == '\n')) {
LineCache[File].push_back(StringRef(Start, End - Start));
if (*End == '\r')
End++;
Start = End + 1;
}
SourceCache[File] = std::move(*BufferOrError);
return true;
}
void SourcePrinter::printSourceLine(raw_ostream &OS, uint64_t Address,
StringRef Delimiter) {
if (!Symbolizer)
return;
DILineInfo LineInfo = DILineInfo();
auto ExpectecLineInfo =
Symbolizer->symbolizeCode(Obj->getFileName(), Address);
if (!ExpectecLineInfo)
consumeError(ExpectecLineInfo.takeError());
else
LineInfo = *ExpectecLineInfo;
if ((LineInfo.FileName == "<invalid>") || OldLineInfo.Line == LineInfo.Line ||
LineInfo.Line == 0)
return;
if (PrintLines)
OS << Delimiter << LineInfo.FileName << ":" << LineInfo.Line << "\n";
if (PrintSource) {
if (SourceCache.find(LineInfo.FileName) == SourceCache.end())
if (!cacheSource(LineInfo.FileName))
return;
auto FileBuffer = SourceCache.find(LineInfo.FileName);
if (FileBuffer != SourceCache.end()) {
auto LineBuffer = LineCache.find(LineInfo.FileName);
if (LineBuffer != LineCache.end())
// Vector begins at 0, line numbers are non-zero
OS << Delimiter << LineBuffer->second[LineInfo.Line - 1].ltrim()
<< "\n";
}
}
OldLineInfo = LineInfo;
}
class PrettyPrinter {
public:
virtual ~PrettyPrinter(){}
virtual void printInst(MCInstPrinter &IP, const MCInst *MI,
ArrayRef<uint8_t> Bytes, uint64_t Address,
raw_ostream &OS, StringRef Annot,
MCSubtargetInfo const &STI) {
MCSubtargetInfo const &STI, SourcePrinter *SP) {
if (SP && (PrintSource || PrintLines))
SP->printSourceLine(OS, Address);
OS << format("%8" PRIx64 ":", Address);
if (!NoShowRawInsn) {
OS << "\t";
@ -392,10 +490,9 @@ public:
OS << format("%08" PRIx32, opcode);
}
}
void printInst(MCInstPrinter &IP, const MCInst *MI,
ArrayRef<uint8_t> Bytes, uint64_t Address,
raw_ostream &OS, StringRef Annot,
MCSubtargetInfo const &STI) override {
void printInst(MCInstPrinter &IP, const MCInst *MI, ArrayRef<uint8_t> Bytes,
uint64_t Address, raw_ostream &OS, StringRef Annot,
MCSubtargetInfo const &STI, SourcePrinter *SP) override {
if (!MI) {
printLead(Bytes, Address, OS);
OS << " <unknown>";
@ -440,13 +537,9 @@ HexagonPrettyPrinter HexagonPrettyPrinterInst;
class AMDGCNPrettyPrinter : public PrettyPrinter {
public:
void printInst(MCInstPrinter &IP,
const MCInst *MI,
ArrayRef<uint8_t> Bytes,
uint64_t Address,
raw_ostream &OS,
StringRef Annot,
MCSubtargetInfo const &STI) override {
void printInst(MCInstPrinter &IP, const MCInst *MI, ArrayRef<uint8_t> Bytes,
uint64_t Address, raw_ostream &OS, StringRef Annot,
MCSubtargetInfo const &STI, SourcePrinter *SP) override {
if (!MI) {
OS << " <unknown>";
return;
@ -989,6 +1082,8 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
StringRef Fmt = Obj->getBytesInAddress() > 4 ? "\t\t%016" PRIx64 ": " :
"\t\t\t%08" PRIx64 ": ";
SourcePrinter SP(Obj, TheTarget->getName());
// Create a mapping, RelocSecs = SectionRelocMap[S], where sections
// in RelocSecs contain the relocations for section S.
std::error_code EC;
@ -1211,9 +1306,10 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
CommentStream);
if (Size == 0)
Size = 1;
PIP.printInst(*IP, Disassembled ? &Inst : nullptr,
Bytes.slice(Index, Size),
SectionAddr + Index, outs(), "", *STI);
Bytes.slice(Index, Size), SectionAddr + Index, outs(), "",
*STI, &SP);
outs() << CommentStream.str();
Comments.clear();
@ -1768,7 +1864,7 @@ int main(int argc, char **argv) {
if (InputFilenames.size() == 0)
InputFilenames.push_back("a.out");
if (DisassembleAll)
if (DisassembleAll || PrintSource || PrintLines)
Disassemble = true;
if (!Disassemble
&& !Relocations