Index: llvm/trunk/include/llvm/Object/RelocVisitor.h =================================================================== --- llvm/trunk/include/llvm/Object/RelocVisitor.h +++ llvm/trunk/include/llvm/Object/RelocVisitor.h @@ -208,6 +208,14 @@ HasError = true; return RelocToApply(); } + case Triple::hexagon: + switch (RelocType) { + case llvm::ELF::R_HEX_32: + return visitELF_HEX_32(R, Value); + default: + HasError = true; + return RelocToApply(); + } default: HasError = true; return RelocToApply(); @@ -411,6 +419,11 @@ return RelocToApply(static_cast(Res), 4); } + RelocToApply visitELF_HEX_32(RelocationRef R, uint64_t Value) { + int64_t Addend = getELFAddend(R); + return RelocToApply(Value + Addend, 4); + } + RelocToApply visitELF_AMDGPU_ABS32(RelocationRef R, uint64_t Value) { int64_t Addend = getELFAddend(R); return RelocToApply(Value + Addend, 4); Index: llvm/trunk/test/tools/llvm-objdump/Hexagon/Inputs/source-interleave-hexagon.c =================================================================== --- llvm/trunk/test/tools/llvm-objdump/Hexagon/Inputs/source-interleave-hexagon.c +++ llvm/trunk/test/tools/llvm-objdump/Hexagon/Inputs/source-interleave-hexagon.c @@ -0,0 +1,9 @@ +int a = 1; +int foo() { + return a; +} + +int main() { + int *b = &a; + return *b + foo(); +} Index: llvm/trunk/test/tools/llvm-objdump/Hexagon/lit.local.cfg =================================================================== --- llvm/trunk/test/tools/llvm-objdump/Hexagon/lit.local.cfg +++ llvm/trunk/test/tools/llvm-objdump/Hexagon/lit.local.cfg @@ -0,0 +1,7 @@ +import platform + +if not 'Hexagon' in config.root.targets: + config.unsupported = True + +if platform.system() in ['Windows']: + config.unsupported = True Index: llvm/trunk/test/tools/llvm-objdump/Hexagon/source-interleave-hexagon.ll =================================================================== --- llvm/trunk/test/tools/llvm-objdump/Hexagon/source-interleave-hexagon.ll +++ llvm/trunk/test/tools/llvm-objdump/Hexagon/source-interleave-hexagon.ll @@ -0,0 +1,72 @@ +; RUN: sed -e "s,SRC_COMPDIR,%p/Inputs,g" %s > %t.ll +; RUN: llc -o %t.o -filetype=obj -mtriple=hexagon-unknown-elf %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-hexagon.bc' +source_filename = "source-interleave-hexagon.c" +target datalayout = "e-m:e-p:32:32:32-a:0-n16:32-i64:64:64-i32:32:32-i16:16:16-i1:8:8-f32:32:32-f64:64:64-v32:32:32-v64:64:64-v512:512:512-v1024:1024:1024-v2048:2048:2048" +target triple = "hexagon-unknown--elf" + +@a = global i32 1, align 4 + +; Function Attrs: nounwind +define i32 @foo() #0 !dbg !9 { +entry: + %0 = load i32, i32* @a, align 4, !dbg !12 + ret i32 %0, !dbg !13 +} + +; Function Attrs: nounwind +define i32 @main() #0 !dbg !14 { +entry: + %retval = alloca i32, align 4 + %b = alloca i32*, align 4 + 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 4, !dbg !18 + %0 = load i32*, i32** %b, align 4, !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 "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"="hexagonv60" "target-features"="-hvx,-hvx-double" "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-hexagon.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: 32, align: 32) +!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-hexagon.c:6 + +; SOURCE: main: +; SOURCE-NEXT: int main() { Index: llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp =================================================================== --- llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp +++ llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp @@ -494,6 +494,8 @@ void printInst(MCInstPrinter &IP, const MCInst *MI, ArrayRef Bytes, uint64_t Address, raw_ostream &OS, StringRef Annot, MCSubtargetInfo const &STI, SourcePrinter *SP) override { + if (SP && (PrintSource || PrintLines)) + SP->printSourceLine(OS, Address, ""); if (!MI) { printLead(Bytes, Address, OS); OS << " "; @@ -514,6 +516,8 @@ while(!HeadTail.first.empty()) { OS << Separator; Separator = "\n"; + if (SP && (PrintSource || PrintLines)) + SP->printSourceLine(OS, Address, ""); printLead(Bytes, Address, OS); OS << Preamble; Preamble = " ";